diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-08-13 20:03:59 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-08-13 20:04:06 +0200 |
| commit | 90fc005946038630454c47ee57509bf99679ebc0 (patch) | |
| tree | 5f44ce6d1f0201f008dd65bb51ba6a43b69cbeda /src | |
| parent | 9564dcab484f37acc57f3e0238f2929f81710f55 (diff) | |
| parent | 7764cd70061638bdc80cc2bc601fbce63d58b6c3 (diff) | |
| download | monzero-core-90fc005946038630454c47ee57509bf99679ebc0.tar.gz monzero-core-90fc005946038630454c47ee57509bf99679ebc0.tar.xz monzero-core-90fc005946038630454c47ee57509bf99679ebc0.zip | |
Merge pull request #368
7764cd7 net_node: skimplify rate limit code, and log as appropriate (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/p2p/net_node.inl | 13 |
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; |