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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/09/05 14:15:20

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonNetwork.ml commonNetwork.mli 
                           commonTypes.ml commonUploads.ml 
        src/daemon/driver: driverCommands.ml driverInteractive.ml 
                           driverMain.ml 
        src/networks/bittorrent: bTInteractive.ml 
        src/networks/direct_connect: dcInteractive.ml 
        src/networks/donkey: donkeyComplexOptions.ml donkeyGlobals.ml 
                             donkeyMain.ml donkeyOvernet.ml 
        src/networks/fileTP: fileTPInteractive.ml 
        src/networks/gnutella: gnutellaInteractive.ml 
        src/networks/opennap: opennapInteractive.ml 
        src/networks/soulseek: slskGlobals.ml slskInteractive.ml 
                               slskServers.ml 

Log message:
        patch #5369

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.992&r2=1.993
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonNetwork.ml?cvsroot=mldonkey&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonNetwork.mli?cvsroot=mldonkey&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonTypes.ml?cvsroot=mldonkey&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonUploads.ml?cvsroot=mldonkey&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.170&r2=1.171
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverMain.ml?cvsroot=mldonkey&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcInteractive.ml?cvsroot=mldonkey&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyComplexOptions.ml?cvsroot=mldonkey&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyGlobals.ml?cvsroot=mldonkey&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyMain.ml?cvsroot=mldonkey&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOvernet.ml?cvsroot=mldonkey&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fileTP/fileTPInteractive.ml?cvsroot=mldonkey&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaInteractive.ml?cvsroot=mldonkey&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/opennap/opennapInteractive.ml?cvsroot=mldonkey&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/soulseek/slskGlobals.ml?cvsroot=mldonkey&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/soulseek/slskInteractive.ml?cvsroot=mldonkey&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/soulseek/slskServers.ml?cvsroot=mldonkey&r1=1.13&r2=1.14

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.992
retrieving revision 1.993
diff -u -b -r1.992 -r1.993
--- distrib/ChangeLog   4 Sep 2006 21:30:26 -0000       1.992
+++ distrib/ChangeLog   5 Sep 2006 14:15:19 -0000       1.993
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/09/05
+5369: New command portinfo, display used ports during start-up
+
 2006/09/04
 5370: Correct option_versions defaults, remove commented EDK code
 

Index: src/daemon/common/commonNetwork.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonNetwork.ml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/daemon/common/commonNetwork.ml  6 Aug 2006 13:59:05 -0000       1.28
+++ src/daemon/common/commonNetwork.ml  5 Sep 2006 14:15:19 -0000       1.29
@@ -105,6 +105,8 @@
         lprintf_nl "op_network_clean_exit";
       if c.op_network_reset == cc.op_network_reset then 
         lprintf_nl "op_network_reset";
+      if c.op_network_ports == cc.op_network_ports then 
+        lprintf_nl "op_network_ports";
   ) !networks_ops;
   lprint_newline ()
 
@@ -124,6 +126,7 @@
 let network_client_of_option n f = n.op_network_client_of_option f
 let network_clean_exit n = try n.op_network_clean_exit () with _ -> true
 let network_reset n = try n.op_network_reset () with _ -> ()
+let network_ports n = n.op_network_ports ()
 
 let networks_iter f =
   List.iter (fun r ->
@@ -274,6 +277,7 @@
       op_network_display_stats = (fun _ _ -> ni_ok name "display_stats");
       op_network_clean_exit = (fun _ -> true);
       op_network_reset = (fun _ -> ni_ok name "reset");
+      op_network_ports = (fun _ -> ni_ok name "ports"; []);
     }
   in
   let rr = (Obj.magic r: network) in

Index: src/daemon/common/commonNetwork.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonNetwork.mli,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/daemon/common/commonNetwork.mli 6 Aug 2006 13:59:05 -0000       1.14
+++ src/daemon/common/commonNetwork.mli 5 Sep 2006 14:15:19 -0000       1.15
@@ -47,6 +47,7 @@
 val network_commands : (string * string * CommonTypes.arg_kind * string) list 
ref
 val register_commands : (string * string * CommonTypes.arg_kind * string) list 
-> unit
 val network_connect_servers : CommonTypes.network -> unit
+val network_ports : CommonTypes.network -> (int * string) list
 val network_forget_search : CommonTypes.network -> CommonTypes.search -> unit
 val network_close_search : CommonTypes.network -> CommonTypes.search -> unit
 val network_private_message : CommonTypes.network -> string -> string -> unit

