diff --git a/src/command_tracker.cc b/src/command_tracker.cc index 8aa99d69..f9c507e9 100644 --- a/src/command_tracker.cc +++ b/src/command_tracker.cc @@ -153,6 +153,4 @@ initialize_command_tracker() { CMD2_ANY_STRING ("dht.add_node", std::bind(&apply_dht_add_node, std::placeholders::_2)); CMD2_ANY ("dht.statistics", std::bind(&core::DhtManager::dht_statistics, dht_manager)); - CMD2_ANY ("dht.throttle.name", std::bind(&core::DhtManager::throttle_name, dht_manager)); - CMD2_ANY_STRING_V ("dht.throttle.name.set", std::bind(&core::DhtManager::set_throttle_name, dht_manager, std::placeholders::_2)); } diff --git a/src/core/dht_manager.cc b/src/core/dht_manager.cc index 80a29868..8dbd644a 100644 --- a/src/core/dht_manager.cc +++ b/src/core/dht_manager.cc @@ -81,10 +81,6 @@ DhtManager::start_dht() { return; } - torrent::ThrottlePair throttles = control->core()->get_throttle(m_throttleName); - torrent::dht_controller()->set_upload_throttle(throttles.first); - torrent::dht_controller()->set_download_throttle(throttles.second); - if (!torrent::dht_controller()->start()) { m_start = dht_off; return; @@ -233,13 +229,11 @@ DhtManager::log_statistics(bool force) { if ((force && stats.cycle != m_dhtPrevCycle) || stats.cycle == 3 || stats.cycle > m_dhtPrevCycle + 7) { char buffer[256]; snprintf(buffer, sizeof(buffer), - "DHT statistics: %d queries in, %d queries out, %d replies received, %lld bytes read, %lld bytes sent, " + "DHT statistics: %d queries in, %d queries out, %d replies received, " "%d known nodes in %d buckets, %d peers (highest: %d) tracked in %d torrents.", stats.queries_received - m_dhtPrevQueriesReceived, stats.queries_sent - m_dhtPrevQueriesSent, stats.replies_received - m_dhtPrevRepliesReceived, - (long long unsigned int)(stats.down_rate.total() - m_dhtPrevBytesDown), - (long long unsigned int)(stats.up_rate.total() - m_dhtPrevBytesUp), stats.num_nodes, stats.num_buckets, stats.num_peers, @@ -252,8 +246,6 @@ DhtManager::log_statistics(bool force) { m_dhtPrevQueriesSent = stats.queries_sent; m_dhtPrevRepliesReceived = stats.replies_received; m_dhtPrevQueriesReceived = stats.queries_received; - m_dhtPrevBytesUp = stats.up_rate.total(); - m_dhtPrevBytesDown = stats.down_rate.total(); } return false; @@ -265,7 +257,7 @@ DhtManager::dht_statistics() { dhtStats.insert_key("dht", dht_settings[m_start]); dhtStats.insert_key("active", torrent::dht_controller()->is_active()); - dhtStats.insert_key("throttle", m_throttleName); + dhtStats.insert_key("throttle", ""); if (torrent::dht_controller()->is_active()) { auto stats = torrent::dht_controller()->get_statistics(); @@ -276,8 +268,8 @@ DhtManager::dht_statistics() { dhtStats.insert_key("replies_received", stats.replies_received); dhtStats.insert_key("errors_received", stats.errors_received); dhtStats.insert_key("errors_caught", stats.errors_caught); - dhtStats.insert_key("bytes_read", stats.down_rate.total()); - dhtStats.insert_key("bytes_written", stats.up_rate.total()); + dhtStats.insert_key("bytes_read", int64_t()); + dhtStats.insert_key("bytes_written", int64_t()); dhtStats.insert_key("nodes", stats.num_nodes); dhtStats.insert_key("buckets", stats.num_buckets); dhtStats.insert_key("peers", stats.num_peers); @@ -288,12 +280,4 @@ DhtManager::dht_statistics() { return dhtStats; } -void -DhtManager::set_throttle_name(const std::string& throttleName) { - if (torrent::dht_controller()->is_active()) - throw torrent::input_error("Cannot set DHT throttle while active."); - - m_throttleName = throttleName; -} - } diff --git a/src/core/dht_manager.h b/src/core/dht_manager.h index 62ad0acd..811e17ce 100644 --- a/src/core/dht_manager.h +++ b/src/core/dht_manager.h @@ -20,9 +20,6 @@ public: void set_mode(const std::string& arg); - void set_throttle_name(const std::string& throttleName); - const std::string& throttle_name() const { return m_throttleName; } - private: static const int dht_disable = 0; static const int dht_off = 1; @@ -47,8 +44,6 @@ private: bool m_warned{}; int m_start{dht_off}; - - std::string m_throttleName; }; } diff --git a/src/main.cc b/src/main.cc index 248b95b3..f5702767 100644 --- a/src/main.cc +++ b/src/main.cc @@ -350,74 +350,76 @@ main(int argc, char** argv) { // Functions that might not get depracted as they are nice for // configuration files, and thus might do with just some // cleanup. - CMD2_REDIRECT("upload_rate", "throttle.global_up.max_rate.set_kb"); - CMD2_REDIRECT("download_rate", "throttle.global_down.max_rate.set_kb"); + CMD2_REDIRECT("upload_rate", "throttle.global_up.max_rate.set_kb"); + CMD2_REDIRECT("download_rate", "throttle.global_down.max_rate.set_kb"); - CMD2_REDIRECT("ratio.enable", "group.seeding.ratio.enable"); - CMD2_REDIRECT("ratio.disable", "group.seeding.ratio.disable"); - CMD2_REDIRECT("ratio.min", "group.seeding.ratio.min"); - CMD2_REDIRECT("ratio.max", "group.seeding.ratio.max"); - CMD2_REDIRECT("ratio.upload", "group.seeding.ratio.upload"); - CMD2_REDIRECT("ratio.min.set", "group.seeding.ratio.min.set"); - CMD2_REDIRECT("ratio.max.set", "group.seeding.ratio.max.set"); - CMD2_REDIRECT("ratio.upload.set", "group.seeding.ratio.upload.set"); + CMD2_REDIRECT("ratio.enable", "group.seeding.ratio.enable"); + CMD2_REDIRECT("ratio.disable", "group.seeding.ratio.disable"); + CMD2_REDIRECT("ratio.min", "group.seeding.ratio.min"); + CMD2_REDIRECT("ratio.max", "group.seeding.ratio.max"); + CMD2_REDIRECT("ratio.upload", "group.seeding.ratio.upload"); + CMD2_REDIRECT("ratio.min.set", "group.seeding.ratio.min.set"); + CMD2_REDIRECT("ratio.max.set", "group.seeding.ratio.max.set"); + CMD2_REDIRECT("ratio.upload.set", "group.seeding.ratio.upload.set"); - CMD2_REDIRECT("encryption", "protocol.encryption.set"); - CMD2_REDIRECT("encoding_list", "encoding.add"); + CMD2_REDIRECT("encryption", "protocol.encryption.set"); + CMD2_REDIRECT("encoding_list", "encoding.add"); - CMD2_REDIRECT("connection_leech", "protocol.connection.leech.set"); - CMD2_REDIRECT("connection_seed", "protocol.connection.seed.set"); + CMD2_REDIRECT("connection_leech", "protocol.connection.leech.set"); + CMD2_REDIRECT("connection_seed", "protocol.connection.seed.set"); - CMD2_REDIRECT("min_peers", "throttle.min_peers.normal.set"); - CMD2_REDIRECT("max_peers", "throttle.max_peers.normal.set"); - CMD2_REDIRECT("min_peers_seed", "throttle.min_peers.seed.set"); - CMD2_REDIRECT("max_peers_seed", "throttle.max_peers.seed.set"); + CMD2_REDIRECT("min_peers", "throttle.min_peers.normal.set"); + CMD2_REDIRECT("max_peers", "throttle.max_peers.normal.set"); + CMD2_REDIRECT("min_peers_seed", "throttle.min_peers.seed.set"); + CMD2_REDIRECT("max_peers_seed", "throttle.max_peers.seed.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("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"); - CMD2_REDIRECT("max_downloads_div", "throttle.max_downloads.div.set"); - CMD2_REDIRECT("max_downloads_global", "throttle.max_downloads.global.set"); + CMD2_REDIRECT("max_uploads_div", "throttle.max_uploads.div.set"); + CMD2_REDIRECT("max_uploads_global", "throttle.max_uploads.global.set"); + CMD2_REDIRECT("max_downloads_div", "throttle.max_downloads.div.set"); + CMD2_REDIRECT("max_downloads_global", "throttle.max_downloads.global.set"); - CMD2_REDIRECT("max_memory_usage", "pieces.memory.max.set"); + CMD2_REDIRECT("max_memory_usage", "pieces.memory.max.set"); - CMD2_REDIRECT("bind", "network.bind_address.set"); - CMD2_REDIRECT("ip", "network.local_address.set"); - CMD2_REDIRECT("port_range", "network.port_range.set"); + CMD2_REDIRECT("bind", "network.bind_address.set"); + CMD2_REDIRECT("ip", "network.local_address.set"); + CMD2_REDIRECT("port_range", "network.port_range.set"); - CMD2_REDIRECT("dht", "dht.mode.set"); + CMD2_REDIRECT("dht", "dht.mode.set"); - CMD2_REDIRECT("port_random", "network.port_random.set"); - CMD2_REDIRECT("proxy_address", "network.proxy_address.set"); + CMD2_REDIRECT("port_random", "network.port_random.set"); + CMD2_REDIRECT("proxy_address", "network.proxy_address.set"); - CMD2_REDIRECT("scgi_port", "network.scgi.open_port"); - CMD2_REDIRECT("scgi_local", "network.scgi.open_local"); + CMD2_REDIRECT("scgi_port", "network.scgi.open_port"); + CMD2_REDIRECT("scgi_local", "network.scgi.open_local"); - CMD2_REDIRECT("directory", "directory.default.set"); - CMD2_REDIRECT("session", "session.path.set"); + CMD2_REDIRECT("directory", "directory.default.set"); + CMD2_REDIRECT("session", "session.path.set"); - CMD2_REDIRECT("check_hash", "pieces.hash.on_completion.set"); + CMD2_REDIRECT("check_hash", "pieces.hash.on_completion.set"); - CMD2_REDIRECT("key_layout", "keys.layout.set"); + CMD2_REDIRECT("key_layout", "keys.layout.set"); - CMD2_REDIRECT("to_gm_time", "convert.gm_time"); - CMD2_REDIRECT("to_gm_date", "convert.gm_date"); - CMD2_REDIRECT("to_time", "convert.time"); - CMD2_REDIRECT("to_date", "convert.date"); - CMD2_REDIRECT("to_elapsed_time", "convert.elapsed_time"); - CMD2_REDIRECT("to_kb", "convert.kb"); - CMD2_REDIRECT("to_mb", "convert.mb"); - CMD2_REDIRECT("to_xb", "convert.xb"); - CMD2_REDIRECT("to_throttle", "convert.throttle"); + CMD2_REDIRECT("to_gm_time", "convert.gm_time"); + CMD2_REDIRECT("to_gm_date", "convert.gm_date"); + CMD2_REDIRECT("to_time", "convert.time"); + CMD2_REDIRECT("to_date", "convert.date"); + CMD2_REDIRECT("to_elapsed_time", "convert.elapsed_time"); + CMD2_REDIRECT("to_kb", "convert.kb"); + CMD2_REDIRECT("to_mb", "convert.mb"); + CMD2_REDIRECT("to_xb", "convert.xb"); + CMD2_REDIRECT("to_throttle", "convert.throttle"); - CMD2_REDIRECT("torrent_list_layout", "ui.torrent_list.layout.set"); + CMD2_REDIRECT("torrent_list_layout", "ui.torrent_list.layout.set"); // Deprecate: + CMD2_VAR_STRING("dht.throttle.name", "deprecated"); + CMD2_REDIRECT("network.http.max_open", "network.http.max_total_connections"); CMD2_REDIRECT("network.http.max_open.set", "network.http.max_total_connections.set");