p2p: Account for MANUAL conns when diversifying persistent outbound conns

naumenkogs · naumenkogs · commit 513d52b5e92e · 2021-09-14T15:29:55.000+03:00
Previously, we would make connections to peer from the netgroups to which
our MANUAL outbound connections belong.

Note, this doesn't affect how we choose MANUAL connections, because this
check does not apply to them.
diff --git a/src/net.cpp b/src/net.cpp
@@ -1914,16 +1914,14 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> 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:
                     // Short-lived outbound connections should not affect how we select outbound
                     // peers from addrman.
                     case ConnectionType::FEELER:
                         break;
+                    case ConnectionType::MANUAL:
                     case ConnectionType::OUTBOUND_FULL_RELAY:
                     case ConnectionType::BLOCK_RELAY:
                         setConnected.insert(pnode->addr.GetGroup(addrman.GetAsmap()));
