Merge pull request #5595
2aa1134
daemon: display peer address type in print_cn (moneromooo-monero)
This commit is contained in:
commit
8774555d29
|
@ -83,6 +83,8 @@ namespace cryptonote
|
|||
|
||||
uint32_t pruning_seed;
|
||||
|
||||
uint8_t address_type;
|
||||
|
||||
BEGIN_KV_SERIALIZE_MAP()
|
||||
KV_SERIALIZE(incoming)
|
||||
KV_SERIALIZE(localhost)
|
||||
|
@ -107,6 +109,7 @@ namespace cryptonote
|
|||
KV_SERIALIZE(connection_id)
|
||||
KV_SERIALIZE(height)
|
||||
KV_SERIALIZE(pruning_seed)
|
||||
KV_SERIALIZE(address_type)
|
||||
END_KV_SERIALIZE_MAP()
|
||||
};
|
||||
|
||||
|
|
|
@ -285,6 +285,7 @@ namespace cryptonote
|
|||
|
||||
cnx.height = cntxt.m_remote_blockchain_height;
|
||||
cnx.pruning_seed = cntxt.m_pruning_seed;
|
||||
cnx.address_type = (uint8_t)cntxt.m_remote_address.get_type_id();
|
||||
|
||||
connections.push_back(cnx);
|
||||
|
||||
|
|
|
@ -46,6 +46,19 @@
|
|||
namespace daemonize {
|
||||
|
||||
namespace {
|
||||
const char *get_address_type_name(epee::net_utils::address_type address_type)
|
||||
{
|
||||
switch (address_type)
|
||||
{
|
||||
default:
|
||||
case epee::net_utils::address_type::invalid: return "invalid";
|
||||
case epee::net_utils::address_type::ipv4: return "IPv4";
|
||||
case epee::net_utils::address_type::ipv6: return "IPv6";
|
||||
case epee::net_utils::address_type::i2p: return "I2P";
|
||||
case epee::net_utils::address_type::tor: return "Tor";
|
||||
}
|
||||
}
|
||||
|
||||
void print_peer(std::string const & prefix, cryptonote::peer const & peer)
|
||||
{
|
||||
time_t now;
|
||||
|
@ -590,6 +603,7 @@ bool t_rpc_command_executor::print_connections() {
|
|||
}
|
||||
|
||||
tools::msg_writer() << std::setw(30) << std::left << "Remote Host"
|
||||
<< std::setw(8) << "Type"
|
||||
<< std::setw(6) << "SSL"
|
||||
<< std::setw(20) << "Peer id"
|
||||
<< std::setw(20) << "Support Flags"
|
||||
|
@ -610,6 +624,7 @@ bool t_rpc_command_executor::print_connections() {
|
|||
tools::msg_writer()
|
||||
//<< std::setw(30) << std::left << in_out
|
||||
<< std::setw(30) << std::left << address
|
||||
<< std::setw(8) << (get_address_type_name((epee::net_utils::address_type)info.address_type))
|
||||
<< std::setw(6) << (info.ssl ? "yes" : "no")
|
||||
<< std::setw(20) << epee::string_tools::pad_string(info.peer_id, 16, '0', true)
|
||||
<< std::setw(20) << info.support_flags
|
||||
|
|
|
@ -566,6 +566,7 @@ void toJsonValue(rapidjson::Document& doc, const cryptonote::connection_info& in
|
|||
INSERT_INTO_JSON_OBJECT(val, doc, incoming, info.incoming);
|
||||
INSERT_INTO_JSON_OBJECT(val, doc, localhost, info.localhost);
|
||||
INSERT_INTO_JSON_OBJECT(val, doc, local_ip, info.local_ip);
|
||||
INSERT_INTO_JSON_OBJECT(val, doc, address_type, info.address_type);
|
||||
|
||||
INSERT_INTO_JSON_OBJECT(val, doc, ip, info.ip);
|
||||
INSERT_INTO_JSON_OBJECT(val, doc, port, info.port);
|
||||
|
@ -601,6 +602,7 @@ void fromJsonValue(const rapidjson::Value& val, cryptonote::connection_info& inf
|
|||
GET_FROM_JSON_OBJECT(val, info.incoming, incoming);
|
||||
GET_FROM_JSON_OBJECT(val, info.localhost, localhost);
|
||||
GET_FROM_JSON_OBJECT(val, info.local_ip, local_ip);
|
||||
GET_FROM_JSON_OBJECT(val, info.address_type, address_type);
|
||||
|
||||
GET_FROM_JSON_OBJECT(val, info.ip, ip);
|
||||
GET_FROM_JSON_OBJECT(val, info.port, port);
|
||||
|
|
Loading…
Reference in New Issue