Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-15 22:33:56 -05:00
Code Issues Projects Releases Packages Wiki Activity

print peer id in 0 padded hex for consistency

Browse source
This commit is contained in:
moneromooo-monero 2017-08-20 21:15:53 +01:00
parent 8f8cc09ba1
commit 5524bc3151
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
4 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p2p/net_node.inl
View file

@ -1077,7 +1077,7 @@ namespace nodetool
bool node_server<t_payload_net_handler>::make_new_connection_from_anchor_peerlist(const std::vector<anchor_peerlist_entry>& anchor_peerlist)
{
for (const auto& pe: anchor_peerlist) {
_note("Considering connecting (out) to peer: " << pe.id << " " << pe.adr.str());
_note("Considering connecting (out) to peer: " << peerid_type(pe.id) << " " << pe.adr.str());
if(is_peer_used(pe)) {
_note("Peer is used");
@ -1092,7 +1092,7 @@ namespace nodetool
continue;
}
MDEBUG("Selected peer: " << pe.id << " " << pe.adr.str()
MDEBUG("Selected peer: " << peerid_to_string(pe.id) << " " << pe.adr.str()
<< "[peer_type=" << anchor
<< "] first_seen: " << epee::misc_utils::get_time_interval_string(time(NULL) - pe.first_seen));
@ -1145,7 +1145,7 @@ namespace nodetool
++try_count;
_note("Considering connecting (out) to peer: " << pe.id << " " << pe.adr.str());
_note("Considering connecting (out) to peer: " << peerid_to_string(pe.id) << " " << pe.adr.str());
if(is_peer_used(pe)) {
_note("Peer is used");
@ -1158,7 +1158,7 @@ namespace nodetool
if(is_addr_recently_failed(pe.adr))
continue;
MDEBUG("Selected peer: " << pe.id << " " << pe.adr.str()
MDEBUG("Selected peer: " << peerid_to_string(pe.id) << " " << pe.adr.str()
<< "[peer_list=" << (use_white_list ? white : gray)
<< "] last_seen: " << (pe.last_seen ? epee::misc_utils::get_time_interval_string(time(NULL) - pe.last_seen) : "never"));
@ -1962,14 +1962,14 @@ namespace nodetool
if (!success) {
m_peerlist.remove_from_peer_gray(pe);
LOG_PRINT_L2("PEER EVICTED FROM GRAY PEER LIST IP address: " << pe.adr.host_str() << " Peer ID: " << std::hex << pe.id);
LOG_PRINT_L2("PEER EVICTED FROM GRAY PEER LIST IP address: " << pe.adr.host_str() << " Peer ID: " << peerid_type(pe.id));
return true;
}
m_peerlist.set_peer_just_seen(pe.id, pe.adr);
LOG_PRINT_L2("PEER PROMOTED TO WHITE PEER LIST IP address: " << pe.adr.host_str() << " Peer ID: " << std::hex << pe.id);
LOG_PRINT_L2("PEER PROMOTED TO WHITE PEER LIST IP address: " << pe.adr.host_str() << " Peer ID: " << peerid_type(pe.id));
return true;
}

7
src/p2p/p2p_protocol_defs.h
View file

@ -44,6 +44,13 @@ namespace nodetool
typedef boost::uuids::uuid uuid;
typedef uint64_t peerid_type;
static inline std::string peerid_to_string(peerid_type peer_id)
{
std::ostringstream s;
s << std::hex << peer_id;
return epee::string_tools::pad_string(s.str(), 16, '0', true);
}
#pragma pack (push, 1)
struct network_address_old