Index: src/daemon/common/commonTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonTypes.ml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/daemon/common/commonTypes.ml    16 Aug 2006 19:12:08 -0000      1.53
+++ src/daemon/common/commonTypes.ml    5 Sep 2006 14:15:19 -0000       1.54
@@ -497,6 +497,7 @@
     mutable op_network_display_stats : (Buffer.t -> ui_conn -> unit);
     mutable op_network_clean_exit : (unit -> bool);
     mutable op_network_reset : (unit -> unit);
+    mutable op_network_ports : (unit -> (int * string) list);
   }
 
 and   ui_user = {

Index: src/daemon/common/commonUploads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonUploads.ml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- src/daemon/common/commonUploads.ml  12 Jun 2006 20:47:21 -0000      1.44
+++ src/daemon/common/commonUploads.ml  5 Sep 2006 14:15:19 -0000       1.45
@@ -239,6 +239,13 @@
         network_downloaded = Int64.zero;
         network_connected = 0;
       });
+  network.op_network_ports <- (fun _ ->
+    [
+    !!http_port, "http_port";
+    !!telnet_port, "telnet_port";
+    !!gui_port, "gui_port";
+    !!gift_port, "gift_port";
+    ]);
   network.op_network_connected_servers <- (fun _ -> [])
 
 let (shared_ops : shared_file CommonShared.shared_ops) =

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- src/daemon/driver/driverCommands.ml 3 Sep 2006 11:49:16 -0000       1.170
+++ src/daemon/driver/driverCommands.ml 5 Sep 2006 14:15:19 -0000       1.171
@@ -436,6 +436,8 @@
         if o.conn_output = HTML then Printf.bprintf buf "\\<P\\>";
         ignore(runinfo (o.conn_output = HTML) buf o);
         if o.conn_output = HTML then Printf.bprintf buf "\\<P\\>";
+        ignore(portinfo (o.conn_output = HTML) buf);
+        if o.conn_output = HTML then Printf.bprintf buf "\\<P\\>";
         ignore(diskinfo (o.conn_output = HTML) buf);
         ""
     ), ":\t\t\t\tprint mldonkey core build, runtime and disk information";
@@ -452,6 +454,12 @@
         ""
     ), ":\t\t\t\tprint mldonkey runtime information";
 
