Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-08-04 14:04:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

p2p, bugfix: correctly detect CJDNS addnode entries in AddNode()

Browse Source
This commit is contained in:
Jon Atack 2023-11-14 21:12:34 -06:00
parent ca1300fbc5
commit 28823f30dc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/net.cpp
View File

@ -3483,12 +3483,17 @@ std::vector<CAddress> CConnman::GetAddresses(CNode& requestor, size_t max_addres
bool CConnman::AddNode(const AddedNodeParams& add) bool CConnman::AddNode(const AddedNodeParams& add)
{ {
const CService resolved(LookupNumeric(add.m_added_node, GetDefaultPort(add.m_added_node))); const CService resolved{MaybeFlipIPv6toCJDNS(LookupNumeric(add.m_added_node, GetDefaultPort(add.m_added_node)))};
const bool resolved_is_valid{resolved.IsValid()}; const bool resolved_invalid{!resolved.IsValid()};
LOCK(m_added_nodes_mutex); LOCK(m_added_nodes_mutex);
for (const auto& it : m_added_node_params) { for (const auto& it : m_added_node_params) {
if (add.m_added_node == it.m_added_node || (resolved_is_valid && resolved == LookupNumeric(it.m_added_node, GetDefaultPort(it.m_added_node)))) return false; if (add.m_added_node == it.m_added_node) return false;
if (resolved_invalid) continue;
const CService service{MaybeFlipIPv6toCJDNS(LookupNumeric(it.m_added_node, GetDefaultPort(it.m_added_node)))};
if (resolved == service) return false;
// Check if CJDNS address matches regardless of port to detect already-connected inbound peers.
if (resolved.IsCJDNS() && static_cast<CNetAddr>(resolved) == static_cast<CNetAddr>(service)) return false;
} }
m_added_node_params.push_back(add); m_added_node_params.push_back(add);