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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/02/03 23:11:23

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonMessages.ml commonOptions.ml 
        src/daemon/driver: driverCommands.ml 

Log message:
        patch #6077

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1354&r2=1.1355
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonMessages.ml?cvsroot=mldonkey&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.218&r2=1.219
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.243&r2=1.244

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1354
retrieving revision 1.1355
diff -u -b -r1.1354 -r1.1355
--- distrib/ChangeLog   3 Feb 2008 23:09:19 -0000       1.1354
+++ distrib/ChangeLog   3 Feb 2008 23:11:22 -0000       1.1355
@@ -15,6 +15,7 @@
 =========
 
 2008/02/04
+6077: bw_toggle: support new option "max_opened_connections_2" (Schlumpf)
 6401: Swarmer: Correctly update file_downloaded during recover_temp (pango)
 6400: EDK: Correctly update filename after recover_temp
 6396: Log: Print user:group when starting a download

Index: src/daemon/common/commonMessages.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonMessages.ml,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- src/daemon/common/commonMessages.ml 13 Apr 2007 10:35:30 -0000      1.69
+++ src/daemon/common/commonMessages.ml 3 Feb 2008 23:11:23 -0000       1.70
@@ -989,7 +989,7 @@
 <TD class=\"bu bbig\" title=\"Bandwidth statistics (set 
html_mods_bw_refresh_delay)\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
 onClick=\"mSub('fstatus','bw_stats');mSub('output','gdstats')\">Bandwidth 
stats</TD>
-<TD class=\"bu bbig\" title=\"Bandwidth toggle\"
+<TD class=\"bu bbig\" title=\"Toggle bandwidth and max connections\"
 onMouseOver=\"mOvr(this,'mOvr1');\" onMouseOut=\"mOut(this);\"
 onClick=\"mSub('fstatus','bw_stats');mSub('output','bw_toggle')\">Bandwidth 
toggle</TD>
 </TR></TBODY></TABLE></DIV>

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- src/daemon/common/commonOptions.ml  17 Dec 2007 11:32:27 -0000      1.218
+++ src/daemon/common/commonOptions.ml  3 Feb 2008 23:11:23 -0000       1.219
@@ -604,6 +604,10 @@
   "Maximal number of opened connections"
     int_option 200
 
+let max_opened_connections_2 = define_option current_section 
["max_opened_connections_2"]
+  "Second maximal number of opened connections for easy toggling (use 
bw_toggle)"
+    int_option 100
+
 let max_indirect_connections = define_option current_section 
["max_indirect_connections"]
   "Amount of indirect connections in percent (min 30, max 70) of 
max_opened_connections"
     int_option 30

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -b -r1.243 -r1.244
--- src/daemon/driver/driverCommands.ml 24 Jan 2008 14:43:38 -0000      1.243
+++ src/daemon/driver/driverCommands.ml 3 Feb 2008 23:11:23 -0000       1.244
@@ -1117,18 +1117,21 @@
        if user2_is_admin o.conn_user.ui_user then begin
        let ul_bkp = !!max_hard_upload_rate_2 in
        let dl_bkp = !!max_hard_download_rate_2 in
+       let max_conn = !!max_opened_connections_2 in
        max_hard_upload_rate_2 =:= !!max_hard_upload_rate;
        max_hard_download_rate_2 =:= !!max_hard_download_rate;
+       max_opened_connections_2 =:= !!max_opened_connections;
        max_hard_upload_rate =:= ul_bkp;
        max_hard_download_rate =:=  dl_bkp;
+       max_opened_connections =:= max_conn;
        print_command_result o (Printf.sprintf
-         "new upload rate: %d | new download rate: %d"
-           !!max_hard_upload_rate !!max_hard_download_rate)
+         "new upload rate: %d | new download rate: %d | new max opened 
connections: %d"
+           !!max_hard_upload_rate !!max_hard_download_rate 
!!max_opened_connections)
        end
        else
          print_command_result o "You are not allowed to toggle bandwidth";
        ""
-    ), ":\t\t\t\ttoggle between the two rate sets";
+    ), ":\t\t\t\ttoggle between the two rate and opened connection sets";
 
     "costats", Arg_multiple (fun args o ->
         let filter cs =
@@ -1933,9 +1936,10 @@
                        strings_of_option dynamic_slots;
                        strings_of_option max_hard_upload_rate;
                        strings_of_option max_hard_download_rate;
+                       strings_of_option max_opened_connections;
                        strings_of_option max_hard_upload_rate_2;
                        strings_of_option max_hard_download_rate_2;
-                       strings_of_option max_opened_connections;
+                       strings_of_option max_opened_connections_2;
                        strings_of_option max_indirect_connections;
                        strings_of_option max_connections_per_second;
                        strings_of_option max_concurrent_downloads;