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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/03/18 08:24:39

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonComplexOptions.ml commonNetwork.ml 
                           commonNetwork.mli commonOptions.ml 
                           commonTypes.ml commonUploads.ml 
        src/networks/bittorrent: bTInteractive.ml bTOptions.ml 
        src/networks/direct_connect: dcMain.ml 
        src/networks/donkey: donkeyInteractive.ml 
        src/networks/fileTP: fileTPInteractive.ml 
        src/networks/gnutella: gnutellaInteractive.ml 

Log message:
        patch #6466

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1366&r2=1.1367
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonComplexOptions.ml?cvsroot=mldonkey&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonNetwork.ml?cvsroot=mldonkey&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonNetwork.mli?cvsroot=mldonkey&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.221&r2=1.222
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonTypes.ml?cvsroot=mldonkey&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonUploads.ml?cvsroot=mldonkey&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.145&r2=1.146
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTOptions.ml?cvsroot=mldonkey&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcMain.ml?cvsroot=mldonkey&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.166&r2=1.167
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fileTP/fileTPInteractive.ml?cvsroot=mldonkey&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaInteractive.ml?cvsroot=mldonkey&r1=1.74&r2=1.75

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1366
retrieving revision 1.1367
diff -u -b -r1.1366 -r1.1367
--- distrib/ChangeLog   14 Mar 2008 08:50:51 -0000      1.1366
+++ distrib/ChangeLog   18 Mar 2008 08:24:37 -0000      1.1367
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2008/03/18
+6466: Fix option_hook loop when changing max_upload_slots < 3,
+      caused by patch #6451
+
 2008/03/14
 6462: Multiuser: Restrict chown to admin users only
 

Index: src/daemon/common/commonComplexOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- src/daemon/common/commonComplexOptions.ml   3 Feb 2008 23:07:52 -0000       
1.82
+++ src/daemon/common/commonComplexOptions.ml   18 Mar 2008 08:24:37 -0000      
1.83
@@ -1244,6 +1244,12 @@
     shorten_all_file_filenames !!max_filenames
   );
 
+  option_hook max_upload_slots (fun _ ->
+      if !!max_upload_slots < 3 then
+        max_upload_slots =:= 3;
+      networks_iter (fun n -> network_check_upload_slots n)
+    );
+
   let max_opened_connections_pass = ref 0 in
   option_hook max_opened_connections (fun _ ->
 

Index: src/daemon/common/commonNetwork.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonNetwork.ml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/daemon/common/commonNetwork.ml  3 Aug 2007 22:12:57 -0000       1.35
+++ src/daemon/common/commonNetwork.ml  18 Mar 2008 08:24:37 -0000      1.36
@@ -112,6 +112,8 @@
         lprintf_nl "op_network_porttest_start";
       if c.op_network_porttest_result == cc.op_network_porttest_result then 
         lprintf_nl "op_network_porttest_result";
+      if c.op_network_check_upload_slots == cc.op_network_check_upload_slots 
then 
+        lprintf_nl "op_network_check_upload_slots";
   ) !networks_ops;
   lprint_newline ()
 
@@ -138,6 +140,7 @@
 let network_ports n = n.op_network_ports ()
 let network_porttest_start n = n.op_network_porttest_start ()
 let network_porttest_result n = n.op_network_porttest_result ()
+let network_check_upload_slots n = n.op_network_check_upload_slots ()
 
 let networks_iter f =
   List.iter (fun r ->
@@ -297,6 +300,7 @@
       op_network_ports = (fun _ -> ni_ok name "ports"; []);
       op_network_porttest_start = (fun _ -> ni_ok name "porttest_start");
       op_network_porttest_result = (fun _ -> fni name "porttest_result");
+      op_network_check_upload_slots = (fun _ -> ni_ok name 
"check_upload_slots");
     }
   in
   (* attempt: what is this cast for ? *)

Index: src/daemon/common/commonNetwork.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonNetwork.mli,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/daemon/common/commonNetwork.mli 3 Aug 2007 22:12:57 -0000       1.21
+++ src/daemon/common/commonNetwork.mli 18 Mar 2008 08:24:37 -0000      1.22
@@ -254,6 +254,12 @@
     @return port test result *)
 val network_porttest_result : CommonTypes.network -> 
CommonTypes.network_porttest
 
+(** call the op_network_check_upload_slots method of a network.
+    To be used in option_hook max_upload_slots to avoid an
+    indefinite loop when having more than one of this option_hook
+    @param network instance *)
+val network_check_upload_slots : CommonTypes.network -> unit
+
 (** {6 Iterators} *)
 
 (** Call a function for each enabled network 

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -b -r1.221 -r1.222
--- src/daemon/common/commonOptions.ml  6 Feb 2008 20:39:53 -0000       1.221
+++ src/daemon/common/commonOptions.ml  18 Mar 2008 08:24:37 -0000      1.222
@@ -1805,9 +1805,6 @@
           close_log ()
         end
   );
