highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 07:09:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

net: merge AlreadyConnectedToAddress() and FindNode(CNetAddr)

Browse Source 
`CConnman::AlreadyConnectedToAddress()` is the only caller of
`CConnman::FindNode(CNetAddr)`, so merge the two in one function.

The unit test that checked whether `AlreadyConnectedToAddress()` ignores
the port is now unnecessary because now the function takes a `CNetAddr`
argument. It has no access to the port.
This commit is contained in:
Vasil Dimov
2025-04-22 12:15:32 +02:00
parent d8fe258cd6
commit 3a4d1a25cf
4 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/net.cpp
View File

@@ -331,17 +331,6 @@ bool IsLocal(const CService& addr)
return mapLocalHost.count(addr) > 0;
}
CNode* CConnman::FindNode(const CNetAddr& ip)
{
LOCK(m_nodes_mutex);
for (CNode* pnode : m_nodes) {
if (static_cast<CNetAddr>(pnode->addr) == ip) {
return pnode;
}
}
return nullptr;
}
CNode* CConnman::FindNode(const std::string& addrName)
{
LOCK(m_nodes_mutex);
@@ -364,9 +353,10 @@ CNode* CConnman::FindNode(const CService& addr)
return nullptr;
}
bool CConnman::AlreadyConnectedToAddress(const CAddress& addr)
bool CConnman::AlreadyConnectedToAddress(const CNetAddr& addr) const
{
return FindNode(static_cast<CNetAddr>(addr));
LOCK(m_nodes_mutex);
return std::ranges::any_of(m_nodes, [&addr](CNode* node) { return node->addr == addr; });
}
bool CConnman::CheckIncomingNonce(uint64_t nonce)