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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/28 23:42:28

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyClient.ml 

Log message:
        patch #5594

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1118&r2=1.1119
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyClient.ml?cvsroot=mldonkey&r1=1.110&r2=1.111

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1118
retrieving revision 1.1119
diff -u -b -r1.1118 -r1.1119
--- distrib/ChangeLog   28 Nov 2006 23:17:31 -0000      1.1118
+++ distrib/ChangeLog   28 Nov 2006 23:42:28 -0000      1.1119
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2006/11/29
+5594: EDK: If update_server_list_client true, add yet unknown server
+      of lowid clients
+
 2006/11/29 version 2.8.2 = tag release-2-8-2
 5597: GD: New option html_mods_vd_gfx_h_intervall
       (compute values for hourly graph every x minutes) (skeeve)

Index: src/networks/donkey/donkeyClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- src/networks/donkey/donkeyClient.ml 26 Nov 2006 16:36:29 -0000      1.110
+++ src/networks/donkey/donkeyClient.ml 28 Nov 2006 23:42:28 -0000      1.111
@@ -68,30 +68,33 @@
 (*************************************************************************)
 (*              adding a source to the source-management                 *)
 (*************************************************************************)
-let add_source file ip port serverIP serverPort =
+let add_source file ip tcp_port serverIP serverPort =
     (* man, we are receiving sources from some clients even when we release *)
     if (file_state file) = FileDownloading then
         try
             let uid = 
                 if low_id ip then
-                  (* indirect address *)
                   begin
                     try
                         (* without server, we can't request a callback *)
                         let s = Hashtbl.find servers_by_key serverIP in
                         if serverPort = s.server_port then
-                            Indirect_address ( serverIP, serverPort, id_of_ip 
ip, 0, Ip.null )
+                  Indirect_address (serverIP, serverPort, id_of_ip ip, 0, 
Ip.null)
                         else
                             raise Not_found
-                    with _ ->
-                        raise Not_found
+            with Not_found ->
+              if !!update_server_list_client then
+                begin
+                  ignore (check_add_server serverIP serverPort);
+                  Indirect_address (serverIP, serverPort, id_of_ip ip, 0, 
Ip.null)
+                end
+              else raise Not_found
                   end
                 else
-                  (* direct adsdess *)
                   if Ip.usable ip then
-                    if not ( is_black_address ip port ) then
+            if not ( is_black_address ip tcp_port ) then
                         if not ( Hashtbl.mem banned_ips ip) then
-                            Direct_address ( ip, port )
+                Direct_address ( ip, tcp_port )
                         else
                             raise Not_found
                     else