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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/02/09 11:41:39

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyClient.ml donkeyGlobals.ml 
                             donkeyInteractive.ml donkeyProtoCom.ml 
                             donkeyTypes.ml 

Log message:
        patch #4885

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.723&tr2=1.724&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.91&tr2=1.92&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyProtoCom.ml.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyTypes.ml.diff?tr1=1.37&tr2=1.38&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.723 mldonkey/distrib/ChangeLog:1.724
--- mldonkey/distrib/ChangeLog:1.723    Mon Feb  6 21:47:02 2006
+++ mldonkey/distrib/ChangeLog  Thu Feb  9 11:41:39 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/02/09
+4885: EDK: Show correct IP of indirect clients in uploader list
+
 2006/02/06
 4879: EDK: Support for sources in ed2k:// links
 - example:
Index: mldonkey/src/networks/donkey/donkeyClient.ml
diff -u mldonkey/src/networks/donkey/donkeyClient.ml:1.82 
mldonkey/src/networks/donkey/donkeyClient.ml:1.83
--- mldonkey/src/networks/donkey/donkeyClient.ml:1.82   Thu Jan 26 00:25:25 2006
+++ mldonkey/src/networks/donkey/donkeyClient.ml        Thu Feb  9 11:41:39 2006
@@ -84,7 +84,7 @@
                         (* 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, port )
+                            Indirect_address ( serverIP, serverPort, id_of_ip 
ip, port, ip )
                         else
                             raise Not_found
                     with _ ->
@@ -2141,7 +2141,7 @@
                 Invalid_address (!name, Md4.to_string t.CR.md4)
             | Some (ip,port) ->
                 if Ip.usable ip then
-                    Indirect_address (ip, port, id_of_ip t.CR.ip, t.CR.port)
+                    Indirect_address (ip, port, id_of_ip t.CR.ip, t.CR.port, 
(peer_ip sock))
                 else
                     Invalid_address (!name, Md4.to_string t.CR.md4)
         else
@@ -2545,7 +2545,7 @@
             let c = new_client s_uid in        
             reconnect_client c
         | Invalid_address _ -> ()
-        | Indirect_address (server_ip, server_port, id, port) ->
+        | Indirect_address (server_ip, server_port, id, port, real_ip) ->
 
        if low_id server_ip && Ip.reachable server_ip then
               query_id server_ip server_port id; 
Index: mldonkey/src/networks/donkey/donkeyGlobals.ml
diff -u mldonkey/src/networks/donkey/donkeyGlobals.ml:1.74 
mldonkey/src/networks/donkey/donkeyGlobals.ml:1.75
--- mldonkey/src/networks/donkey/donkeyGlobals.ml:1.74  Thu Jan 26 00:25:25 2006
+++ mldonkey/src/networks/donkey/donkeyGlobals.ml       Thu Feb  9 11:41:39 2006
@@ -689,8 +689,8 @@
   Printf.sprintf "client[%d] %s(%s) %s" (client_num c)
   c.client_name (brand_to_string c.client_brand)
   (match c.client_kind with
-      Indirect_address (server_ip, server_port, ip, port) ->
-        Printf.sprintf  " I[%s:%d]" (Ip.to_string (ip_of_id ip)) port;
+      Indirect_address (server_ip, server_port, ip, port, real_ip) ->
+        Printf.sprintf  " I[%s:%d]" (Ip.to_string real_ip) port;
     | Direct_address (ip,port) ->
         Printf.sprintf  " D[%s:%d]" (Ip.to_string ip) port;
     | Invalid_address _ -> ""
@@ -916,7 +916,7 @@
 let client_id c =
   match c.client_kind with
     Direct_address (ip, port) -> (ip, port, zero)
-  | Indirect_address (server_ip, server_port, id, port) ->
+  | Indirect_address (server_ip, server_port, id, port, real_ip) ->
      (server_ip, server_port, id)
   | Invalid_address _ -> (Ip.null, 0, zero)
 
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.91 
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.92
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.91      Mon Feb  6 
21:47:02 2006
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml   Thu Feb  9 11:41:39 2006
@@ -1158,8 +1158,8 @@
         P.client_network = network.network_num;
         P.client_kind = (match c.client_kind with
             Direct_address (ip, port) -> Known_location (ip,port)
-         | Indirect_address (server_ip, server_port, ip, port) -> 
-             Indirect_location (c.client_name,c.client_md4, ip_of_id ip, port)
+         | Indirect_address (server_ip, server_port, ip, port, real_ip) -> 
+             Indirect_location (c.client_name,c.client_md4, real_ip, port)
           | _ -> Indirect_location (c.client_name,c.client_md4, Ip.null, 0));
         P.client_state = client_state c;
         P.client_type = client_type c;
Index: mldonkey/src/networks/donkey/donkeyProtoCom.ml
diff -u mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.28 
mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.29
--- mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.28 Mon Jan 16 16:05:14 2006
+++ mldonkey/src/networks/donkey/donkeyProtoCom.ml      Thu Feb  9 11:41:39 2006
@@ -90,7 +90,7 @@
       lprintf_nl () "Sent to client[%d] %s(%s) %s" (client_num c)
         c.client_name (brand_to_string c.client_brand)
       (match c.client_kind with
-          Indirect_address (server_ip, server_port, ip, port) ->
+          Indirect_address (server_ip, server_port, ip, port, real_ip) ->
            Printf.sprintf "[%s:%d]" (Ip.to_string (ip_of_id ip)) port
         | Direct_address (ip,port) -> Printf.sprintf "[%s:%d]" (Ip.to_string 
ip) port
         | Invalid_address _ -> ""
Index: mldonkey/src/networks/donkey/donkeyTypes.ml
diff -u mldonkey/src/networks/donkey/donkeyTypes.ml:1.37 
mldonkey/src/networks/donkey/donkeyTypes.ml:1.38
--- mldonkey/src/networks/donkey/donkeyTypes.ml:1.37    Mon Jan 16 16:05:14 2006
+++ mldonkey/src/networks/donkey/donkeyTypes.ml Thu Feb  9 11:41:39 2006
@@ -474,7 +474,7 @@
 
 type source_uid =
   Direct_address of Ip.t * int
-| Indirect_address of Ip.t * int * int64 * int
+| Indirect_address of Ip.t * int * int64 * int * Ip.t
 | Invalid_address of string * string
 
 let id_of_ip ip = Ip.to_int64 (Ip.rev ip)
@@ -513,7 +513,7 @@
             let port = value_to_int port in
             let id = try id_of_ip (Ip.of_string (value_to_string id))
               with _ -> value_to_int64 id in
-            Indirect_address (ip, port, id, port)
+            Indirect_address (ip, port, id, 0, Ip.null)
         | _ ->
             failwith "bad client address"
 
@@ -521,7 +521,7 @@
         match s with
           Direct_address (ip, port) ->
             SmallList [string_to_value (Ip.to_string ip); int_to_value port]
-        | Indirect_address (server_ip, server_port, id, port) ->
+        | Indirect_address (server_ip, server_port, id, port, _) ->
             SmallList [
               string_to_value (Ip.to_string server_ip);
               int_to_value server_port;