Merge pull request #368

7764cd7 net_node: skimplify rate limit code, and log as appropriate (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-08-13 20:03:59 +02:00
commit 90fc005946
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 8 deletions

View File

@ -1488,16 +1488,13 @@ namespace nodetool
limit_up = limit * 1024; limit_up = limit * 1024;
limit_down = limit * 1024; limit_down = limit * 1024;
} }
limit *= 1024; if(!this->islimitup) {
if(this->islimitdown==false && this->islimitup==false) {
epee::net_utils::connection<epee::levin::async_protocol_handler<p2p_connection_context> >::set_rate_up_limit(limit_up); 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); epee::net_utils::connection<epee::levin::async_protocol_handler<p2p_connection_context> >::set_rate_down_limit(limit_down);
} LOG_PRINT_L0("Set limit-down to " << limit_down/1024 << " kB/s");
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);
} }
return true; return true;