[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: |
Sun, 04 Jan 2009 14:46:47 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 09/01/04 14:46:47
Modified files:
distrib : ChangeLog
src/daemon/common: commonOptions.ml
src/networks/bittorrent: bTOptions.ml
Log message:
patch #6714
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1387&r2=1.1388
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.224&r2=1.225
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTOptions.ml?cvsroot=mldonkey&r1=1.39&r2=1.40
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1387
retrieving revision 1.1388
diff -u -b -r1.1387 -r1.1388
--- distrib/ChangeLog 4 Jan 2009 00:22:58 -0000 1.1387
+++ distrib/ChangeLog 4 Jan 2009 14:46:46 -0000 1.1388
@@ -15,6 +15,7 @@
=========
2009/01/04
+6714: BT: Fix bug when computing limits for max_bt_uploaders
6713: GeoIP: New web_infos URL for country list (thx to Choby)
- old URLs are updated to:
http://www.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz
Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -b -r1.224 -r1.225
--- src/daemon/common/commonOptions.ml 4 Jan 2009 00:22:59 -0000 1.224
+++ src/daemon/common/commonOptions.ml 4 Jan 2009 14:46:46 -0000 1.225
@@ -619,7 +619,7 @@
int_option 30
let max_upload_slots = define_option current_section ["max_upload_slots"]
- "How many slots can be used for upload"
+ "How many slots can be used for upload, minimum 3"
int_option 5
let max_release_slots = define_option current_section ["max_release_slots"]
Index: src/networks/bittorrent/bTOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTOptions.ml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- src/networks/bittorrent/bTOptions.ml 4 Aug 2008 19:33:06 -0000
1.39
+++ src/networks/bittorrent/bTOptions.ml 4 Jan 2009 14:46:46 -0000
1.40
@@ -85,11 +85,11 @@
bool_option true
let max_uploaders_per_torrent = define_option bittorrent_section
["max_uploaders_per_torrent"]
- "Maximum number of uploaders for one torrent"
- int_option 5
+ "Maximum number of uploaders for one torrent, can not be higher than
max_bt_uploaders"
+ int_option 3
let max_bt_uploaders = define_option bittorrent_section ["max_bt_uploaders"]
- "Maximum number of uploaders for bittorrent"
+ "Maximum number of uploaders for bittorrent, can not be higher than
max_upload_slots"
int_option 3
(* numwant: Optional. Number of peers that the client would like to receive
from the tracker.
@@ -110,19 +110,22 @@
let check_bt_uploaders () =
if !!max_bt_uploaders > !!max_upload_slots then
- max_bt_uploaders =:= !!max_upload_slots
+ max_bt_uploaders =:= !!max_upload_slots;
+ if !!max_uploaders_per_torrent > !!max_bt_uploaders then
+ max_uploaders_per_torrent =:= !!max_bt_uploaders
let _ =
begin
option_hook max_uploaders_per_torrent
(fun _ ->
let v = int_of_string (strings_of_option
max_uploaders_per_torrent).option_default in
- if !!max_uploaders_per_torrent < 1 then max_uploaders_per_torrent =:=
v);
+ if !!max_uploaders_per_torrent < 1 then max_uploaders_per_torrent =:=
v;
+ check_bt_uploaders ()
+ );
option_hook max_bt_uploaders
(fun _ ->
- let v1 = int_of_string (strings_of_option
max_upload_slots).option_default in
- let v2 = int_of_string (strings_of_option
max_bt_uploaders).option_default in
- if !!max_bt_uploaders < 1 || !!max_bt_uploaders > v1 then
max_bt_uploaders =:= v2;
+ if !!max_bt_uploaders < 1 then
+ max_bt_uploaders =:= int_of_string (strings_of_option
max_bt_uploaders).option_default;
check_bt_uploaders ()
);
option_hook max_tracker_redirect (** #4541 [egs] **)