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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/28 18:17:47

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

Log message:
        patch #5332

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.975&r2=1.976
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.164&r2=1.165

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.975
retrieving revision 1.976
diff -u -b -r1.975 -r1.976
--- distrib/ChangeLog   28 Aug 2006 18:16:55 -0000      1.975
+++ distrib/ChangeLog   28 Aug 2006 18:17:47 -0000      1.976
@@ -15,6 +15,7 @@
 =========
 
 2006/08/28
+5332: New command option: rem blocked - remove all IP blocked servers
 5330: Configure: Check MinGW version, at least 3.10 is needed (Schlumpf)
 5329: some configure improvements and cleanups (Schlumpf)
 

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- src/daemon/driver/driverCommands.ml 26 Aug 2006 12:05:53 -0000      1.164
+++ src/daemon/driver/driverCommands.ml 28 Aug 2006 18:17:47 -0000      1.165
@@ -711,21 +711,31 @@
     ""), ":\t\t\t\t\tlist all known servers";
 
     "rem", Arg_multiple (fun args o ->
-        if args = ["all"] then
-         begin
+       let counter = ref 0 in
+       match args with
+         ["all"] ->
             Intmap.iter ( fun _ s ->
-              server_remove s
+              server_remove s;
+             incr counter
             ) !!servers;
-            "Removed all servers"
-          end else begin
+            Printf.sprintf (_b "Removed all %d servers") !counter
+       | ["blocked"] ->
+            Intmap.iter ( fun _ s ->
+              if server_blocked s then
+               begin
+                 server_remove s;
+                 incr counter
+               end
+            ) !!servers;
+            Printf.sprintf (_b "Removed %d blocked servers") !counter
+       | _ ->
             List.iter (fun num ->
                 let num = int_of_string num in
                 let s = server_find num in
                 server_remove s
             ) args;
             Printf.sprintf (_b"%d servers removed") (List.length args)
-          end
-    ), "<server numbers> :\t\t\tremove server (use arg 'all' for all servers)";
+    ), "<server numbers> :\t\t\tremove server (use 'all' for all servers, 
'blocked' for all IP blocked servers)";
 
     "server_banner", Arg_one (fun num o ->
         let num = int_of_string num in