[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/21 07:49:58

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

Log message:
        patch #4926

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.743&tr2=1.744&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.127&tr2=1.128&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.64&tr2=1.65&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverMain.ml.diff?tr1=1.98&tr2=1.99&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.743 mldonkey/distrib/ChangeLog:1.744
--- mldonkey/distrib/ChangeLog:1.743    Mon Feb 20 19:12:51 2006
+++ mldonkey/distrib/ChangeLog  Tue Feb 21 07:49:58 2006
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2006/02/21
+4926: Runinfo: Warn about not-working DNS resolution,
+      /dev/urandom detection was not disabled if --disable-donkeysui is used
+
 2006/02/20
 4922: OpenBSD: Small change for patch 4920
 4921: MinGW: show current DL & UL stats in console title (Schlumpf)
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.127 
mldonkey/src/daemon/common/commonOptions.ml:1.128
--- mldonkey/src/daemon/common/commonOptions.ml:1.127   Mon Feb 20 01:17:54 2006
+++ mldonkey/src/daemon/common/commonOptions.ml Tue Feb 21 07:49:58 2006
@@ -153,7 +153,7 @@
 
   if (String2.starts_with (Filename.basename Sys.argv.(0)) "mlnet")
     && not Autoconf.windows && not (Autoconf.system = "morphos") &&
-       not (Autoconf.donkey_sui = "yes") && not (Sys.file_exists 
"/dev/urandom") then begin
+       Autoconf.donkey_sui = "yes" && not (Sys.file_exists "/dev/urandom") 
then begin
       lprintf "%s" (exit_message_dev "urandom");
       if Autoconf.system = "hpux" then
         lprintf_nl "For HP-UX get urandom support from 
http://www.josvisser.nl/hpux11-random";;
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.64 
mldonkey/src/daemon/driver/driverInteractive.ml:1.65
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.64        Mon Feb 20 
01:30:19 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Tue Feb 21 07:49:58 2006
@@ -81,8 +81,11 @@
   end
   else ""
 
+let dns_works = ref false
+  
 let real_startup_message () =
-  !startup_message ^ (verify_user_admin ()) ^ (check_supported_os ())
+  !startup_message ^ (verify_user_admin ()) ^ (check_supported_os ()) 
+  ^ (if not !dns_works then "DNS resolution does not work" else "")
       
 (* ripped from gui_downloads *)
 
@@ -1735,7 +1738,7 @@
     end
   else
     Printf.bprintf buf "\n\t--Buildinfo--\n%s\n" s
-  
+
 let runinfo html buf o =
   let dis_mess = "disabled, to enable adjust web_infos in downloads.ini for 
automatic download" in
   let ui_user = o.conn_user.ui_user_name in
@@ -1759,6 +1762,10 @@
           else dis_mess)
       ^ "\nIP blocking:\t " ^ (let r1,r2 = Ip_set.block_stats () in
           if r1 = 0 then dis_mess else Printf.sprintf "enabled, %d ranges 
loaded - optimized to %d" r1 r2)
+      ^ (if not !dns_works then
+           Printf.sprintf "\nDNS:\t\t DNS resolution not available, web_infos 
%s not work"
+             (if Autoconf.bittorrent = "yes" then "and BT does" else "do")
+        else "")
       ^ "\nSystem info:\t " ^ (let uname = Unix32.uname () in
           if uname <> "" then uname ^
            (if not (Unix32.os_supported ()) then " - \nWARNING:\t not 
supported operating system" else "")
Index: mldonkey/src/daemon/driver/driverMain.ml
diff -u mldonkey/src/daemon/driver/driverMain.ml:1.98 
mldonkey/src/daemon/driver/driverMain.ml:1.99
--- mldonkey/src/daemon/driver/driverMain.ml:1.98       Mon Feb 20 01:30:19 2006
+++ mldonkey/src/daemon/driver/driverMain.ml    Tue Feb 21 07:49:58 2006
@@ -399,9 +399,9 @@
   (
     let hostname = "www.mldonkey.net" in
     try
-      ignore(Ip.from_name hostname)
-    with
-     e ->
+      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 "