aboutsummaryrefslogtreecommitdiff
path: root/src/p2p
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-10-13 10:19:17 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-10-13 10:20:15 +0000
commitd7f3805d2e059358b16755dbb0abcccf7bda0cee (patch)
treecc22767cacdf02f4c2531a3e004f90b4a26d961b /src/p2p
parentMerge pull request #4544 (diff)
downloadmonero-d7f3805d2e059358b16755dbb0abcccf7bda0cee.tar.xz
Revert "p2p: connect via the bound ip, if any"
This reverts commit 909398efc79cb1fa92e330e9a50a316ca5858953. It looks like it's causing trouble with tor on some setups
Diffstat (limited to 'src/p2p')
-rw-r--r--src/p2p/net_node.inl6
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.");