diff options
Diffstat (limited to 'src/p2p')
-rw-r--r-- | src/p2p/connection_basic.cpp | 21 | ||||
-rw-r--r-- | src/p2p/connection_basic.hpp | 2 | ||||
-rw-r--r-- | src/p2p/network_throttle-detail.cpp | 2 | ||||
-rw-r--r-- | src/p2p/network_throttle-detail.hpp | 2 | ||||
-rw-r--r-- | src/p2p/network_throttle.hpp | 2 |
5 files changed, 24 insertions, 5 deletions
diff --git a/src/p2p/connection_basic.cpp b/src/p2p/connection_basic.cpp index 0454f30e3..d3f6415c5 100644 --- a/src/p2p/connection_basic.cpp +++ b/src/p2p/connection_basic.cpp @@ -199,6 +199,23 @@ void connection_basic::set_rate_down_limit(uint64_t limit) { save_limit_to_file(limit); } +uint64_t connection_basic::get_rate_up_limit() { + uint64_t limit; + { + CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_out ); + limit = network_throttle_manager::get_global_throttle_out().get_target_speed(); + } + return limit; +} + +uint64_t connection_basic::get_rate_down_limit() { + uint64_t limit; + { + CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_in ); + limit = network_throttle_manager::get_global_throttle_in().get_target_speed(); + } + return limit; +} void connection_basic::save_limit_to_file(int limit) { // saving limit to file @@ -207,12 +224,12 @@ void connection_basic::save_limit_to_file(int limit) { { CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_out ); - epee::net_utils::data_logger::get_instance().add_data("upload_limit", network_throttle_manager::get_global_throttle_out().get_terget_speed() / 1024); + epee::net_utils::data_logger::get_instance().add_data("upload_limit", network_throttle_manager::get_global_throttle_out().get_target_speed() / 1024); } { CRITICAL_REGION_LOCAL( network_throttle_manager::m_lock_get_global_throttle_in ); - epee::net_utils::data_logger::get_instance().add_data("download_limit", network_throttle_manager::get_global_throttle_in().get_terget_speed() / 1024); + epee::net_utils::data_logger::get_instance().add_data("download_limit", network_throttle_manager::get_global_throttle_in().get_target_speed() / 1024); } } diff --git a/src/p2p/connection_basic.hpp b/src/p2p/connection_basic.hpp index d8101afe4..945cd982c 100644 --- a/src/p2p/connection_basic.hpp +++ b/src/p2p/connection_basic.hpp @@ -119,6 +119,8 @@ class connection_basic { // not-templated base class for rapid developmet of som static void set_rate_up_limit(uint64_t limit); static void set_rate_down_limit(uint64_t limit); + static uint64_t get_rate_up_limit(); + static uint64_t get_rate_down_limit(); // config misc static void set_tos_flag(int tos); // ToS / QoS flag diff --git a/src/p2p/network_throttle-detail.cpp b/src/p2p/network_throttle-detail.cpp index 6fa27b62a..6e6989d44 100644 --- a/src/p2p/network_throttle-detail.cpp +++ b/src/p2p/network_throttle-detail.cpp @@ -172,7 +172,7 @@ void network_throttle::set_real_target_speed( network_speed_kbps real_target ) m_real_target_speed = real_target * 1024; } -network_speed_kbps network_throttle::get_terget_speed() +network_speed_kbps network_throttle::get_target_speed() { return m_real_target_speed / 1024; } diff --git a/src/p2p/network_throttle-detail.hpp b/src/p2p/network_throttle-detail.hpp index 063dac850..9f0003332 100644 --- a/src/p2p/network_throttle-detail.hpp +++ b/src/p2p/network_throttle-detail.hpp @@ -81,7 +81,7 @@ class network_throttle : public i_network_throttle { virtual void set_name(const std::string &name); virtual void set_target_speed( network_speed_kbps target ); virtual void set_real_target_speed( network_speed_kbps real_target ); // only for throttle_out - virtual network_speed_kbps get_terget_speed(); + virtual network_speed_kbps get_target_speed(); // add information about events: virtual void handle_trafic_exact(size_t packet_size); ///< count the new traffic/packet; the size is exact considering all network costs diff --git a/src/p2p/network_throttle.hpp b/src/p2p/network_throttle.hpp index add4daa86..b93cfc563 100644 --- a/src/p2p/network_throttle.hpp +++ b/src/p2p/network_throttle.hpp @@ -147,7 +147,7 @@ class i_network_throttle { virtual void set_name(const std::string &name)=0; virtual void set_target_speed( network_speed_kbps target )=0; virtual void set_real_target_speed(network_speed_kbps real_target)=0; - virtual network_speed_kbps get_terget_speed()=0; + virtual network_speed_kbps get_target_speed()=0; virtual void handle_trafic_exact(size_t packet_size) =0; // count the new traffic/packet; the size is exact considering all network costs virtual void handle_trafic_tcp(size_t packet_size) =0; // count the new traffic/packet; the size is as TCP, we will consider MTU etc |