+    "portinfo", Arg_none (fun o ->
+       let buf = o.conn_buf in
+        ignore(portinfo (o.conn_output = HTML) buf);
+        ""
+    ), ":\t\t\t\tprint mldonkey port usage information";
+
     "diskinfo", Arg_none (fun o ->
        let buf = o.conn_buf in
         ignore(diskinfo (o.conn_output = HTML) buf);

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- src/daemon/driver/driverInteractive.ml      3 Sep 2006 11:47:33 -0000       
1.98
+++ src/daemon/driver/driverInteractive.ml      5 Sep 2006 14:15:19 -0000       
1.99
@@ -2012,6 +2012,50 @@
     if html then 
       Printf.bprintf buf "\\</table\\>\\</div\\>"
           
+type port_info = {
+    netname : string;
+    port : int;
+    portname : string
+  }
+
+let portinfo html buf =
+  let max_network_name_len = ref 4 in (* "Core" *)
+  let list = ref [] in
+  networks_iter (fun r ->
+    if String.length r.network_name > !max_network_name_len then
+      max_network_name_len := String.length r.network_name;
+    List.iter (fun (p,s) -> if p <> 0 then list := !list @
+      [{netname = r.network_name; port = p; portname = s}]) (network_ports r)
+  );
+  List.iter (fun (p,s) -> if p <> 0 then list := !list @
+      [{netname = "Core"; port = p; portname = s}])
+    (network_ports (network_find_by_name "Global Shares"));
+
+  let fill_network s = String.make (!max_network_name_len - 7) s in
+  if html then
+      html_mods_table_header buf "sharesTable" "shares" [
+       ( "0", "srh", "Network", "Network" ) ;
+       ( "0", "srh ar", "Port", "Port" ) ;
+       ( "1", "srh", "Type", "Type" ) ]
+  else
+    begin
+      Printf.bprintf buf "\n\t--Portinfo--\n";
+      Printf.bprintf buf "Network%s|  Port|Type\n" (fill_network ' ');
+      Printf.bprintf buf "-------%s+------+-------------------\n" 
(fill_network '-')
+    end;
+
+  html_mods_cntr_init ();
+  List.iter (fun p ->
+    if html then
+      Printf.bprintf buf "\\<tr class=\\\"dl-%d\\\"\\>\\<td 
class=\\\"sr\\\"\\>%s\\</td\\>\\<td class=\\\"sr ar\\\"\\>%d\\</td\\>\\<td 
class=\\\"sr\\\"\\>%s\\</td\\>"
+       (html_mods_cntr ()) p.netname p.port p.portname
+    else
+      Printf.bprintf buf "%-*s|%6d|%s\n"
+       (maxi !max_network_name_len (!max_network_name_len - String.length 
p.netname)) p.netname p.port p.portname
+    ) (List.sort (fun p1 p2 -> String.compare p1.netname p2.netname) !list);
+  if html then
+    Printf.bprintf buf "\\</table\\>\\</td\\>\\<tr\\>\\</table\\>\\</div\\>"
+
 let diskinfo html buf =
   let list = ref [] in
   ignore (search_incoming_files ());

Index: src/daemon/driver/driverMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverMain.ml,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- src/daemon/driver/driverMain.ml     1 Sep 2006 16:19:56 -0000       1.124
+++ src/daemon/driver/driverMain.ml     5 Sep 2006 14:15:19 -0000       1.125
@@ -399,19 +399,21 @@
     save_results =:= old_save_results;
   end;
 
-(*  lprintf "(3) networks_iter load_complex_options\n"; *)
   lprintf_nl (_b "Check http://www.mldonkey.net/ for updates");
   networks_iter (fun r -> network_load_complex_options r);
-  lprintf (_b "%senabling networks: ") (log_time ());
+  lprintf_nl (_b "enabling networks: ");
   networks_iter (fun r ->
-(*      lprintf "(4) networks_iter enabling\n"; *)
-      lprintf (_b "%s ") r.network_name;
+      lprintf_nl (_b "---- enabling %s ----") r.network_name;
       network_enable r;
+      List.iter (fun (p,s) -> if p <> 0 then lprintf_nl "using port %d (%s)" p 
s) (network_ports r);
 (* are there drawbacks to start recover_temp unconditionally here ? *)
       if !!recover_temp_on_startup then
         network_recover_temp r;
   );
-  lprintf (_b "\n%sdisabled networks: ") (log_time ());
+  lprintf_nl (_b "---- enabling interfaces ----");
+  List.iter (fun (p,s) -> if p <> 0 then lprintf_nl "using port %d (%s)" p s)
+    (network_ports (network_find_by_name "Global Shares"));
+  lprintf (_b "%sdisabled networks: ") (log_time ());
   let found = ref false in
     networks_iter_all (fun r ->
         if not (network_is_enabled r) then

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- src/networks/bittorrent/bTInteractive.ml    1 Sep 2006 16:22:14 -0000       
1.104
+++ src/networks/bittorrent/bTInteractive.ml    5 Sep 2006 14:15:19 -0000       
1.105
@@ -1085,6 +1085,11 @@
   );
   network.op_network_reset <- (fun _ ->
     List.iter (fun file -> BTClients.file_stop file) !current_files);
+  network.op_network_ports <- (fun _ ->
+    [
+    !!client_port, "client_port TCP";
+    !!BTTracker.tracker_port, "tracker_port TCP";
+    ]);
 
   client_ops.op_client_info <- op_client_info;
   client_ops.op_client_connect <- op_client_connect;

Index: src/networks/direct_connect/dcInteractive.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/direct_connect/dcInteractive.ml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/networks/direct_connect/dcInteractive.ml        10 Apr 2006 19:16:36 
-0000      1.26
+++ src/networks/direct_connect/dcInteractive.ml        5 Sep 2006 14:15:19 
-0000       1.27
@@ -298,7 +298,7 @@
         P.file_name = file.file_name;
         P.file_num = (file_num file);
         P.file_network = network.network_num;
-        P.file_names = [file.file_name, noips()];
+        P.file_names = [file.file_name];
         P.file_md4 = file.file_id;
         P.file_size = file_size file;
         P.file_downloaded = file_downloaded file;
@@ -307,7 +307,7 @@
         P.file_state = file_state file;
         P.file_sources = None;
         P.file_download_rate = file_download_rate file.file_file;
-        P.file_chunks = "0";
+        P.file_chunks = None;
         P.file_availability = [network.network_num, "0"];
         P.file_format = FormatUnknown;
         P.file_chunks_age = [|0|];
@@ -376,6 +376,12 @@
           ) list)
 
 let _ =
