monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4579

Browse source 
d7f3805d Revert "p2p: connect via the bound ip, if any" (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-10-15 13:49:32 +02:00
commit dc24639e64
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p2p/net_node.inl
View file

@ -937,7 +937,7 @@ namespace nodetool
bool res = m_net_server.connect(epee::string_tools::get_ip_string_from_int32(ipv4.ip()),
epee::string_tools::num_to_string_fast(ipv4.port()),
m_config.m_net_config.connection_timeout,
con, m_bind_ip.empty() ? "0.0.0.0" : m_bind_ip);
con);
if(!res)
{
@ -1002,7 +1002,7 @@ namespace nodetool
bool res = m_net_server.connect(epee::string_tools::get_ip_string_from_int32(ipv4.ip()),
epee::string_tools::num_to_string_fast(ipv4.port()),
m_config.m_net_config.connection_timeout,
con, m_bind_ip.empty() ? "0.0.0.0" : m_bind_ip);
con);
if (!res) {
bool is_priority = is_priority_node(na);
@ -1617,7 +1617,7 @@ namespace nodetool
return false;
}
return true;
}, m_bind_ip.empty() ? "0.0.0.0" : m_bind_ip);
});
if(!r)
{
LOG_WARNING_CC(context, "Failed to call connect_async, network error.");