Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rpc: add new RPCs to get and set limits

This commit is contained in:
MaxXor 2017-09-17 21:19:53 +02:00
parent 72b5f37f58
commit 2e59f6ea50
6 changed files with 219 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/daemon/command_parser_executor.cpp
View File

@ -334,17 +334,18 @@ bool t_command_parser_executor::set_limit(const std::vector<std::string>& args)
if(args.size()==0) {
return m_executor.get_limit();
}
int limit;
int64_t limit;
try {
limit = std::stoi(args[0]);
limit = std::stoll(args[0]);
}
catch(std::invalid_argument& ex) {
catch(const std::invalid_argument& ex) {
std::cout << "failed to parse argument" << std::endl;
return false;
}
if (limit==-1) limit=128;
limit *= 1024;
if (limit > 0)
limit *= 1024;
return m_executor.set_limit(limit);
return m_executor.set_limit(limit, limit);
}
bool t_command_parser_executor::set_limit_up(const std::vector<std::string>& args)
@ -353,17 +354,18 @@ bool t_command_parser_executor::set_limit_up(const std::vector<std::string>& arg
if(args.size()==0) {
return m_executor.get_limit_up();
}
int limit;
int64_t limit;
try {
limit = std::stoi(args[0]);
limit = std::stoll(args[0]);
}
catch(std::invalid_argument& ex) {
catch(const std::invalid_argument& ex) {
std::cout << "failed to parse argument" << std::endl;
return false;
}
if (limit==-1) limit=128;
limit *= 1024;
if (limit > 0)
limit *= 1024;
return m_executor.set_limit_up(limit);
return m_executor.set_limit(0, limit);
}
bool t_command_parser_executor::set_limit_down(const std::vector<std::string>& args)
@ -372,17 +374,18 @@ bool t_command_parser_executor::set_limit_down(const std::vector<std::string>& a
if(args.size()==0) {
return m_executor.get_limit_down();
}
int limit;
int64_t limit;
try {
limit = std::stoi(args[0]);
limit = std::stoll(args[0]);
}
catch(std::invalid_argument& ex) {
catch(const std::invalid_argument& ex) {
std::cout << "failed to parse argument" << std::endl;
return false;
}
if (limit==-1) limit=128;
limit *= 1024;
if (limit > 0)
limit *= 1024;
return m_executor.set_limit_down(limit);
return m_executor.set_limit(limit, 0);
}
bool t_command_parser_executor::out_peers(const std::vector<std::string>& args)

125
src/daemon/rpc_command_executor.cpp
View File

@ -1128,48 +1128,115 @@ bool t_rpc_command_executor::print_status()
bool t_rpc_command_executor::get_limit()
{
int limit_down = epee::net_utils::connection_basic::get_rate_down_limit( );
int limit_up = epee::net_utils::connection_basic::get_rate_up_limit( );
std::cout << "limit-down is " << limit_down/1024 << " kB/s" << std::endl;
std::cout << "limit-up is " << limit_up/1024 << " kB/s" << std::endl;
return true;
cryptonote::COMMAND_RPC_GET_LIMIT::request req;
cryptonote::COMMAND_RPC_GET_LIMIT::response res;
std::string failure_message = "Couldn't get limit";
if (m_is_rpc)
{
if (!m_rpc_client->rpc_request(req, res, "/get_limit", failure_message.c_str()))
{
return true;
}
}
else
{
if (!m_rpc_server->on_get_limit(req, res) || res.status != CORE_RPC_STATUS_OK)
{
tools::fail_msg_writer() << make_error(failure_message, res.status);
return true;
}
}
tools::msg_writer() << "limit-down is " << res.limit_down/1024 << " kB/s";
tools::msg_writer() << "limit-up is " << res.limit_up/1024 << " kB/s";
return true;
}
bool t_rpc_command_executor::set_limit(int limit)
bool t_rpc_command_executor::set_limit(int64_t limit_down, int64_t limit_up)
{
epee::net_utils::connection_basic::set_rate_down_limit( limit );
epee::net_utils::connection_basic::set_rate_up_limit( limit );
std::cout << "Set limit-down to " << limit/1024 << " kB/s" << std::endl;
std::cout << "Set limit-up to " << limit/1024 << " kB/s" << std::endl;
return true;
cryptonote::COMMAND_RPC_SET_LIMIT::request req;
cryptonote::COMMAND_RPC_SET_LIMIT::response res;
req.limit_down = limit_down;
req.limit_up = limit_up;
std::string failure_message = "Couldn't set limit";
if (m_is_rpc)
{
if (!m_rpc_client->rpc_request(req, res, "/set_limit", failure_message.c_str()))
{
return true;
}
}
else
{
if (!m_rpc_server->on_set_limit(req, res) || res.status != CORE_RPC_STATUS_OK)
{
tools::fail_msg_writer() << make_error(failure_message, res.status);
return true;
}
}
tools::msg_writer() << "Set limit-down to " << res.limit_down/1024 << " kB/s";
tools::msg_writer() << "Set limit-up to " << res.limit_up/1024 << " kB/s";
return true;
}
bool t_rpc_command_executor::get_limit_up()
{
int limit_up = epee::net_utils::connection_basic::get_rate_up_limit( );
std::cout << "limit-up is " << limit_up/1024 << " kB/s" << std::endl;
return true;
}
cryptonote::COMMAND_RPC_GET_LIMIT::request req;
cryptonote::COMMAND_RPC_GET_LIMIT::response res;
bool t_rpc_command_executor::set_limit_up(int limit)
{
epee::net_utils::connection_basic::set_rate_up_limit( limit );
std::cout << "Set limit-up to " << limit/1024 << " kB/s" << std::endl;
return true;
std::string failure_message = "Couldn't get limit";
if (m_is_rpc)
{
if (!m_rpc_client->rpc_request(req, res, "/get_limit", failure_message.c_str()))
{
return true;
}
}
else
{
if (!m_rpc_server->on_get_limit(req, res) || res.status != CORE_RPC_STATUS_OK)
{
tools::fail_msg_writer() << make_error(failure_message, res.status);
return true;
}
}
tools::msg_writer() << "limit-up is " << res.limit_up/1024 << " kB/s";
return true;
}
bool t_rpc_command_executor::get_limit_down()
{
int limit_down = epee::net_utils::connection_basic::get_rate_down_limit( );
std::cout << "limit-down is " << limit_down/1024 << " kB/s" << std::endl;
return true;
}
cryptonote::COMMAND_RPC_GET_LIMIT::request req;
cryptonote::COMMAND_RPC_GET_LIMIT::response res;
bool t_rpc_command_executor::set_limit_down(int limit)
{
epee::net_utils::connection_basic::set_rate_down_limit( limit );
std::cout << "Set limit-down to " << limit/1024 << " kB/s" << std::endl;
return true;
std::string failure_message = "Couldn't get limit";
if (m_is_rpc)
{
if (!m_rpc_client->rpc_request(req, res, "/get_limit", failure_message.c_str()))
{
return true;
}
}
else
{
if (!m_rpc_server->on_get_limit(req, res) || res.status != CORE_RPC_STATUS_OK)
{
tools::fail_msg_writer() << make_error(failure_message, res.status);
return true;
}
}
tools::msg_writer() << "limit-down is " << res.limit_down/1024 << " kB/s";
return true;
}
bool t_rpc_command_executor::out_peers(uint64_t limit)

6
src/daemon/rpc_command_executor.h
View File

@ -119,11 +119,7 @@ public:
bool get_limit_down();
bool set_limit(int limit);
bool set_limit_up(int limit);
bool set_limit_down(int limit);
bool set_limit(int64_t limit_down, int64_t limit_up);
bool out_peers(uint64_t limit);

47
src/rpc/core_rpc_server.cpp
View File

@ -1522,6 +1522,53 @@ namespace cryptonote
return true;
}
//------------------------------------------------------------------------------------------------------------------------------
bool core_rpc_server::on_get_limit(const COMMAND_RPC_GET_LIMIT::request& req, COMMAND_RPC_GET_LIMIT::response& res)
{
res.limit_down = epee::net_utils::connection_basic::get_rate_down_limit();
res.limit_up = epee::net_utils::connection_basic::get_rate_up_limit();
res.status = CORE_RPC_STATUS_OK;
return true;
}
//------------------------------------------------------------------------------------------------------------------------------
bool core_rpc_server::on_set_limit(const COMMAND_RPC_SET_LIMIT::request& req, COMMAND_RPC_SET_LIMIT::response& res)
{
// -1 = reset to default
// 0 = do not modify
if (req.limit_down > 0)
{
epee::net_utils::connection_basic::set_rate_down_limit(req.limit_down);
}
else if (req.limit_down < 0)
{
if (req.limit_down != -1)
{
res.status = CORE_RPC_ERROR_CODE_WRONG_PARAM;
return false;
}
epee::net_utils::connection_basic::set_rate_down_limit(nodetool::default_limit_down * 1024);
}
if (req.limit_up > 0)
{
epee::net_utils::connection_basic::set_rate_up_limit(req.limit_up);
}
else if (req.limit_up < 0)
{
if (req.limit_up != -1)
{
res.status = CORE_RPC_ERROR_CODE_WRONG_PARAM;
return false;
}
epee::net_utils::connection_basic::set_rate_up_limit(nodetool::default_limit_up * 1024);
}
res.limit_down = epee::net_utils::connection_basic::get_rate_down_limit();
res.limit_up = epee::net_utils::connection_basic::get_rate_up_limit();
res.status = CORE_RPC_STATUS_OK;
return true;
}
//------------------------------------------------------------------------------------------------------------------------------
bool core_rpc_server::on_out_peers(const COMMAND_RPC_OUT_PEERS::request& req, COMMAND_RPC_OUT_PEERS::response& res)
{
// TODO

4
src/rpc/core_rpc_server.h
View File

@ -97,6 +97,8 @@ namespace cryptonote
MAP_URI_AUTO_JON2("/get_transaction_pool_stats", on_get_transaction_pool_stats, COMMAND_RPC_GET_TRANSACTION_POOL_STATS)
MAP_URI_AUTO_JON2_IF("/stop_daemon", on_stop_daemon, COMMAND_RPC_STOP_DAEMON, !m_restricted)
MAP_URI_AUTO_JON2("/getinfo", on_get_info, COMMAND_RPC_GET_INFO)
MAP_URI_AUTO_JON2("/get_limit", on_get_limit, COMMAND_RPC_GET_LIMIT)
MAP_URI_AUTO_JON2_IF("/set_limit", on_set_limit, COMMAND_RPC_SET_LIMIT, !m_restricted)
MAP_URI_AUTO_JON2_IF("/out_peers", on_out_peers, COMMAND_RPC_OUT_PEERS, !m_restricted)
MAP_URI_AUTO_JON2_IF("/start_save_graph", on_start_save_graph, COMMAND_RPC_START_SAVE_GRAPH, !m_restricted)
MAP_URI_AUTO_JON2_IF("/stop_save_graph", on_stop_save_graph, COMMAND_RPC_STOP_SAVE_GRAPH, !m_restricted)
@ -155,6 +157,8 @@ namespace cryptonote
bool on_get_transaction_pool_hashes(const COMMAND_RPC_GET_TRANSACTION_POOL_HASHES::request& req, COMMAND_RPC_GET_TRANSACTION_POOL_HASHES::response& res);
bool on_get_transaction_pool_stats(const COMMAND_RPC_GET_TRANSACTION_POOL_STATS::request& req, COMMAND_RPC_GET_TRANSACTION_POOL_STATS::response& res);
bool on_stop_daemon(const COMMAND_RPC_STOP_DAEMON::request& req, COMMAND_RPC_STOP_DAEMON::response& res);
bool on_get_limit(const COMMAND_RPC_GET_LIMIT::request& req, COMMAND_RPC_GET_LIMIT::response& res);
bool on_set_limit(const COMMAND_RPC_SET_LIMIT::request& req, COMMAND_RPC_SET_LIMIT::response& res);
bool on_out_peers(const COMMAND_RPC_OUT_PEERS::request& req, COMMAND_RPC_OUT_PEERS::response& res);
bool on_start_save_graph(const COMMAND_RPC_START_SAVE_GRAPH::request& req, COMMAND_RPC_START_SAVE_GRAPH::response& res);
bool on_stop_save_graph(const COMMAND_RPC_STOP_SAVE_GRAPH::request& req, COMMAND_RPC_STOP_SAVE_GRAPH::response& res);

51
src/rpc/core_rpc_server_commands_defs.h
View File

@ -49,7 +49,7 @@ namespace cryptonote
// advance which version they will stop working with
// Don't go over 32767 for any of these
#define CORE_RPC_VERSION_MAJOR 1
#define CORE_RPC_VERSION_MINOR 13
#define CORE_RPC_VERSION_MINOR 14
#define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor))
#define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR)
@ -1242,6 +1242,55 @@ namespace cryptonote
};
};
struct COMMAND_RPC_GET_LIMIT
{
struct request
{
BEGIN_KV_SERIALIZE_MAP()
END_KV_SERIALIZE_MAP()
};
struct response
{
std::string status;
uint64_t limit_up;
uint64_t limit_down;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(status)
KV_SERIALIZE(limit_up)
KV_SERIALIZE(limit_down)
END_KV_SERIALIZE_MAP()
};
};
struct COMMAND_RPC_SET_LIMIT
{
struct request
{
int64_t limit_down;
int64_t limit_up;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(limit_down)
KV_SERIALIZE(limit_up)
END_KV_SERIALIZE_MAP()
};
struct response
{
std::string status;
uint64_t limit_up;
uint64_t limit_down;
BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(status)
KV_SERIALIZE(limit_up)
KV_SERIALIZE(limit_down)
END_KV_SERIALIZE_MAP()
};
};
struct COMMAND_RPC_OUT_PEERS
{
struct request