Merge pull request #5849

b51f4cd daemon: add pruned and publicrpc flags to print_pl (moneromooo-monero)
This commit is contained in:
luigi1111 2019-09-08 19:59:05 -05:00
commit d30b234f08
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 22 additions and 7 deletions

View file

@ -60,8 +60,13 @@ namespace {
}
}
void print_peer(std::string const & prefix, cryptonote::peer const & peer)
void print_peer(std::string const & prefix, cryptonote::peer const & peer, bool pruned_only, bool publicrpc_only)
{
if (pruned_only && peer.pruning_seed == 0)
return;
if (publicrpc_only && peer.rpc_port == 0)
return;
time_t now;
time(&now);
time_t last_seen = static_cast<time_t>(peer.last_seen);
@ -169,7 +174,7 @@ t_rpc_command_executor::~t_rpc_command_executor()
}
}
bool t_rpc_command_executor::print_peer_list(bool white, bool gray, size_t limit) {
bool t_rpc_command_executor::print_peer_list(bool white, bool gray, size_t limit, bool pruned_only, bool publicrpc_only) {
cryptonote::COMMAND_RPC_GET_PEER_LIST::request req;
cryptonote::COMMAND_RPC_GET_PEER_LIST::response res;
@ -196,7 +201,7 @@ bool t_rpc_command_executor::print_peer_list(bool white, bool gray, size_t limit
const auto end = limit ? peer + std::min(limit, res.white_list.size()) : res.white_list.cend();
for (; peer != end; ++peer)
{
print_peer("white", *peer);
print_peer("white", *peer, pruned_only, publicrpc_only);
}
}
@ -206,7 +211,7 @@ bool t_rpc_command_executor::print_peer_list(bool white, bool gray, size_t limit
const auto end = limit ? peer + std::min(limit, res.gray_list.size()) : res.gray_list.cend();
for (; peer != end; ++peer)
{
print_peer("gray", *peer);
print_peer("gray", *peer, pruned_only, publicrpc_only);
}
}