highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-25 00:11:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Release cs_main before MaybeSendFeefilter

Browse Source
This commit is contained in:
MarcoFalke 2022-02-23 10:28:05 +01:00
parent 3c565302aa
commit faa329fd46
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/net_processing.cpp
View File

@ -415,7 +415,7 @@ private:
void RelayAddress(NodeId originator, const CAddress& addr, bool fReachable); void RelayAddress(NodeId originator, const CAddress& addr, bool fReachable);
/** Send `feefilter` message. */ /** Send `feefilter` message. */
void MaybeSendFeefilter(CNode& node, std::chrono::microseconds current_time) EXCLUSIVE_LOCKS_REQUIRED(cs_main); void MaybeSendFeefilter(CNode& node, std::chrono::microseconds current_time);
const CChainParams& m_chainparams; const CChainParams& m_chainparams;
CConnman& m_connman; CConnman& m_connman;
@ -4500,8 +4500,6 @@ void PeerManagerImpl::MaybeSendAddr(CNode& node, Peer& peer, std::chrono::micros
void PeerManagerImpl::MaybeSendFeefilter(CNode& pto, std::chrono::microseconds current_time) void PeerManagerImpl::MaybeSendFeefilter(CNode& pto, std::chrono::microseconds current_time)
{ {
AssertLockHeld(cs_main);
if (m_ignore_incoming_txs) return; if (m_ignore_incoming_txs) return;
if (!pto.m_tx_relay) return; if (!pto.m_tx_relay) return;
if (pto.GetCommonVersion() < FEEFILTER_VERSION) return; if (pto.GetCommonVersion() < FEEFILTER_VERSION) return;
@ -5048,8 +5046,7 @@ bool PeerManagerImpl::SendMessages(CNode* pto)
if (!vGetData.empty()) if (!vGetData.empty())
m_connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETDATA, vGetData)); m_connman.PushMessage(pto, msgMaker.Make(NetMsgType::GETDATA, vGetData));
MaybeSendFeefilter(*pto, current_time);
} // release cs_main } // release cs_main
MaybeSendFeefilter(*pto, current_time);
return true; return true;
} }