[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr... |
Date: |
Sun, 24 Jun 2007 18:41:55 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 07/06/24 18:41:55
Modified files:
distrib : ChangeLog
src/networks/bittorrent: bTOptions.ml
Log message:
patch #6044
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1288&r2=1.1289
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTOptions.ml?cvsroot=mldonkey&r1=1.32&r2=1.33
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1288
retrieving revision 1.1289
diff -u -b -r1.1288 -r1.1289
--- distrib/ChangeLog 24 Jun 2007 18:40:02 -0000 1.1288
+++ distrib/ChangeLog 24 Jun 2007 18:41:54 -0000 1.1289
@@ -15,6 +15,7 @@
=========
2007/06/24
+6044: BT: Limit max_bt_uploaders to max_upload_slots (pango)
6043: Discover WAN IP
- new command "discover_ip" to force discovery
- new option "discover_ip" to enable automatic discovery on startup
Index: src/networks/bittorrent/bTOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/networks/bittorrent/bTOptions.ml 1 Apr 2007 12:14:57 -0000
1.32
+++ src/networks/bittorrent/bTOptions.ml 24 Jun 2007 18:41:55 -0000
1.33
@@ -109,6 +109,10 @@
"Number of retries before a tracker is disabled, use 0 to not disable
trackers"
int_option 10
+let check_bt_uploaders () =
+ if !!max_bt_uploaders > !!max_upload_slots then
+ max_bt_uploaders =:= !!max_upload_slots
+
let _ =
begin
option_hook max_uploaders_per_torrent
@@ -116,7 +120,13 @@
if !!max_uploaders_per_torrent < 1 then max_uploaders_per_torrent =:=
5);
option_hook max_bt_uploaders
(fun _ ->
- if !!max_bt_uploaders < 0 then max_bt_uploaders =:= 5);
+ if !!max_bt_uploaders < 0 then max_bt_uploaders =:= 5;
+ 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