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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/01/28 20:26:46

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

Log message:
        patch #5716

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1166&r2=1.1167
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyShare.ml?cvsroot=mldonkey&r1=1.57&r2=1.58

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1166
retrieving revision 1.1167
diff -u -b -r1.1166 -r1.1167
--- distrib/ChangeLog   28 Jan 2007 20:25:44 -0000      1.1166
+++ distrib/ChangeLog   28 Jan 2007 20:26:46 -0000      1.1167
@@ -15,6 +15,7 @@
 =========
 
 2007/01/28
+5716: EDK: Do not send share list to servers with state Connecting
 5713: HTML: show messages link in vd clickable (Schlumpf)
 
 2007/01/25

Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- src/networks/donkey/donkeyGlobals.ml        8 Jan 2007 11:06:42 -0000       
1.114
+++ src/networks/donkey/donkeyGlobals.ml        28 Jan 2007 20:26:46 -0000      
1.115
@@ -288,6 +288,12 @@
 
 let connected_servers () = !connected_server_list
 
+let logged_in_servers () =
+List.filter (fun s -> 
+  match server_state s with
+  | Connected _ -> true
+  | _ -> false) !connected_server_list
+
 let get_udp_sock () =
   match !udp_sock with
     None -> failwith "No UDP socket"

Index: src/networks/donkey/donkeyShare.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyShare.ml,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- src/networks/donkey/donkeyShare.ml  6 Jan 2007 18:15:17 -0000       1.57
+++ src/networks/donkey/donkeyShare.ml  28 Jan 2007 20:26:46 -0000      1.58
@@ -221,7 +221,7 @@
 
        end
       end
-  ) (connected_servers ());
+  ) (logged_in_servers ());
 
 (*
 The problem: sh.shared_fd might be closed during the execution of the