[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/26 13:22:04

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyGlobals.ml donkeyServers.ml 

Log message:
        patch #5584

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1110&r2=1.1111
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyServers.ml?cvsroot=mldonkey&r1=1.66&r2=1.67

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1110
retrieving revision 1.1111
diff -u -b -r1.1110 -r1.1111
--- distrib/ChangeLog   26 Nov 2006 13:21:06 -0000      1.1110
+++ distrib/ChangeLog   26 Nov 2006 13:22:04 -0000      1.1111
@@ -15,6 +15,7 @@
 =========
 
 2006/11/26
+5584: EDK: Remove removed servers from walker server lists
 5585: EDK: New parameter "all" for command "x" to disconnect all conn. servers
 5586: BT: Recognize Bitrocket clients
 

Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- src/networks/donkey/donkeyGlobals.ml        21 Nov 2006 21:38:00 -0000      
1.107
+++ src/networks/donkey/donkeyGlobals.ml        26 Nov 2006 13:22:04 -0000      
1.108
@@ -203,6 +203,8 @@
 let clients_root = ref []
 let servers_by_key = Hashtbl.create 127
 let servers_list = ref ([] : server list)
+let walker_list = ref ([] : server list)
+let delayed_list = ref ([] : server list)
 
 (* let remaining_time_for_clients = ref (60 * 15) *)
 
@@ -560,6 +562,8 @@
   try
     Hashtbl.remove servers_by_key key;
     servers_list := List2.removeq s !servers_list ;
+    walker_list := List2.removeq s !walker_list;
+    delayed_list := List2.removeq s !delayed_list;
     (match s.server_sock with
         NoConnection -> ()
       | ConnectionWaiting token -> cancel_token token
@@ -894,11 +898,6 @@
         [] -> raise Not_found
       | s :: _ -> s
 
-let all_servers () =
-  Hashtbl.fold (fun key s l ->
-      s :: l
-  ) servers_by_key []
-
 let string_of_file_state s =
   match  s with
   | FileDownloading -> "File Downloading"

Index: src/networks/donkey/donkeyServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- src/networks/donkey/donkeyServers.ml        21 Nov 2006 22:34:34 -0000      
1.66
+++ src/networks/donkey/donkeyServers.ml        26 Nov 2006 13:22:04 -0000      
1.67
@@ -670,8 +670,6 @@
 
 (* Keep connecting to servers in the background. Don't stay connected to
   them , and don't send your shared files list *)
-let walker_list = ref []
-let delayed_list = ref []
 let next_walker_start = ref 0
 
 (* one call every 5 seconds, so 12/minute, 720/hour *)