[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
|
From: |
mldonkey-commits |
|
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
|
Date: |
Mon, 09 Jan 2006 00:22:36 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Branch:
Changes by: spiralvoice <address@hidden> 06/01/09 00:22:36
Modified files:
distrib : ChangeLog
src/daemon/common: commonClient.ml commonFile.ml commonTypes.ml
guiDecoding.ml guiEncoding.ml guiProto.ml
src/daemon/driver: driverCommands.ml
src/networks/donkey: donkeyClient.ml donkeyGlobals.ml
donkeyInteractive.ml donkeyProtoCom.ml
donkeyTypes.ml
src/networks/fasttrack: fasttrackGlobals.ml fasttrackServers.ml
src/networks/gnutella: gnutellaClients.ml
gnutellaComplexOptions.ml
gnutellaGlobals.ml gnutellaHandler.ml
gnutellaInteractive.ml gnutellaServers.ml
src/networks/gnutella2: g2Handler.ml
src/networks/openFT: openFTServers.ml
src/networks/opennap: opennapInteractive.ml
src/networks/soulseek: slskInteractive.ml
Log message:
patch #4777
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.662&tr2=1.663&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonClient.ml.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonFile.ml.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonTypes.ml.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiDecoding.ml.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiEncoding.ml.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiProto.ml.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml.diff?tr1=1.112&tr2=1.113&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml.diff?tr1=1.66&tr2=1.67&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml.diff?tr1=1.80&tr2=1.81&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyProtoCom.ml.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyTypes.ml.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/fasttrack/fasttrackGlobals.ml.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/fasttrack/fasttrackServers.ml.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella/gnutellaClients.ml.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella/gnutellaComplexOptions.ml.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella/gnutellaGlobals.ml.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella/gnutellaHandler.ml.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella/gnutellaInteractive.ml.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella/gnutellaServers.ml.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella2/g2Handler.ml.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/openFT/openFTServers.ml.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/opennap/opennapInteractive.ml.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/soulseek/slskInteractive.ml.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.662 mldonkey/distrib/ChangeLog:1.663
--- mldonkey/distrib/ChangeLog:1.662 Sat Jan 7 14:37:16 2006
+++ mldonkey/distrib/ChangeLog Mon Jan 9 00:22:35 2006
@@ -11,6 +11,10 @@
To compile MLDonkey on MinGW follow this guide:
http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
+2006/01/09
+4777: Display IP:port for firewalled clients,
+ GUI protocol update (zet)
+
2006/01/07
4769: HTML: Fix some Geoip display bugs
Index: mldonkey/src/daemon/common/commonClient.ml
diff -u mldonkey/src/daemon/common/commonClient.ml:1.24
mldonkey/src/daemon/common/commonClient.ml:1.25
--- mldonkey/src/daemon/common/commonClient.ml:1.24 Sat Jan 7 14:37:16 2006
+++ mldonkey/src/daemon/common/commonClient.ml Mon Jan 9 00:22:35 2006
@@ -413,7 +413,7 @@
html_mods_td buf [
("", "sr", n.network_name);
("", "sr", (match info.G.client_kind with
- Indirect_location (name, _) -> Printf.sprintf "I"
+ Indirect_location (_ , _, _, _) -> Printf.sprintf "I"
| Known_location (ip, port) -> Printf.sprintf "D") );
(String.escaped info.G.client_name, "sr", client_short_name
info.G.client_name); ]
@@ -438,9 +438,9 @@
(shorten info.G.client_name 20)
info.GuiTypes.client_rating
(match info.G.client_kind with
- Indirect_location (name, _) -> "firewalled"
+ Indirect_location (_, _, ip, port)
| Known_location (ip, port) ->
- Printf.sprintf "%s:%d" (Ip.to_string ip) port)
+ Printf.sprintf "%s:%d" (Ip.to_string ip) port)
end
Index: mldonkey/src/daemon/common/commonFile.ml
diff -u mldonkey/src/daemon/common/commonFile.ml:1.47
mldonkey/src/daemon/common/commonFile.ml:1.48
--- mldonkey/src/daemon/common/commonFile.ml:1.47 Wed Jan 4 14:11:55 2006
+++ mldonkey/src/daemon/common/commonFile.ml Mon Jan 9 00:22:35 2006
@@ -314,8 +314,8 @@
let cinfo = client_info c in
let addr =
(match cinfo.GuiTypes.client_kind with
- Indirect_location (name, _) -> ""
- | Known_location (ip, port) -> Printf.sprintf "%s:%d" (Ip.to_string
ip) port
+ Indirect_location (_, _, ip, port)
+ | Known_location (ip, port) -> Printf.sprintf "%s:%d" (Ip.to_string
ip) port
)
in
Index: mldonkey/src/daemon/common/commonTypes.ml
diff -u mldonkey/src/daemon/common/commonTypes.ml:1.47
mldonkey/src/daemon/common/commonTypes.ml:1.48
--- mldonkey/src/daemon/common/commonTypes.ml:1.47 Fri Jan 6 22:23:09 2006
+++ mldonkey/src/daemon/common/commonTypes.ml Mon Jan 9 00:22:35 2006
@@ -700,7 +700,7 @@
and location_kind =
Known_location of Ip.t * int
-| Indirect_location of string * Md4.t
+| Indirect_location of string * Md4.t * Ip.t * int
(*
We should add information about what has already been sent to the GUI to
@@ -844,11 +844,11 @@
| Arg_three of (string -> string -> string -> arg_handler)
-let string_of_kind kind =
+let string_of_kind kind =
try
match kind with
| Known_location (ip,port) -> Ip.to_string ip
- | _ -> "firewalled"
+ | Indirect_location (server_ip, server_port, ip, port) -> Ip.to_string ip
with _ -> ""
let string_of_kind_geo kind =
@@ -857,9 +857,9 @@
| Known_location (ip,port) ->
let cc,cn = Geoip.get_country ip in
(Ip.to_string ip),cc,cn
- | _ ->
- let cc,cn = !Geoip.unknown_country in
- "firewalled",cc,cn
+ | Indirect_location (server_ip, server_port, ip, port) ->
+ let cc,cn = Geoip.get_country ip in
+ (Ip.to_string ip),cc,cn
with _ -> "","X","Country error"
type brand_stat = {
Index: mldonkey/src/daemon/common/guiDecoding.ml
diff -u mldonkey/src/daemon/common/guiDecoding.ml:1.49
mldonkey/src/daemon/common/guiDecoding.ml:1.50
--- mldonkey/src/daemon/common/guiDecoding.ml:1.49 Fri Jan 6 22:23:09 2006
+++ mldonkey/src/daemon/common/guiDecoding.ml Mon Jan 9 00:22:35 2006
@@ -711,7 +711,15 @@
| 1 ->
let name, pos = get_hostname proto s (pos+1) in
let md4 = get_md4 s pos in
- Indirect_location (name, md4), pos+16
+ let ip, port, pos =
+ if proto > 38 then begin
+ let myip , pos = get_ip2 proto s (pos+16) in
+ let myport = get_int16 s pos in
+ myip, myport, (pos+2)
+ end else
+ Ip.null, 0, (pos+16)
+ in
+ Indirect_location (name, md4, ip, port), pos
| _ -> assert false
let get_client proto s pos =
Index: mldonkey/src/daemon/common/guiEncoding.ml
diff -u mldonkey/src/daemon/common/guiEncoding.ml:1.47
mldonkey/src/daemon/common/guiEncoding.ml:1.48
--- mldonkey/src/daemon/common/guiEncoding.ml:1.47 Fri Jan 6 22:23:09 2006
+++ mldonkey/src/daemon/common/guiEncoding.ml Mon Jan 9 00:22:35 2006
@@ -398,8 +398,9 @@
match k with
Known_location (ip, port) ->
buf_int8 buf 0; buf_ip2 proto buf ip; buf_int16 buf port
- | Indirect_location (name, md4) ->
- buf_int8 buf 1; buf_hostname proto buf name; buf_md4 buf md4
+ | Indirect_location (name, md4, ip, port) ->
+ buf_int8 buf 1; buf_hostname proto buf name; buf_md4 buf md4;
+ if proto > 38 then begin buf_ip2 proto buf ip; buf_int16 buf port end
let buf_partial_file proto buf f =
buf_int buf f.file_num;
Index: mldonkey/src/daemon/common/guiProto.ml
diff -u mldonkey/src/daemon/common/guiProto.ml:1.22
mldonkey/src/daemon/common/guiProto.ml:1.23
--- mldonkey/src/daemon/common/guiProto.ml:1.22 Fri Jan 6 22:23:09 2006
+++ mldonkey/src/daemon/common/guiProto.ml Mon Jan 9 00:22:35 2006
@@ -31,7 +31,7 @@
let to_gui_last_opcode = 58
let from_gui_last_opcode = 67
-let best_gui_version = 38
+let best_gui_version = 39
(* I will try to report all changes to the protocol here: send me patches
if I don't !
Index: mldonkey/src/daemon/driver/driverCommands.ml
diff -u mldonkey/src/daemon/driver/driverCommands.ml:1.112
mldonkey/src/daemon/driver/driverCommands.ml:1.113
--- mldonkey/src/daemon/driver/driverCommands.ml:1.112 Sat Jan 7 14:37:16 2006
+++ mldonkey/src/daemon/driver/driverCommands.ml Mon Jan 9 00:22:35 2006
@@ -2262,8 +2262,8 @@
( "0", "srh", "Client name", "Client name" ) ;
( "0", "srh", "Secure User Identification [N]one, [P]assed,
[F]ailed", "S" ) ;
( "0", "srh", "IP address", "IP address" ) ;
- ( "0", "srh", "Connected time (minutes)", "CT" ) ;
] @ (if !Geoip.active then [( "0", "srh", "Country
Code/Name", "CC" )] else []) @ [
+ ( "0", "srh", "Connected time (minutes)", "CT" ) ;
( "0", "srh", "Client brand", "CB" ) ;
( "0", "srh", "Client release", "CR" ) ;
] @
Index: mldonkey/src/networks/donkey/donkeyClient.ml
diff -u mldonkey/src/networks/donkey/donkeyClient.ml:1.78
mldonkey/src/networks/donkey/donkeyClient.ml:1.79
--- mldonkey/src/networks/donkey/donkeyClient.ml:1.78 Sun Jan 1 19:36:03 2006
+++ mldonkey/src/networks/donkey/donkeyClient.ml Mon Jan 9 00:22:35 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 )
+ Indirect_address ( serverIP, serverPort, id_of_ip
ip, port )
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)
+ Indirect_address (ip, port, id_of_ip t.CR.ip, t.CR.port)
else
Invalid_address (!name, Md4.to_string t.CR.md4)
else
@@ -2515,10 +2515,10 @@
let c = new_client s_uid in
reconnect_client c
| Invalid_address _ -> ()
- | Indirect_address (ip, port, id) ->
+ | Indirect_address (server_ip, server_port, id, port) ->
- if low_id ip && Ip.reachable ip then
- query_id ip port id;
+ if low_id server_ip && Ip.reachable server_ip then
+ query_id server_ip server_port id;
with e ->
if !verbose then begin
Index: mldonkey/src/networks/donkey/donkeyGlobals.ml
diff -u mldonkey/src/networks/donkey/donkeyGlobals.ml:1.66
mldonkey/src/networks/donkey/donkeyGlobals.ml:1.67
--- mldonkey/src/networks/donkey/donkeyGlobals.ml:1.66 Wed Jan 4 14:11:55 2006
+++ mldonkey/src/networks/donkey/donkeyGlobals.ml Mon Jan 9 00:22:35 2006
@@ -661,9 +661,11 @@
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 _ | Invalid_address _ -> ""
+ Indirect_address (server_ip, server_port, ip, port) ->
+ Printf.sprintf " I[%s:%d]" (Ip.to_string (ip_of_id ip)) port;
| Direct_address (ip,port) ->
- Printf.sprintf " [%s:%d]" (Ip.to_string ip) port;
+ Printf.sprintf " D[%s:%d]" (Ip.to_string ip) port;
+ | Invalid_address _ -> ""
)
@@ -885,7 +887,8 @@
let client_id c =
match c.client_kind with
Direct_address (ip, port) -> (ip, port, zero)
- | Indirect_address (ip, port, id) -> (ip, port, id)
+ | Indirect_address (server_ip, server_port, id, port) ->
+ (server_ip, server_port, id)
| Invalid_address _ -> (Ip.null, 0, zero)
let save_join_queue c =
Index: mldonkey/src/networks/donkey/donkeyInteractive.ml
diff -u mldonkey/src/networks/donkey/donkeyInteractive.ml:1.80
mldonkey/src/networks/donkey/donkeyInteractive.ml:1.81
--- mldonkey/src/networks/donkey/donkeyInteractive.ml:1.80 Fri Jan 6
22:23:09 2006
+++ mldonkey/src/networks/donkey/donkeyInteractive.ml Mon Jan 9 00:22:35 2006
@@ -1133,7 +1133,9 @@
P.client_network = network.network_num;
P.client_kind = (match c.client_kind with
Direct_address (ip, port) -> Known_location (ip,port)
- | _ -> Indirect_location (c.client_name,c.client_md4));
+ | Indirect_address (server_ip, server_port, ip, port) ->
+ Indirect_location (c.client_name,c.client_md4, ip_of_id 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;
P.client_tags = []; (* c.client_tags; *)
Index: mldonkey/src/networks/donkey/donkeyProtoCom.ml
diff -u mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.26
mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.27
--- mldonkey/src/networks/donkey/donkeyProtoCom.ml:1.26 Sun Jan 1 19:36:03 2006
+++ mldonkey/src/networks/donkey/donkeyProtoCom.ml Mon Jan 9 00:22:35 2006
@@ -90,8 +90,10 @@
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 _ | Invalid_address _ -> ""
+ Indirect_address (server_ip, server_port, ip, port) ->
+ 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 _ -> ""
);
DonkeyProtoClient.print m;
lprint_newline ();
Index: mldonkey/src/networks/donkey/donkeyTypes.ml
diff -u mldonkey/src/networks/donkey/donkeyTypes.ml:1.34
mldonkey/src/networks/donkey/donkeyTypes.ml:1.35
--- mldonkey/src/networks/donkey/donkeyTypes.ml:1.34 Tue Nov 22 15:53:19 2005
+++ mldonkey/src/networks/donkey/donkeyTypes.ml Mon Jan 9 00:22:35 2006
@@ -474,7 +474,7 @@
type source_uid =
Direct_address of Ip.t * int
-| Indirect_address of Ip.t * int * int64
+| Indirect_address of Ip.t * int * int64 * int
| 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)
+ Indirect_address (ip, port, id, port)
| _ ->
failwith "bad client address"
@@ -521,10 +521,10 @@
match s with
Direct_address (ip, port) ->
SmallList [string_to_value (Ip.to_string ip); int_to_value port]
- | Indirect_address (ip, port, id) ->
+ | Indirect_address (server_ip, server_port, id, port) ->
SmallList [
- string_to_value (Ip.to_string ip);
- int_to_value port;
+ string_to_value (Ip.to_string server_ip);
+ int_to_value server_port;
int64_to_value id;
]
| Invalid_address _ -> failwith "Invalid address"
Index: mldonkey/src/networks/fasttrack/fasttrackGlobals.ml
diff -u mldonkey/src/networks/fasttrack/fasttrackGlobals.ml:1.28
mldonkey/src/networks/fasttrack/fasttrackGlobals.ml:1.29
--- mldonkey/src/networks/fasttrack/fasttrackGlobals.ml:1.28 Wed Dec 14
21:17:46 2005
+++ mldonkey/src/networks/fasttrack/fasttrackGlobals.ml Mon Jan 9 00:22:35 2006
@@ -345,7 +345,7 @@
user_user = user_impl;
user_uid = (match kind with
Known_location _ -> Md4.null
- | Indirect_location (_, uid) -> uid);
+ | Indirect_location (_, uid, _, _) -> uid);
user_kind = kind;
(* user_files = []; *)
user_speed = 0;
Index: mldonkey/src/networks/fasttrack/fasttrackServers.ml
diff -u mldonkey/src/networks/fasttrack/fasttrackServers.ml:1.25
mldonkey/src/networks/fasttrack/fasttrackServers.ml:1.26
--- mldonkey/src/networks/fasttrack/fasttrackServers.ml:1.25 Wed Dec 14
21:17:47 2005
+++ mldonkey/src/networks/fasttrack/fasttrackServers.ml Mon Jan 9 00:22:35 2006
@@ -239,7 +239,7 @@
if connection_can_try c.client_connection_control then begin
connection_try c.client_connection_control;
match c.client_user.user_kind with
- Indirect_location ("", uid) ->
+ Indirect_location ("", uid, _, _) ->
(*
lprintf "++++++ ASKING FOR PUSH +++++++++\n";
Index: mldonkey/src/networks/gnutella/gnutellaClients.ml
diff -u mldonkey/src/networks/gnutella/gnutellaClients.ml:1.35
mldonkey/src/networks/gnutella/gnutellaClients.ml:1.36
--- mldonkey/src/networks/gnutella/gnutellaClients.ml:1.35 Sun Dec 18
14:50:38 2005
+++ mldonkey/src/networks/gnutella/gnutellaClients.ml Mon Jan 9 00:22:35 2006
@@ -663,7 +663,7 @@
begin
match c.client_user.user_kind with
- Indirect_location (_, uid) ->
+ Indirect_location (_, uid, _, _) ->
GnutellaProto.ask_for_push uid
| Known_location (ip, port) ->
let token =
@@ -753,12 +753,12 @@
lprintf "PARSED\n";
end;
let c = try
- Hashtbl.find clients_by_uid (Indirect_location ("", uid))
+ Hashtbl.find clients_by_uid (Indirect_location ("", uid, ip, port))
with _ ->
try
Hashtbl.find clients_by_uid (Known_location (ip,port))
with _ ->
- new_client (Indirect_location ("", uid))
+ new_client (Indirect_location ("", uid, ip, port))
in
c.client_host <- Some (ip, port);
match c.client_sock with
Index: mldonkey/src/networks/gnutella/gnutellaComplexOptions.ml
diff -u mldonkey/src/networks/gnutella/gnutellaComplexOptions.ml:1.24
mldonkey/src/networks/gnutella/gnutellaComplexOptions.ml:1.25
--- mldonkey/src/networks/gnutella/gnutellaComplexOptions.ml:1.24 Wed Dec
14 21:17:47 2005
+++ mldonkey/src/networks/gnutella/gnutellaComplexOptions.ml Mon Jan 9
00:22:35 2006
@@ -63,7 +63,7 @@
with _ -> ());
(try
if get_value "client_push" value_to_bool then
- c.client_user.user_kind <- Indirect_location ("", client_uid)
+ c.client_user.user_kind <- Indirect_location ("", client_uid,
client_ip, client_port)
with _ -> ());
c
| _ -> failwith "Options: Not a client"
Index: mldonkey/src/networks/gnutella/gnutellaGlobals.ml
diff -u mldonkey/src/networks/gnutella/gnutellaGlobals.ml:1.32
mldonkey/src/networks/gnutella/gnutellaGlobals.ml:1.33
--- mldonkey/src/networks/gnutella/gnutellaGlobals.ml:1.32 Wed Dec 14
21:17:47 2005
+++ mldonkey/src/networks/gnutella/gnutellaGlobals.ml Mon Jan 9 00:22:35 2006
@@ -373,7 +373,7 @@
user_user = user_impl;
user_uid = (match kind with
Known_location _ -> Md4.null
- | Indirect_location (_, uid) -> uid);
+ | Indirect_location (_, uid, _, _) -> uid);
user_kind = kind;
(* user_files = []; *)
user_speed = 0;
Index: mldonkey/src/networks/gnutella/gnutellaHandler.ml
diff -u mldonkey/src/networks/gnutella/gnutellaHandler.ml:1.9
mldonkey/src/networks/gnutella/gnutellaHandler.ml:1.10
--- mldonkey/src/networks/gnutella/gnutellaHandler.ml:1.9 Sun Mar 20
01:41:30 2005
+++ mldonkey/src/networks/gnutella/gnutellaHandler.ml Mon Jan 9 00:22:35 2006
@@ -51,7 +51,7 @@
let update_user t =
let module Q = QueryReply in
let user = new_user (match t.Q.dont_connect with
- Some true -> Indirect_location ("", t.Q.guid)
+ Some true -> Indirect_location ("", t.Q.guid, t.Q.ip, t.Q.port)
| _ -> Known_location(t.Q.ip, t.Q.port))
in
user.user_speed <- t.Q.speed;
@@ -66,7 +66,7 @@
let update_client t =
let module Q = QueryReply in
let c = new_client (match t.Q.dont_connect with
- Some true -> Indirect_location ("", t.Q.guid)
+ Some true -> Indirect_location ("", t.Q.guid, t.Q.ip, t.Q.port)
| _ -> Known_location(t.Q.ip, t.Q.port))
in
Index: mldonkey/src/networks/gnutella/gnutellaInteractive.ml
diff -u mldonkey/src/networks/gnutella/gnutellaInteractive.ml:1.46
mldonkey/src/networks/gnutella/gnutellaInteractive.ml:1.47
--- mldonkey/src/networks/gnutella/gnutellaInteractive.ml:1.46 Fri Jan 6
22:23:09 2006
+++ mldonkey/src/networks/gnutella/gnutellaInteractive.ml Mon Jan 9
00:22:35 2006
@@ -390,7 +390,7 @@
"added Gnutella friend", true
| "gnut://" :: "friend" :: uid :: _ ->
let md4 = Md4.of_string uid in
- let c = new_client (Indirect_location ("", md4)) in
+ let c = new_client (Indirect_location ("", md4, Ip.null, 0)) in
friend_add (as_client c);
"added Gnutella friend", true
Index: mldonkey/src/networks/gnutella/gnutellaServers.ml
diff -u mldonkey/src/networks/gnutella/gnutellaServers.ml:1.23
mldonkey/src/networks/gnutella/gnutellaServers.ml:1.24
--- mldonkey/src/networks/gnutella/gnutellaServers.ml:1.23 Mon Aug 1
23:53:54 2005
+++ mldonkey/src/networks/gnutella/gnutellaServers.ml Mon Jan 9 00:22:35 2006
@@ -636,7 +636,7 @@
if connection_can_try c.client_connection_control then begin
connection_try c.client_connection_control;
match c.client_user.user_kind with
- Indirect_location ("", uid) ->
+ Indirect_location ("", uid, _, _) ->
if !verbose then
lprintf "++++++ ASKING FOR PUSH +++++++++\n";
Index: mldonkey/src/networks/gnutella2/g2Handler.ml
diff -u mldonkey/src/networks/gnutella2/g2Handler.ml:1.15
mldonkey/src/networks/gnutella2/g2Handler.ml:1.16
--- mldonkey/src/networks/gnutella2/g2Handler.ml:1.15 Sun Dec 18 14:50:38 2005
+++ mldonkey/src/networks/gnutella2/g2Handler.ml Mon Jan 9 00:22:35 2006
@@ -473,7 +473,7 @@
let user =
let user = new_user (match !user_addr with
- None -> Indirect_location (!user_nick, !user_uid)
+ None -> Indirect_location (!user_nick, !user_uid, Ip.null, 0)
| Some (ip,port) -> Known_location (ip,port))
in
(match !user_vendor with Some v -> user.user_vendor <- v | _ -> ());
Index: mldonkey/src/networks/openFT/openFTServers.ml
diff -u mldonkey/src/networks/openFT/openFTServers.ml:1.1
mldonkey/src/networks/openFT/openFTServers.ml:1.2
--- mldonkey/src/networks/openFT/openFTServers.ml:1.1 Tue Apr 22 22:33:39 2003
+++ mldonkey/src/networks/openFT/openFTServers.ml Mon Jan 9 00:22:36 2006
@@ -353,7 +353,7 @@
let update_user t =
let module Q = QueryReply in
let user = new_user t.Q.guid (match t.Q.dont_connect with
- Some true -> Indirect_location ("", t.Q.guid)
+ Some true -> Indirect_location ("", t.Q.guid, _, _)
| _ -> Known_location(t.Q.ip, t.Q.port))
in
user.user_speed <- t.Q.speed;
@@ -362,7 +362,7 @@
let update_client t =
let module Q = QueryReply in
let c = new_client t.Q.guid (match t.Q.dont_connect with
- Some true -> Indirect_location ("", t.Q.guid)
+ Some true -> Indirect_location ("", t.Q.guid, _, _)
| _ -> Known_location(t.Q.ip, t.Q.port))
in
Index: mldonkey/src/networks/opennap/opennapInteractive.ml
diff -u mldonkey/src/networks/opennap/opennapInteractive.ml:1.20
mldonkey/src/networks/opennap/opennapInteractive.ml:1.21
--- mldonkey/src/networks/opennap/opennapInteractive.ml:1.20 Fri Dec 16
20:56:31 2005
+++ mldonkey/src/networks/opennap/opennapInteractive.ml Mon Jan 9 00:22:36 2006
@@ -238,7 +238,7 @@
client_ops.op_client_info <- (fun c ->
{
P.client_network = network.network_num;
- P.client_kind = Indirect_location (c.client_name, Md4.null);
+ P.client_kind = Indirect_location (c.client_name, Md4.null, _, _);
P.client_state = client_state (as_client c.client_client);
P.client_type = client_type c;
P.client_tags = [];
Index: mldonkey/src/networks/soulseek/slskInteractive.ml
diff -u mldonkey/src/networks/soulseek/slskInteractive.ml:1.19
mldonkey/src/networks/soulseek/slskInteractive.ml:1.20
--- mldonkey/src/networks/soulseek/slskInteractive.ml:1.19 Sat Nov 12
22:53:52 2005
+++ mldonkey/src/networks/soulseek/slskInteractive.ml Mon Jan 9 00:22:36 2006
@@ -255,7 +255,7 @@
client_ops.op_client_info <- (fun c ->
{
P.client_network = network.network_num;
- P.client_kind = Indirect_location (c.client_name, Md4.null);
+ P.client_kind = Indirect_location (c.client_name, Md4.null, _, _);
P.client_state = client_state (as_client c.client_client);
P.client_type = client_type c;
P.client_tags = [];
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/01
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/01
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/02
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/03
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/04
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/04
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/04
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/06
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/07
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/08
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/11
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/11
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/16
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/18
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/18
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/29
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co..., mldonkey-commits, 2006/01/29