aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-03-14 16:10:42 +0200
committerRiccardo Spagni <ric@spagni.net>2018-03-14 16:10:42 +0200
commitf9f2d182da8dd63b6b5f5c4e86b6a82828b0ed4e (patch)
tree502c664a88d567e91e5c5d3e4d41f12b5cb1aab6
parentMerge pull request #3386 (diff)
parentp2p: fix network ID being uninitialised when using exclusive peers (diff)
downloadmonero-f9f2d182da8dd63b6b5f5c4e86b6a82828b0ed4e.tar.xz
Merge pull request #3395
523371c0 p2p: fix network ID being uninitialised when using exclusive peers (moneromooo-monero)
-rw-r--r--src/p2p/net_node.inl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 8ef240326..54875e619 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -422,9 +422,11 @@ namespace nodetool
memcpy(&m_network_id, &::config::stagenet::NETWORK_ID, 16);
full_addrs = get_seed_nodes(cryptonote::STAGENET);
}
- else if (m_exclusive_peers.empty())
+ else
{
memcpy(&m_network_id, &::config::NETWORK_ID, 16);
+ if (m_exclusive_peers.empty())
+ {
// for each hostname in the seed nodes list, attempt to DNS resolve and
// add the result addresses as seed nodes
// TODO: at some point add IPv6 support, but that won't be relevant
@@ -505,6 +507,7 @@ namespace nodetool
full_addrs.insert(peer);
}
}
+ }
for (const auto& full_addr : full_addrs)
{