Revert "p2p: connect via the bound ip, if any"
This reverts commit 909398efc7
.
It looks like it's causing trouble with tor on some setups
This commit is contained in:
parent
77e1ebff26
commit
76d6d832d2
|
@ -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.");
|
||||||
|
|
Loading…
Reference in New Issue