monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[RELEASE] Fix broken interactive daemon 'limit' commands plus RPC calls

Browse source
This commit is contained in:
rbrunner7 2018-04-25 21:37:10 +02:00
parent 41a66bf05b
commit c0e22ebcca
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/daemon/command_parser_executor.cpp
View file

@ -379,8 +379,6 @@ bool t_command_parser_executor::set_limit(const std::vector<std::string>& args)
std::cout << "failed to parse argument" << std::endl; std::cout << "failed to parse argument" << std::endl;
return false; return false;
} }
if (limit > 0)
limit *= 1024;
return m_executor.set_limit(limit, limit); return m_executor.set_limit(limit, limit);
} }
@ -399,8 +397,6 @@ bool t_command_parser_executor::set_limit_up(const std::vector<std::string>& arg
std::cout << "failed to parse argument" << std::endl; std::cout << "failed to parse argument" << std::endl;
return false; return false;
} }
if (limit > 0)
limit *= 1024;
return m_executor.set_limit(0, limit); return m_executor.set_limit(0, limit);
} }
@ -419,8 +415,6 @@ bool t_command_parser_executor::set_limit_down(const std::vector<std::string>& a
std::cout << "failed to parse argument" << std::endl; std::cout << "failed to parse argument" << std::endl;
return false; return false;
} }
if (limit > 0)
limit *= 1024;
return m_executor.set_limit(limit, 0); return m_executor.set_limit(limit, 0);
} }

12
src/daemon/rpc_command_executor.cpp
View file

@ -1176,8 +1176,8 @@ bool t_rpc_command_executor::get_limit()
} }
} }
tools::msg_writer() << "limit-down is " << res.limit_down/1024 << " kB/s"; tools::msg_writer() << "limit-down is " << res.limit_down << " kB/s";
tools::msg_writer() << "limit-up is " << res.limit_up/1024 << " kB/s"; tools::msg_writer() << "limit-up is " << res.limit_up << " kB/s";
return true; return true;
} }
@ -1207,8 +1207,8 @@ bool t_rpc_command_executor::set_limit(int64_t limit_down, int64_t limit_up)
} }
} }
tools::msg_writer() << "Set limit-down to " << res.limit_down/1024 << " kB/s"; tools::msg_writer() << "Set limit-down to " << res.limit_down << " kB/s";
tools::msg_writer() << "Set limit-up to " << res.limit_up/1024 << " kB/s"; tools::msg_writer() << "Set limit-up to " << res.limit_up << " kB/s";
return true; return true;
} }
@ -1235,7 +1235,7 @@ bool t_rpc_command_executor::get_limit_up()
} }
} }
tools::msg_writer() << "limit-up is " << res.limit_up/1024 << " kB/s"; tools::msg_writer() << "limit-up is " << res.limit_up << " kB/s";
return true; return true;
} }
@ -1262,7 +1262,7 @@ bool t_rpc_command_executor::get_limit_down()
} }
} }
tools::msg_writer() << "limit-down is " << res.limit_down/1024 << " kB/s"; tools::msg_writer() << "limit-down is " << res.limit_down << " kB/s";
return true; return true;
} }

4
src/p2p/net_node.h
View file

@ -334,8 +334,8 @@ namespace nodetool
cryptonote::network_type m_nettype; cryptonote::network_type m_nettype;
}; };
const int64_t default_limit_up = 2048; const int64_t default_limit_up = 2048; // kB/s
const int64_t default_limit_down = 8192; const int64_t default_limit_down = 8192; // kB/s
extern const command_line::arg_descriptor<std::string> arg_p2p_bind_ip; extern const command_line::arg_descriptor<std::string> arg_p2p_bind_ip;
extern const command_line::arg_descriptor<std::string, false, true, 2> arg_p2p_bind_port; extern const command_line::arg_descriptor<std::string, false, true, 2> arg_p2p_bind_port;
extern const command_line::arg_descriptor<uint32_t> arg_p2p_external_port; extern const command_line::arg_descriptor<uint32_t> arg_p2p_external_port;

2
src/rpc/core_rpc_server_commands_defs.h
View file

@ -1705,7 +1705,7 @@ namespace cryptonote
{ {
struct request struct request
{ {
int64_t limit_down; int64_t limit_down; // all limits (for get and set) are kB/s
int64_t limit_up; int64_t limit_up;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()