Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-07-28 04:25:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6053

Browse source 
deb350b7 always print peer IDs in the same format (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-02-06 00:28:47 -08:00
commit 34d7ea62f6
No known key found for this signature in database
GPG key ID: C64552D877C32479
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file

@ -188,7 +188,7 @@ namespace cryptonote
auto connection_time = time(NULL) - cntxt.m_started;
ss << std::setw(30) << std::left << std::string(cntxt.m_is_income ? " [INC]":"[OUT]") +
cntxt.m_remote_address.str()
<< std::setw(20) << std::hex << peer_id
<< std::setw(20) << nodetool::peerid_to_string(peer_id)
<< std::setw(20) << std::hex << support_flags
<< std::setw(30) << std::to_string(cntxt.m_recv_cnt)+ "(" + std::to_string(time(NULL) - cntxt.m_last_recv) + ")" + "/" + std::to_string(cntxt.m_send_cnt) + "(" + std::to_string(time(NULL) - cntxt.m_last_send) + ")"
<< std::setw(25) << get_protocol_state_string(cntxt.m_state)
@ -248,9 +248,7 @@ namespace cryptonote
cnx.rpc_port = cntxt.m_rpc_port;
cnx.rpc_credits_per_hash = cntxt.m_rpc_credits_per_hash;
std::stringstream peer_id_str;
peer_id_str << std::hex << std::setw(16) << peer_id;
peer_id_str >> cnx.peer_id;
cnx.peer_id = nodetool::peerid_to_string(peer_id);
cnx.support_flags = support_flags;