[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/09/09 14:44:16

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonGlobals.ml commonOptions.ml 
        src/networks/donkey: donkeyServers.ml 

Log message:
        patch #6192

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1318&r2=1.1319
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonGlobals.ml?cvsroot=mldonkey&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.214&r2=1.215
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyServers.ml?cvsroot=mldonkey&r1=1.70&r2=1.71

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1318
retrieving revision 1.1319
diff -u -b -r1.1318 -r1.1319
--- distrib/ChangeLog   5 Sep 2007 19:21:40 -0000       1.1318
+++ distrib/ChangeLog   9 Sep 2007 14:44:15 -0000       1.1319
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2007/09/09
+6192: EDK: Use discovered client_ip when lowid
+
 2007/09/05
 6187: BT: Fix wrong file order of multifile torrents due to patch #6174
 

Index: src/daemon/common/commonGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonGlobals.ml,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- src/daemon/common/commonGlobals.ml  1 Jul 2007 12:57:02 -0000       1.86
+++ src/daemon/common/commonGlobals.ml  9 Sep 2007 14:44:15 -0000       1.87
@@ -877,6 +877,7 @@
                       set_client_ip =:=
                         Ip.of_string (String.sub line (String.length 
search_string)
                           ((String.length line) - (String.length 
search_string)));
+                      last_high_id := !!set_client_ip;
                       if !verbose then lprintf_nl "discovered IP %s" 
(Ip.to_string !!set_client_ip)
                     end
                 with e -> lprintf_nl "IP discovery parse error: %s" 
(Printexc2.to_string e)

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -b -r1.214 -r1.215
--- src/daemon/common/commonOptions.ml  31 Aug 2007 19:48:09 -0000      1.214
+++ src/daemon/common/commonOptions.ml  9 Sep 2007 14:44:15 -0000       1.215
@@ -1666,7 +1666,7 @@
   else
     if !last_high_id <> Ip.null then
       begin
-        if !last_high_id <> Ip.localhost && !!set_client_ip <> !last_high_id 
then
+        if Ip.usable_ip !last_high_id && !!set_client_ip <> !last_high_id then
           set_client_ip =:= !last_high_id;
         !last_high_id
       end
@@ -1675,7 +1675,7 @@
         None -> !!set_client_ip
       | Some sock ->
           let ip = TcpBufferedSocket.my_ip sock in
-          if ip <> Ip.localhost && !!set_client_ip <> ip then
+          if Ip.usable ip && !!set_client_ip <> ip then
           set_client_ip =:= ip;
           ip
 

Index: src/networks/donkey/donkeyServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- src/networks/donkey/donkeyServers.ml        26 May 2007 23:21:48 -0000      
1.70
+++ src/networks/donkey/donkeyServers.ml        9 Sep 2007 14:44:15 -0000       
1.71
@@ -342,7 +342,7 @@
             M.QueryServerListReq Q.t
           );
 
-          if not (low_id t.M.SetID.ip) && !!use_server_ip then
+          if not (low_id t.M.SetID.ip) && !last_high_id <> t.M.SetID.ip && 
!!use_server_ip then begin
             last_high_id := t.M.SetID.ip;
 
           (* nice and ugly, but it doesn't require any new fields *)