Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3395 

523371c0 p2p: fix network ID being uninitialised when using exclusive peers (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-03-14 16:10:42 +02:00
parent 8b90e3141a 523371c042
commit f9f2d182da
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/p2p/net_node.inl
View File

@ -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)
{