diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-15 13:29:21 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-15 13:29:21 +0200 |
| commit | fa7278d6b5224178819d0dd2bdc40d21e8856c9f (patch) | |
| tree | 345ad815b725a1e9079ab8f945724f9003281402 /src/p2p | |
| parent | Merge pull request #4571 (diff) | |
| parent | Revert "p2p: connect via the bound ip, if any" (diff) | |
| download | monero-fa7278d6b5224178819d0dd2bdc40d21e8856c9f.tar.xz | |
Merge pull request #4578
76d6d832 Revert "p2p: connect via the bound ip, if any" (moneromooo-monero)
Diffstat (limited to 'src/p2p')
| -rw-r--r-- | src/p2p/net_node.inl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 74924e4f4..9390626a8 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl @@ -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."); |