diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-08-15 17:06:17 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-08-15 17:06:17 -0500 |
| commit | b586ae1310baea79aa4c0370684f6c61d3efa539 (patch) | |
| tree | b7f11740f8f23ce6739c81f83e836786673b084a /src | |
| parent | Merge pull request #4024 (diff) | |
| parent | p2p: connect via the bound ip, if any (diff) | |
| download | monero-b586ae1310baea79aa4c0370684f6c61d3efa539.tar.xz | |
Merge pull request #4089
909398e p2p: connect via the bound ip, if any (moneromooo-monero)
Diffstat (limited to 'src')
| -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 9390626a8..74924e4f4 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); + con, m_bind_ip.empty() ? "0.0.0.0" : m_bind_ip); 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); + con, m_bind_ip.empty() ? "0.0.0.0" : m_bind_ip); 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."); |