Merge pull request #6283

a84131ce p2p: fix off by one adding fallback peers (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-03-27 12:19:54 -07:00
commit e160e0b517
No known key found for this signature in database
GPG Key ID: C64552D877C32479

View File

@ -1552,14 +1552,14 @@ namespace nodetool
if (!m_fallback_seed_nodes_added) if (!m_fallback_seed_nodes_added)
{ {
MWARNING("Failed to connect to any of seed peers, trying fallback seeds"); MWARNING("Failed to connect to any of seed peers, trying fallback seeds");
current_index = m_seed_nodes.size(); current_index = m_seed_nodes.size() - 1;
for (const auto &peer: get_seed_nodes(m_nettype)) for (const auto &peer: get_seed_nodes(m_nettype))
{ {
MDEBUG("Fallback seed node: " << peer); MDEBUG("Fallback seed node: " << peer);
append_net_address(m_seed_nodes, peer, cryptonote::get_config(m_nettype).P2P_DEFAULT_PORT); append_net_address(m_seed_nodes, peer, cryptonote::get_config(m_nettype).P2P_DEFAULT_PORT);
} }
m_fallback_seed_nodes_added = true; m_fallback_seed_nodes_added = true;
if (current_index == m_seed_nodes.size()) if (current_index == m_seed_nodes.size() - 1)
{ {
MWARNING("No fallback seeds, continuing without seeds"); MWARNING("No fallback seeds, continuing without seeds");
break; break;