aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-08-13 20:03:59 +0200
committerRiccardo Spagni <ric@spagni.net>2015-08-13 20:04:06 +0200
commit90fc005946038630454c47ee57509bf99679ebc0 (patch)
tree5f44ce6d1f0201f008dd65bb51ba6a43b69cbeda
parentMerge pull request #367 (diff)
parentnet_node: skimplify rate limit code, and log as appropriate (diff)
downloadmonero-90fc005946038630454c47ee57509bf99679ebc0.tar.xz
Merge pull request #368
7764cd7 net_node: skimplify rate limit code, and log as appropriate (moneromooo-monero)
-rw-r--r--src/p2p/net_node.inl13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index bce3ab5af..7360adc3c 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -1488,16 +1488,13 @@ namespace nodetool
limit_up = limit * 1024;
limit_down = limit * 1024;
}
- limit *= 1024;
- if(this->islimitdown==false && this->islimitup==false) {
+ if(!this->islimitup) {
epee::net_utils::connection<epee::levin::async_protocol_handler<p2p_connection_context> >::set_rate_up_limit(limit_up);
+ LOG_PRINT_L0("Set limit-up to " << limit_up/1024 << " kB/s");
+ }
+ if(!this->islimitdown) {
epee::net_utils::connection<epee::levin::async_protocol_handler<p2p_connection_context> >::set_rate_down_limit(limit_down);
- }
- else if(this->islimitdown==false && this->islimitup==true ) {
- epee::net_utils::connection<epee::levin::async_protocol_handler<p2p_connection_context> >::set_rate_down_limit(limit_down);
- }
- else if(this->islimitdown==true && this->islimitup==false ) {
- epee::net_utils::connection<epee::levin::async_protocol_handler<p2p_connection_context> >::set_rate_up_limit(limit_up);
+ LOG_PRINT_L0("Set limit-down to " << limit_down/1024 << " kB/s");
}
return true;