[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/25 11:08:28

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverMain.ml 

Log message:
        patch #5484

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1062&r2=1.1063
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.127&r2=1.128

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1062
retrieving revision 1.1063
diff -u -b -r1.1062 -r1.1063
--- distrib/ChangeLog   23 Oct 2006 13:08:30 -0000      1.1062
+++ distrib/ChangeLog   25 Oct 2006 11:08:28 -0000      1.1063
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/10/25
+5484: Fix DNS test, test other domains besides www.mldonkey.net
+
 2006/10/23
 5474: New command bw_toggle (ported from Knockers Mulus client)
 - two new options: max_hard_upload_rate_2 and max_hard_download_rate_2

Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- src/daemon/driver/driverMain.ml     8 Oct 2006 14:12:13 -0000       1.127
+++ src/daemon/driver/driverMain.ml     25 Oct 2006 11:08:28 -0000      1.128
@@ -340,15 +340,18 @@
       CommonGlobals.exit_properly 71
     end;
 
-  (
-    let hostname = "www.mldonkey.net" in
+  ( let resolve_name hostname =
     try
-      ignore(Ip.from_name hostname);
-      DriverInteractive.dns_works := true
-    with e ->
-        lprintf (_b "\nDNS resolution does not work! Looking up %s failed with 
%s.")
-           hostname (Printexc2.to_string e);
-       lprintf "
+       ignore (Ip.from_name hostname);
+       true
+      with _ -> false
+    in
+    let hostnames =
+      ["www.mldonkey.org"; "mldonkey.sf.net"; "www.mldonkey.net"; 
"www.google.com"]
+    in
+    DriverInteractive.dns_works := List.exists resolve_name hostnames;
+
+    if not !DriverInteractive.dns_works then lprintf "
 The core therefore is unable to get eDonkey serverlists and loading
 .torrent files via dllink from websites is also impossible.
 If you are using MLDonkey in a chroot environment you should