+  network.op_network_ports <- (fun _ ->
+    [
+    !!dc_port, "client_port";
+    ]);
+  network.op_network_recover_temp <- (fun s -> ());
+  network.op_network_load_complex_options <- (fun _ -> ());
   network.op_network_save_complex_options <- (fun _ -> ());
   network.op_network_save_sources <- (fun _ -> ());
   network.op_network_update_options <- (fun _ -> ());

Index: src/networks/donkey/donkeyComplexOptions.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/donkey/donkeyComplexOptions.ml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- src/networks/donkey/donkeyComplexOptions.ml 1 Sep 2006 16:25:15 -0000       
1.56
+++ src/networks/donkey/donkeyComplexOptions.ml 5 Sep 2006 14:15:19 -0000       
1.57
@@ -535,7 +535,7 @@
       Options.load file_sources_ini;
       cleaner ();
       sources_loaded := true;
-      lprintf "(loading sources completed) ";
+      lprintf_nl "loading sources completed"
     with _ -> ())
 
 let check_result r tags =

Index: src/networks/donkey/donkeyGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyGlobals.ml,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- src/networks/donkey/donkeyGlobals.ml        4 Sep 2006 21:30:27 -0000       
1.91
+++ src/networks/donkey/donkeyGlobals.ml        5 Sep 2006 14:15:20 -0000       
1.92
@@ -847,6 +847,8 @@
 let overnet_server_ip = ref Ip.null
 let overnet_server_port = ref 0
 
+let overnet_port_info = ref 0
+let kademlia_port_info = ref 0
 
 
 (*************************************************************

Index: src/networks/donkey/donkeyMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- src/networks/donkey/donkeyMain.ml   3 Sep 2006 12:44:37 -0000       1.56
+++ src/networks/donkey/donkeyMain.ml   5 Sep 2006 14:15:20 -0000       1.57
@@ -385,6 +385,13 @@
         network_downloaded = !donkey_download_counter;
         network_connected = List.length (connected_servers ());
       });
+  network.op_network_ports <- (fun _ ->
+    [
+    !!donkey_port, "client_port TCP";
+    !!donkey_port+4, "client_port UDP";
+    !overnet_port_info, "overnet_port TCP+UDP";
+    !kademlia_port_info, "kademlia_port UDP";
+    ]);
   CommonInteractive.register_gui_options_panel "eDonkey" 
     gui_donkey_options_panel;
   CommonInteractive.register_gui_options_panel "Overnet" 

Index: src/networks/donkey/donkeyOvernet.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOvernet.ml,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- src/networks/donkey/donkeyOvernet.ml        27 Jun 2006 10:26:48 -0000      
1.67
+++ src/networks/donkey/donkeyOvernet.ml        5 Sep 2006 14:15:20 -0000       
1.68
@@ -1410,6 +1410,10 @@
       let sock = (UdpSocket.create (Ip.to_inet_addr !!client_bind_addr)
           (!!overnet_port) (Proto.udp_handler udp_client_handler)) in
       udp_sock := Some sock;
+      if Proto.redirector_section = "DKKO" then
+       overnet_port_info := !!overnet_port;
+      if Proto.redirector_section = "DKKA" then
+       kademlia_port_info := !!overnet_port;
       UdpSocket.set_write_controler sock udp_write_controler;
 
 (* copy all boot_peers to unknown_peers *)
@@ -1511,6 +1515,10 @@
         | Some sock ->
             udp_sock := None;
             UdpSocket.close sock Closed_by_user);
+      if Proto.redirector_section = "DKKO" then
+       overnet_port_info := 0;
+      if Proto.redirector_section = "DKKA" then
+       kademlia_port_info := 0;
     end
 
 let _ =

Index: src/networks/fileTP/fileTPInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/fileTP/fileTPInteractive.ml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- src/networks/fileTP/fileTPInteractive.ml    1 Sep 2006 16:22:15 -0000       
1.44
+++ src/networks/fileTP/fileTPInteractive.ml    5 Sep 2006 14:15:20 -0000       
1.45
@@ -51,6 +51,7 @@
 
 let _ =
   network.op_network_connected <- (fun _ -> true);
+  network.op_network_ports <- (fun _ -> []);
   network.op_network_connected_servers <- (fun _ -> [])
 
 

