[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/13 12:44:16

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

Log message:
        patch #5089

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.821&tr2=1.822&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.139&tr2=1.140&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverControlers.ml.diff?tr1=1.65&tr2=1.66&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.821 mldonkey/distrib/ChangeLog:1.822
--- mldonkey/distrib/ChangeLog:1.821    Fri May 12 21:08:49 2006
+++ mldonkey/distrib/ChangeLog  Sat May 13 12:44:16 2006
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2006/05/13
+5089: IPBlock: Print seperate lists in block_list command for IPs
+      blocked by local and web IP blocklists (pango)
+
 2006/05/12
 4976: Filetype recognition with libmagic
 - new debug command: debug_dir, prints magic values for all files
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.139 
mldonkey/src/daemon/driver/driverCommands.ml:1.140
--- mldonkey/src/daemon/driver/driverCommands.ml:1.139  Fri May 12 21:08:30 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml        Sat May 13 12:44:16 2006
@@ -3246,17 +3246,44 @@
 
     "block_list", Arg_none (fun o ->
       let buf = o.conn_buf in
-        if o.conn_output = HTML then
-          let mybuf = Buffer.create 1000 in
-          let mytable = ref [] in
-         Ip_set.print_list mybuf !CommonBlocking.ip_blocking_list;
-          let listtmp = String2.split (Buffer.contents mybuf) '\n' in
-           (List.iter (fun s ->
-             mytable := !mytable @ [ ("", "srh", s); ]
-            ) listtmp);
-          html_mods_table_one_col buf "serversTable" "servers" !mytable
-        else
-         Ip_set.print_list buf !CommonBlocking.ip_blocking_list;
+      if o.conn_output = HTML then
+       List.iter (fun (tablename, l) ->
+         html_mods_cntr_init ();
+         html_mods_table_header buf tablename "servers" [
+           ( "0", "srh br", "Description (" ^ tablename ^ ")", "Description (" 
^ tablename ^ ")") ;
+           ( "0", "srh", "Hits", "Hits") ;
+           ( "0", "srh", "Range", "Range")];
+          let nhits, nranges = 
+           Ip_set.bl_fold_left (fun br (nhits, nranges) ->
+             if br.Ip_set.blocking_hits > 0 then begin
+               Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>"
+                 (html_mods_cntr ());
+               html_mods_td buf [
+                 ("Description", "sr br", br.Ip_set.blocking_description);
+                 ("Hits", "sr br", string_of_int br.Ip_set.blocking_hits);
+                 ("Range", "sr br", Printf.sprintf "%s - %s"
+                   (Ip.to_string br.Ip_set.blocking_begin)
+                   (Ip.to_string br.Ip_set.blocking_end))];
+               Printf.bprintf buf "\\</tr\\>";
+             end;
+             (nhits + br.Ip_set.blocking_hits, nranges + 1)
+           ) (0, 0) l in
+         Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>"
+           (html_mods_cntr ());
+         html_mods_td buf [
+           ("Total ranges", "sr br", ("Total " ^ string_of_int nranges));
+           ("Hits", "sr br", ("Total " ^ string_of_int nhits));
+           ("", "sr br", "")];
+         Printf.bprintf buf "\\</tr\\>\\</table\\>\\<P\\>";
+       ) [
+         ("Web blocking list", !CommonBlocking.web_ip_blocking_list); 
+         ("Local blocking list", !CommonBlocking.ip_blocking_list)]
+      else begin
+       Printf.bprintf buf "Web blocking list\n";
+       Ip_set.print_list buf !CommonBlocking.web_ip_blocking_list;
+       Printf.bprintf buf "Local blocking list\n";
+       Ip_set.print_list buf !CommonBlocking.ip_blocking_list;
+      end;
       _s ""
     ), ":\t\t\t\tdisplay the list of blocked IP ranges that were hit";
 
Index: mldonkey/src/daemon/driver/driverControlers.ml
diff -u mldonkey/src/daemon/driver/driverControlers.ml:1.65 
mldonkey/src/daemon/driver/driverControlers.ml:1.66
--- mldonkey/src/daemon/driver/driverControlers.ml:1.65 Mon Apr  3 20:50:08 2006
+++ mldonkey/src/daemon/driver/driverControlers.ml      Sat May 13 12:44:16 2006
@@ -1418,7 +1418,8 @@
                     | "downloaders" | "uploaders" | "scan_temp" | "cs"
                     | "version" | "rename" | "force_download" | "close_fds"
                     | "vd" | "vo" | "voo" | "upstats" | "shares" | "share"
-                    | "unshare" | "stats" | "users" -> drop_pre := true;
+                    | "unshare" | "stats" | "users" | "block_list" -> 
+                       drop_pre := true;
                     | _ -> ());
                   Printf.bprintf buf "%s\n"
                     (if use_html_mods o && !drop_pre then s else "\n<pre>\n" ^ 
s ^ "</pre>");