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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/23 17:38:26

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverCommands.ml driverInteractive.ml 

Log message:
        patch #5122

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.847&tr2=1.848&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.146&tr2=1.147&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml.diff?tr1=1.78&tr2=1.79&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.847 mldonkey/distrib/ChangeLog:1.848
--- mldonkey/distrib/ChangeLog:1.847    Tue May 23 17:37:12 2006
+++ mldonkey/distrib/ChangeLog  Tue May 23 17:38:25 2006
@@ -16,6 +16,7 @@
 
 2006/05/23
 5121: EDK: Remove obsolete option emule_compression
+5122: improve block_list output and runinfo ip blocking (schlumpf)
 -------------------------------------------------------------------------------
 2006/05/21: version 2.7.6 = tag release-2-7-6
 5119: HTML, Options: Include Wiki link in options names
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.146 
mldonkey/src/daemon/driver/driverCommands.ml:1.147
--- mldonkey/src/daemon/driver/driverCommands.ml:1.146  Sun May 21 07:51:13 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Tue May 23 17:38:26 2006
@@ -3154,10 +3154,17 @@
            ) (0, 0) l in
          Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>"
            (html_mods_cntr ());
+         if nranges > 0 then
          html_mods_td buf [
            ("Total ranges", "sr br", ("Total " ^ string_of_int nranges));
            ("Hits", "sr br", ("Total " ^ string_of_int nhits));
+           ("", "sr br", "")]
+         else begin
+         html_mods_td buf [
+           ("no " ^ tablename ^ " loaded", "sr br", "no " ^ tablename ^ " 
loaded");
+           ("", "sr br", "");
            ("", "sr br", "")];
+         end;
          Printf.bprintf buf "\\</tr\\>\\</table\\>\\<P\\>";
        ) [
          ("Web blocking list", !CommonBlocking.web_ip_blocking_list); 
Index: mldonkey/src/daemon/driver/driverInteractive.ml
diff -u mldonkey/src/daemon/driver/driverInteractive.ml:1.78 
mldonkey/src/daemon/driver/driverInteractive.ml:1.79
--- mldonkey/src/daemon/driver/driverInteractive.ml:1.78        Sun May 21 
07:50:05 2006
+++ mldonkey/src/daemon/driver/driverInteractive.ml     Tue May 23 17:38:26 2006
@@ -1822,6 +1822,8 @@
 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
+  let bl_loc = (Ip_set.bl_length !CommonBlocking.ip_blocking_list) in
+  let bl_web = (Ip_set.bl_length !CommonBlocking.web_ip_blocking_list) in
   let s =
   (
         "User:\t\t " ^ ui_user
@@ -1840,9 +1842,8 @@
       ^ "\nServer usage:\t " ^ (if !!enable_servers then "enabled" else 
"disabled (you are not able to connect to ED2K Servers)")
       ^ "\nGeoip:\t\t " ^ (if !Geoip.active then "enabled, GeoLite data 
created by MaxMind, available from http://maxmind.com/";
           else dis_mess)
-      ^ (Printf.sprintf "\nIP blocking local: %d ranges, web: %d ranges"
-          (Ip_set.bl_length !CommonBlocking.ip_blocking_list)
-          (Ip_set.bl_length !CommonBlocking.web_ip_blocking_list))
+      ^ "\nIP blocking:\t " ^ (if bl_loc = 0 && bl_web = 0 then "no blocking 
list loaded"
+          else Printf.sprintf "local: %d ranges - web: %d ranges" bl_loc 
bl_web)
       ^ (if Autoconf.magic then
            if !Autoconf.magic_works then
              Printf.sprintf "\nLibmagic:\t file-type recognition database 
present"