Index: src/networks/gnutella/gnutellaInteractive.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaInteractive.ml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- src/networks/gnutella/gnutellaInteractive.ml        1 Sep 2006 16:22:15 
-0000       1.61
+++ src/networks/gnutella/gnutellaInteractive.ml        5 Sep 2006 14:15:20 
-0000       1.62
@@ -215,6 +215,10 @@
   network.op_network_connected <- (fun _ ->
       !connected_servers <> []
   );
+  network.op_network_ports <- (fun _ ->
+    [
+    !!client_port, "client_port TCP+UDP";
+    ]);
   network.op_network_share <- (fun fullname codedname size ->
       (*
       lprintf "*************** op_network_share %s\n

Index: src/networks/opennap/opennapInteractive.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/opennap/opennapInteractive.ml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- src/networks/opennap/opennapInteractive.ml  1 Sep 2006 16:22:15 -0000       
1.24
+++ src/networks/opennap/opennapInteractive.ml  5 Sep 2006 14:15:20 -0000       
1.25
@@ -34,6 +34,7 @@
 open OpennapGlobals
 open Options
 open OpennapComplexOptions
+open OpennapOptions
 open OpennapTypes
 module OG = OpennapGlobals
 
@@ -143,7 +144,7 @@
         P.file_size = file_size file;
         P.file_downloaded = file_downloaded file;
         P.file_state = file_state file;
-        P.file_chunks = "0";
+        P.file_chunks = None;
         P.file_availability = [network.network_num, "0"];
         P.file_format = FormatUnknown;
         P.file_chunks_age = [|0 |];
@@ -236,6 +237,10 @@
 
   network.op_network_parse_url <- (fun _ -> "", false);
   network.op_network_load_complex_options <- (fun _ -> ());
+  network.op_network_ports <- (fun _ ->
+    [
+    !!client_port, "client_port TCP";
+    ]);
 
   network.op_network_recover_temp <- (fun s -> ());
 

Index: src/networks/soulseek/slskGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/soulseek/slskGlobals.ml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/networks/soulseek/slskGlobals.ml        9 May 2006 17:17:08 -0000       
1.15
+++ src/networks/soulseek/slskGlobals.ml        5 Sep 2006 14:15:20 -0000       
1.16
@@ -286,7 +286,7 @@
       FileDownloaded
     else
       begin
-        let kernel = CommonSwarming.create_swarmer file_temp file_size 
min_range_size in
+        let kernel = CommonSwarming.create_swarmer file_temp file_size in
         let swarmer = CommonSwarming.create kernel (as_file file.file_file) 
file_chunk_size in
           file.file_swarmer <- Some swarmer;
         CommonSwarming.set_verifier swarmer ForceVerification;

Index: src/networks/soulseek/slskInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/soulseek/slskInteractive.ml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/networks/soulseek/slskInteractive.ml    1 Sep 2006 16:22:15 -0000       
1.22
+++ src/networks/soulseek/slskInteractive.ml    5 Sep 2006 14:15:20 -0000       
1.23
@@ -181,6 +181,9 @@
   *)
 
 let _ =
+  network.op_network_ports <- (fun _ -> []);
+  network.op_network_recover_temp <- (fun s -> ());
+  network.op_network_load_complex_options <- (fun _ -> ());
   network.op_network_download <- (fun r ->
       download r []   
   )
@@ -200,7 +203,7 @@
         P.file_downloaded = file_downloaded file;
         P.file_state = file_state file;
         P.file_download_rate = file_download_rate file.file_file;
-        P.file_chunks = "0";
+        P.file_chunks = None;
         P.file_availability = [network.network_num,"0"];
         P.file_format = FormatNotComputed 0;
         P.file_chunks_age = [|0|];

Index: src/networks/soulseek/slskServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/soulseek/slskServers.ml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/networks/soulseek/slskServers.ml        19 May 2006 23:43:55 -0000      
1.13
+++ src/networks/soulseek/slskServers.ml        5 Sep 2006 14:15:20 -0000       
1.14
@@ -121,7 +121,7 @@
           let c = Hashtbl.find clients_by_name name in
           c.client_addr <- Some (ip, port);
 
-          if client_browsed_tag land client_type c <> 0 then
+          if (client_friend_tag lor client_contact_tag) land client_type c <> 
0 then
                SlskClients.connect_peer c 300 [C2C.GetSharedFileListReq]
           
         with Not_found ->