-  option_hook max_upload_slots (fun _ ->
-      if !!max_upload_slots < 3 then
-        max_upload_slots =:= 3);
   option_hook buffer_writes_threshold (fun _ ->
       Unix32.max_buffered := Int64.of_int (1024 * !!buffer_writes_threshold));
   option_hook log_size (fun _ ->

Index: src/daemon/common/commonTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonTypes.ml,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- src/daemon/common/commonTypes.ml    2 Jan 2008 16:50:15 -0000       1.75
+++ src/daemon/common/commonTypes.ml    18 Mar 2008 08:24:37 -0000      1.76
@@ -551,6 +551,7 @@
     mutable op_network_ports : (unit -> (int * string) list);
     mutable op_network_porttest_start : (unit -> unit);
     mutable op_network_porttest_result : (unit -> network_porttest);
+    mutable op_network_check_upload_slots : (unit -> unit);
   }
 
 and ui_user = {

Index: src/daemon/common/commonUploads.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonUploads.ml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- src/daemon/common/commonUploads.ml  25 Jul 2007 19:27:09 -0000      1.55
+++ src/daemon/common/commonUploads.ml  18 Mar 2008 08:24:37 -0000      1.56
@@ -226,8 +226,6 @@
   network.op_network_connected <- (fun _ -> false);
   network.op_network_is_enabled <- (fun _ -> raise IgnoreNetwork);
   network.op_network_update_options <- (fun _ -> raise IgnoreNetwork);
-  (* op_network_info defined twice ?? *)
-  network.op_network_info <- (fun _ -> raise Not_found);
   network.op_network_info <- (fun n ->
       {
         network_netnum = network.network_num;

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- src/networks/bittorrent/bTInteractive.ml    2 Jan 2008 16:14:52 -0000       
1.145
+++ src/networks/bittorrent/bTInteractive.ml    18 Mar 2008 08:24:38 -0000      
1.146
@@ -1346,6 +1346,7 @@
        porttest_result := PorttestResult (last_time (), result)
       )
   );
+  network.op_network_check_upload_slots <- (fun _ -> check_bt_uploaders ());
   client_ops.op_client_info <- op_client_info;
   client_ops.op_client_connect <- op_client_connect;
   client_ops.op_client_disconnect <- op_client_disconnect;

Index: src/networks/bittorrent/bTOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- src/networks/bittorrent/bTOptions.ml        7 Mar 2008 19:39:09 -0000       
1.36
+++ src/networks/bittorrent/bTOptions.ml        18 Mar 2008 08:24:38 -0000      
1.37
@@ -122,10 +122,6 @@
         if !!max_bt_uploaders < 3 then max_bt_uploaders =:= 3;
        check_bt_uploaders ()
         );
-    (* adds another hook to this common option here, to work around 
-       cross-referencing problem *)
-    option_hook max_upload_slots
-      (fun _ -> check_bt_uploaders ());
     option_hook max_tracker_redirect   (** #4541 [egs] **)
       (fun _ ->
         if !!max_tracker_redirect < 0 then max_tracker_redirect =:= 0

Index: src/networks/direct_connect/dcMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcMain.ml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/networks/direct_connect/dcMain.ml       3 Aug 2007 22:12:58 -0000       
1.8
+++ src/networks/direct_connect/dcMain.ml       18 Mar 2008 08:24:38 -0000      
1.9
@@ -241,6 +241,7 @@
 (*  network.op_network_clean_exit <- (fun _ -> lprintf_nl "Received 
(op_network_clean_exit)"; ()); *)
   network.op_network_reset <- (fun _ -> ());
   network.op_network_porttest_result <- (fun _ -> PorttestNotAvailable);
+  network.op_network_check_upload_slots <- (fun _ -> ());
 
   CommonInteractive.register_gui_options_panel "DC" gui_dc_options_panel; 
   

Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- src/networks/donkey/donkeyInteractive.ml    3 Feb 2008 23:07:52 -0000       
1.166
+++ src/networks/donkey/donkeyInteractive.ml    18 Mar 2008 08:24:38 -0000      
1.167
@@ -1653,6 +1653,7 @@
   network.op_network_reset <- (fun _ -> ());
 
   network.op_network_close_search <- (fun s -> ());
+  network.op_network_check_upload_slots <- (fun _ -> ());
   network.op_network_porttest_start <- (fun _ ->
     porttest_result := PorttestInProgress (last_time ());
     let module H = Http_client in

Index: src/networks/fileTP/fileTPInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/fileTP/fileTPInteractive.ml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- src/networks/fileTP/fileTPInteractive.ml    8 Jan 2008 21:31:07 -0000       
1.61
+++ src/networks/fileTP/fileTPInteractive.ml    18 Mar 2008 08:24:38 -0000      
1.62
@@ -445,4 +445,5 @@
   network.op_network_connect_servers <- (fun s -> ());
   network.op_network_reset <- (fun _ -> ());
   network.op_network_porttest_result <- (fun _ -> PorttestNotAvailable);
+  network.op_network_check_upload_slots <- (fun _ -> ());
   network.op_network_recover_temp <- (fun s -> ())

Index: src/networks/gnutella/gnutellaInteractive.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaInteractive.ml,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- src/networks/gnutella/gnutellaInteractive.ml        3 Aug 2007 22:12:59 
-0000       1.74
+++ src/networks/gnutella/gnutellaInteractive.ml        18 Mar 2008 08:24:38 
-0000      1.75
@@ -220,6 +220,7 @@
     !!client_port, "client_port TCP+UDP";
     ]);
   network.op_network_porttest_result <- (fun _ -> PorttestNotAvailable);
+  network.op_network_check_upload_slots <- (fun _ -> ());
   network.op_network_share <- (fun fullname codedname size ->
       (*
       lprintf "*************** op_network_share %s\n