4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-15 21:06:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2274

Browse Source 
7591c528 p2p: fallback on seed nodes if we can't make a connection (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-08-15 20:52:04 +02:00
commit fa73d6cbf1
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/p2p/net_node.h
View File

@ -226,6 +226,7 @@ namespace nodetool
bool is_addr_recently_failed(const epee::net_utils::network_address& addr); bool is_addr_recently_failed(const epee::net_utils::network_address& addr);
bool is_priority_node(const epee::net_utils::network_address& na); bool is_priority_node(const epee::net_utils::network_address& na);
std::set<std::string> get_seed_nodes(bool testnet) const; std::set<std::string> get_seed_nodes(bool testnet) const;
bool connect_to_seed();
template <class Container> template <class Container>
bool connect_to_peerlist(const Container& peers); bool connect_to_peerlist(const Container& peers);

31
src/p2p/net_node.inl
View File

@ -1171,14 +1171,11 @@ namespace nodetool
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
template<class t_payload_net_handler> template<class t_payload_net_handler>
bool node_server<t_payload_net_handler>::connections_maker() bool node_server<t_payload_net_handler>::connect_to_seed()
{ {
if (!connect_to_peerlist(m_exclusive_peers)) return false; if (m_seed_nodes.empty())
return true;
if (!m_exclusive_peers.empty()) return true;
if(!m_peerlist.get_white_peers_count() && m_seed_nodes.size())
{
size_t try_count = 0; size_t try_count = 0;
size_t current_index = crypto::rand<size_t>()%m_seed_nodes.size(); size_t current_index = crypto::rand<size_t>()%m_seed_nodes.size();
bool fallback_nodes_added = false; bool fallback_nodes_added = false;
@ -1211,6 +1208,21 @@ namespace nodetool
if(++current_index >= m_seed_nodes.size()) if(++current_index >= m_seed_nodes.size())
current_index = 0; current_index = 0;
} }
return true;
}
//-----------------------------------------------------------------------------------
template<class t_payload_net_handler>
bool node_server<t_payload_net_handler>::connections_maker()
{
if (!connect_to_peerlist(m_exclusive_peers)) return false;
if (!m_exclusive_peers.empty()) return true;
size_t start_conn_count = get_outgoing_connections_count();
if(!m_peerlist.get_white_peers_count() && m_seed_nodes.size())
{
if (!connect_to_seed())
return false;
} }
if (!connect_to_peerlist(m_priority_peers)) return false; if (!connect_to_peerlist(m_priority_peers)) return false;
@ -1242,6 +1254,13 @@ namespace nodetool
} }
} }
if (start_conn_count == get_outgoing_connections_count() && start_conn_count < m_config.m_net_config.connections_count)
{
MINFO("Failed to connect to any, trying seeds");
if (!connect_to_seed())
return false;
}
return true; return true;
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------