Skip to content

Commit 74b20eb

Browse files
fanquakePastaPastaPasta
authored andcommitted
Merge bitcoin#22013: net: ignore block-relay-only peers when skipping DNS seed
fe3d17d net: ignore block-relay-only peers when skipping DNS seed (Anthony Towns) Pull request description: Since bitcoin#17428 bitcoind will attempt to reconnect to two block-relay-only anchors before doing any other outbound connections. When determining whether to use DNS seeds, it will currently see these two peers and decide "we're connected to the p2p network, so no need to lookup DNS" -- but block-relay-only peers don't do address relay, so if your address book is full of invalid addresses (apart from your anchors) this behaviour will prevent you from recovering from that situation. This patch changes it so that it only skips use of DNS seeds when there are two full-outbound peers, not just block-relay-only peers. ACKs for top commit: Sjors: utACK fe3d17d amitiuttarwar: ACK fe3d17d, this impacts the very common case where we stop/start a node, persisting anchors & have a non-empty addrman (although, to be clear, wouldn't be particularly problematic in the common cases where the addrman has valid addresses) mzumsande: ACK fe3d17d jonatack: ACK fe3d17d prayank23: tACK bitcoin@fe3d17d Tree-SHA512: 9814b0d84321d7f45b5013eb40c420a0dd93bf9430f5ef12dce50d1912a18d5de2070d890a8c6fe737a3329b31059b823bc660b432d5ba21f02881dc1d951e94
1 parent 366ca98 commit 74b20eb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/net.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2169,7 +2169,7 @@ void CConnman::ThreadDNSAddressSeed()
21692169
{
21702170
LOCK(cs_vNodes);
21712171
for (const CNode* pnode : vNodes) {
2172-
if (pnode->fSuccessfullyConnected && !pnode->IsOutboundOrBlockRelayConn() && !pnode->m_masternode_probe_connection) ++nRelevant;
2172+
if (pnode->fSuccessfullyConnected && !pnode->IsFullOutboundConn() && !pnode->m_masternode_probe_connection) ++nRelevant;
21732173
}
21742174
}
21752175
if (nRelevant >= 2) {

0 commit comments

Comments
 (0)