From 6faea70de21fca01164210b857e96c87da211e46 Mon Sep 17 00:00:00 2001 From: rakshasa Date: Tue, 13 Sep 2011 01:42:14 +0000 Subject: [PATCH] * Added options for max_uploads and max_downloads. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1277 e378c898-3ddf-0310-93e7-cc216c733640 --- src/command_throttle.cc | 3 +++ src/core/download_factory.cc | 3 +++ src/main.cc | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/command_throttle.cc b/src/command_throttle.cc index cb9c44b1..bfca2758 100644 --- a/src/command_throttle.cc +++ b/src/command_throttle.cc @@ -172,7 +172,10 @@ initialize_command_throttle() { CMD2_VAR_VALUE ("throttle.min_peers.seed", -1); CMD2_VAR_VALUE ("throttle.max_peers.seed", -1); + CMD2_VAR_VALUE ("throttle.min_uploads", 0); CMD2_VAR_VALUE ("throttle.max_uploads", 50); + CMD2_VAR_VALUE ("throttle.min_downloads", 0); + CMD2_VAR_VALUE ("throttle.max_downloads", 50); CMD2_VAR_VALUE ("throttle.max_uploads.div", 1); CMD2_VAR_VALUE ("throttle.max_uploads.global", 0); diff --git a/src/core/download_factory.cc b/src/core/download_factory.cc index f4ed0693..28dc0956 100644 --- a/src/core/download_factory.cc +++ b/src/core/download_factory.cc @@ -253,7 +253,10 @@ DownloadFactory::receive_success() { if (!rtorrent->has_key_string("custom4")) rtorrent->insert_key("custom4", std::string()); if (!rtorrent->has_key_string("custom5")) rtorrent->insert_key("custom5", std::string()); + rpc::call_command("d.uploads_min.set", rpc::call_command_void("throttle.min_uploads"), rpc::make_target(download)); rpc::call_command("d.uploads_max.set", rpc::call_command_void("throttle.max_uploads"), rpc::make_target(download)); + rpc::call_command("d.downloads_min.set", rpc::call_command_void("throttle.min_downloads"), rpc::make_target(download)); + rpc::call_command("d.downloads_max.set", rpc::call_command_void("throttle.max_downloads"), rpc::make_target(download)); rpc::call_command("d.peers_min.set", rpc::call_command_void("throttle.min_peers.normal"), rpc::make_target(download)); rpc::call_command("d.peers_max.set", rpc::call_command_void("throttle.max_peers.normal"), rpc::make_target(download)); rpc::call_command("d.tracker_numwant.set", rpc::call_command_void("trackers.numwant"), rpc::make_target(download)); diff --git a/src/main.cc b/src/main.cc index 9bb53e33..4723bd63 100644 --- a/src/main.cc +++ b/src/main.cc @@ -357,7 +357,10 @@ main(int argc, char** argv) { CMD2_REDIRECT ("min_peers_seed", "throttle.min_peers.seed.set"); CMD2_REDIRECT ("max_peers_seed", "throttle.max_peers.seed.set"); - CMD2_REDIRECT ("max_uploads", "throttle.max_uploads.set"); + CMD2_REDIRECT ("min_uploads", "throttle.min_uploads.set"); + CMD2_REDIRECT ("max_uploads", "throttle.max_uploads.set"); + CMD2_REDIRECT ("min_downloads", "throttle.min_downloads.set"); + CMD2_REDIRECT ("max_downloads", "throttle.max_downloads.set"); CMD2_REDIRECT ("max_uploads_div", "throttle.max_uploads.div.set"); CMD2_REDIRECT ("max_uploads_global", "throttle.max_uploads.global.set");