From 72e8ffd7f8dbf908e65da6d012ede914596737ab Mon Sep 17 00:00:00 2001 From: Gleb Naumenko Date: Tue, 14 Sep 2021 15:19:41 +0300 Subject: p2p: Account for MANUAL conns when diversifying persistent outbound conns Previously, we would make connections to peer from the netgroups to which our MANUAL outbound connections belong. However, they should be seen as regular connections from Addrman when it comes to netgroup diversity check, since the same rationale can be applied. Note, this has nothing to do with how we connect to MANUAL connections: we connect to them unconditionally. --- src/net.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/net.cpp b/src/net.cpp index e19decbda8..9b803180f9 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1727,14 +1727,12 @@ void CConnman::ThreadOpenConnections(const std::vector connect) // free to make, an attacker could make them to prevent us from connecting to // certain peers. case ConnectionType::INBOUND: - // Manually selected connections should not affect how we select outbound - // peers from addrman. - case ConnectionType::MANUAL: // Short-lived outbound connections should not affect how we select outbound // peers from addrman. case ConnectionType::ADDR_FETCH: case ConnectionType::FEELER: break; + case ConnectionType::MANUAL: case ConnectionType::OUTBOUND_FULL_RELAY: case ConnectionType::BLOCK_RELAY: setConnected.insert(m_netgroupman.GetGroup(pnode->addr)); -- cgit v1.2.3