p2p: connect via the bound ip, if any

This commit is contained in:
moneromooo-monero 2018-07-02 18:04:44 +01:00
parent a9b83f5a6e
commit 909398efc7
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3

View file

@ -934,7 +934,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); con, m_bind_ip.empty() ? "0.0.0.0" : m_bind_ip);
if(!res) if(!res)
{ {
@ -999,7 +999,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); con, m_bind_ip.empty() ? "0.0.0.0" : m_bind_ip);
if (!res) { if (!res) {
bool is_priority = is_priority_node(na); bool is_priority = is_priority_node(na);
@ -1614,7 +1614,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.");