mirror of
https://github.com/monero-project/monero.git
synced 2024-12-29 10:16:11 -05:00
Merge pull request #4578
76d6d832
Revert "p2p: connect via the bound ip, if any" (moneromooo-monero)
This commit is contained in:
commit
fa7278d6b5
@ -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.");
|
||||
|
Loading…
Reference in New Issue
Block a user