Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

p2p: fix spurious warning when we're connected to at last one seed

Browse Source
This commit is contained in:
moneromooo-monero 2020-01-03 17:58:13 +00:00
parent 907292dfb4
commit b818522d29
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p2p/net_node.inl
View File

@ -1541,6 +1541,7 @@ namespace nodetool
return true; return true;
size_t try_count = 0; size_t try_count = 0;
bool is_connected_to_at_least_one_seed_node = false;
size_t current_index = crypto::rand_idx(m_seed_nodes.size()); size_t current_index = crypto::rand_idx(m_seed_nodes.size());
const net_server& server = m_network_zones.at(epee::net_utils::zone::public_).m_net_server; const net_server& server = m_network_zones.at(epee::net_utils::zone::public_).m_net_server;
while(true) while(true)
@ -1548,7 +1549,11 @@ namespace nodetool
if(server.is_stop_signal_sent()) if(server.is_stop_signal_sent())
return false; return false;
if(try_to_connect_and_handshake_with_new_peer(m_seed_nodes[current_index], true)) peerlist_entry pe_seed{};
pe_seed.adr = m_seed_nodes[current_index];
if (is_peer_used(pe_seed))
is_connected_to_at_least_one_seed_node = true;
else if (try_to_connect_and_handshake_with_new_peer(m_seed_nodes[current_index], true))
break; break;
if(++try_count > m_seed_nodes.size()) if(++try_count > m_seed_nodes.size())
{ {
@ -1571,6 +1576,7 @@ namespace nodetool
} }
else else
{ {
if (!is_connected_to_at_least_one_seed_node)
MWARNING("Failed to connect to any of seed peers, continuing without seeds"); MWARNING("Failed to connect to any of seed peers, continuing without seeds");
break; break;
} }