Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4579 

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