Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-29 21:42:32 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[net processing] Refactor MaybeSendAddr() - early exits

Browse Source 
Add early exit guard clauses if node.RelayAddrsWithConn() is false or if
current_time < node.m_next_addr_send. Add comments.

This commit leaves some lines over-indented. Those will be fixed in a
subsequent whitespace-only commit.
This commit is contained in:
John Newbery 2021-02-28 11:16:52 +00:00
parent c87423c58b
commit 38c0be5da3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/net_processing.cpp
View File

@ -4143,11 +4143,16 @@ void PeerManagerImpl::MaybeSendPing(CNode& node_to, Peer& peer, std::chrono::mic
void PeerManagerImpl::MaybeSendAddr(CNode& node, std::chrono::microseconds current_time) void PeerManagerImpl::MaybeSendAddr(CNode& node, std::chrono::microseconds current_time)
{ {
LOCK(node.m_addr_send_times_mutex); // Nothing to do for non-address-relay peers
if (!node.RelayAddrsWithConn()) return;
assert(node.m_addr_known);
const CNetMsgMaker msgMaker(node.GetCommonVersion()); const CNetMsgMaker msgMaker(node.GetCommonVersion());
if (fListen && node.RelayAddrsWithConn() && LOCK(node.m_addr_send_times_mutex);
!m_chainman.ActiveChainstate().IsInitialBlockDownload() && // Periodically advertise our local address to the peer.
if (fListen && !m_chainman.ActiveChainstate().IsInitialBlockDownload() &&
node.m_next_local_addr_send < current_time) { node.m_next_local_addr_send < current_time) {
// If we've sent before, clear the bloom filter for the peer, so that our // If we've sent before, clear the bloom filter for the peer, so that our
// self-announcement will actually go out. // self-announcement will actually go out.
@ -4165,14 +4170,12 @@ void PeerManagerImpl::MaybeSendAddr(CNode& node, std::chrono::microseconds curre
node.m_next_local_addr_send = PoissonNextSend(current_time, AVG_LOCAL_ADDRESS_BROADCAST_INTERVAL); node.m_next_local_addr_send = PoissonNextSend(current_time, AVG_LOCAL_ADDRESS_BROADCAST_INTERVAL);
} }
// // We sent an `addr` message to this peer recently. Nothing more to do.
// Message: addr if (current_time <= node.m_next_addr_send) return;
// {
if (node.RelayAddrsWithConn() && node.m_next_addr_send < current_time) {
node.m_next_addr_send = PoissonNextSend(current_time, AVG_ADDRESS_BROADCAST_INTERVAL); node.m_next_addr_send = PoissonNextSend(current_time, AVG_ADDRESS_BROADCAST_INTERVAL);
std::vector<CAddress> vAddr; std::vector<CAddress> vAddr;
vAddr.reserve(node.vAddrToSend.size()); vAddr.reserve(node.vAddrToSend.size());
assert(node.m_addr_known);
const char* msg_type; const char* msg_type;
int make_flags; int make_flags;