aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Chow <github@achow101.com>2023-06-29 19:35:36 -0400
committerAndrew Chow <github@achow101.com>2023-06-29 19:42:47 -0400
commit54ba330f7984cebc2164fa4ad449d0164a765108 (patch)
treedaf9f805bebdf9fe4a50a96377b1e028077a9b78
parent561915f35f4f75365c78df939b68c9062d3d3581 (diff)
parent5fa4055452861ca1700008e1761815e88b29fae7 (diff)
Merge bitcoin/bitcoin#27863: net: do not `break` when `addr` is not from a distinct network group
5fa4055452861ca1700008e1761815e88b29fae7 net: do not `break` when `addr` is not from a distinct network group (brunoerg) Pull request description: When the address is from a network group we already caught, do a `continue` and try to find another address until conditions are met or we reach the limit (`nTries`). ACKs for top commit: amitiuttarwar: utACK 5fa4055452861ca1700008e1761815e88b29fae7 achow101: ACK 5fa4055452861ca1700008e1761815e88b29fae7 mzumsande: utACK 5fa4055452861ca1700008e1761815e88b29fae7 Tree-SHA512: 225bb6df450b46960db934983c583e862d1a17bacfc46d3657a0eb25a0204e106e8cd18de36764e210e0a92489ab4b5773437e4a641c9b455bde74ff8a041787
-rw-r--r--src/net.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp
index 9967e14d5d..7601a6ea84 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1844,7 +1844,7 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect)
// Require outbound IPv4/IPv6 connections, other than feelers, to be to distinct network groups
if (!fFeeler && outbound_ipv46_peer_netgroups.count(m_netgroupman.GetGroup(addr))) {
- break;
+ continue;
}
// if we selected an invalid or local address, restart