Skip to content

Commit faa329f

Browse files
author
MarcoFalke
committed
refactor: Release cs_main before MaybeSendFeefilter
1 parent 3c56530 commit faa329f

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/net_processing.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ class PeerManagerImpl final : public PeerManager
415415
void RelayAddress(NodeId originator, const CAddress& addr, bool fReachable);
416416

417417
/** Send `feefilter` message. */
418-
void MaybeSendFeefilter(CNode& node, std::chrono::microseconds current_time) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
418+
void MaybeSendFeefilter(CNode& node, std::chrono::microseconds current_time);
419419

420420
const CChainParams& m_chainparams;
421421
CConnman& m_connman;
@@ -4500,8 +4500,6 @@ void PeerManagerImpl::MaybeSendAddr(CNode& node, Peer& peer, std::chrono::micros
45004500

45014501
void PeerManagerImpl::MaybeSendFeefilter(CNode& pto, std::chrono::microseconds current_time)
45024502
{
4503-
AssertLockHeld(cs_main);
4504-
45054503
if (m_ignore_incoming_txs) return;
45064504
if (!pto.m_tx_relay) return;
45074505
if (pto.GetCommonVersion() < FEEFILTER_VERSION) return;
@@ -5048,8 +5046,7 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
50485046

50495047
if (!vGetData.empty())
50505048
m_connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETDATA, vGetData));
5051-
5052-
MaybeSendFeefilter(*pto, current_time);
50535049
} // release cs_main
5050+
MaybeSendFeefilter(*pto, current_time);
50545051
return true;
50555052
}

0 commit comments

Comments
 (0)