phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

net: Block v2->v1 transport downgrade if !CConnman::fNetworkActive

Browse source 
We might have just set CNode::fDisconnect in the first loop because of being offline.

Also caches CConnman::fNetworkActive in case it's changed concurrently with our own thread.
This commit is contained in:
Hodlinator 2025-02-12 12:02:53 +01:00
parent 698f86964c
commit 6869fb4170
No known key found for this signature in database
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/net.cpp
View file

@ -1910,7 +1910,8 @@ void CConnman::DisconnectNodes()
{ {
LOCK(m_nodes_mutex); LOCK(m_nodes_mutex);
if (!fNetworkActive) { const bool network_active{fNetworkActive};
if (!network_active) {
// Disconnect any connected nodes // Disconnect any connected nodes
for (CNode* pnode : m_nodes) { for (CNode* pnode : m_nodes) {
if (!pnode->fDisconnect) { if (!pnode->fDisconnect) {
@ -1932,7 +1933,7 @@ void CConnman::DisconnectNodes()
// Add to reconnection list if appropriate. We don't reconnect right here, because // Add to reconnection list if appropriate. We don't reconnect right here, because
// the creation of a connection is a blocking operation (up to several seconds), // the creation of a connection is a blocking operation (up to several seconds),
// and we don't want to hold up the socket handler thread for that long. // and we don't want to hold up the socket handler thread for that long.
if (pnode->m_transport->ShouldReconnectV1()) { if (network_active && pnode->m_transport->ShouldReconnectV1()) {
reconnections_to_add.push_back({ reconnections_to_add.push_back({
.addr_connect = pnode->addr, .addr_connect = pnode->addr,
.grant = std::move(pnode->grantOutbound), .grant = std::move(pnode->grantOutbound),