p2p: Limit m_block_inv_mutex

MarcoFalke · MarcoFalke · commit fac96d026511 · 2021-04-25T20:39:59.000+02:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -4449,8 +4449,9 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
                 }
             }
             peer->m_blocks_for_inv_relay.clear();
+        }
 
-            if (pto->m_tx_relay != nullptr) {
+        if (pto->m_tx_relay != nullptr) {
                 LOCK(pto->m_tx_relay->cs_tx_inventory);
                 // Check whether periodic sends should happen
                 bool fSendTrickle = pto->HasPermission(PF_NOBAN);
@@ -4578,7 +4579,6 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
                         }
                     }
                 }
-            }
         }
         if (!vInv.empty())
             m_connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));

Original file line number	Diff line number	Diff line change
`@@ -4449,8 +4449,9 @@ bool PeerManagerImpl::SendMessages(CNode* pto)`
`4449`	`4449`	`}`
`4450`	`4450`	`}`
`4451`	`4451`	`peer->m_blocks_for_inv_relay.clear();`
	`4452`	`+ }`
`4452`	`4453`
`4453`		`- if (pto->m_tx_relay != nullptr) {`
	`4454`	`+ if (pto->m_tx_relay != nullptr) {`
`4454`	`4455`	`LOCK(pto->m_tx_relay->cs_tx_inventory);`
`4455`	`4456`	`// Check whether periodic sends should happen`
`4456`	`4457`	`bool fSendTrickle = pto->HasPermission(PF_NOBAN);`
`@@ -4578,7 +4579,6 @@ bool PeerManagerImpl::SendMessages(CNode* pto)`
`4578`	`4579`	`}`
`4579`	`4580`	`}`
`4580`	`4581`	`}`
`4581`		`- }`
`4582`	`4582`	`}`
`4583`	`4583`	`if (!vInv.empty())`
`4584`	`4584`	`m_connman.PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));`