From 01a79ff924b11f91796d4aa63c571897b047ac7d Mon Sep 17 00:00:00 2001 From: John Newbery Date: Sun, 28 Feb 2021 11:17:29 +0000 Subject: [PATCH] [net processing] Fix overindentation in MaybeSendAddr() Reviewer hint: review with `git diff --ignore-all-space`. --- src/net_processing.cpp | 59 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index fd8c653837b..1e582251586 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -4172,42 +4172,41 @@ void PeerManagerImpl::MaybeSendAddr(CNode& node, std::chrono::microseconds curre // We sent an `addr` message to this peer recently. Nothing more to do. if (current_time <= node.m_next_addr_send) return; + + node.m_next_addr_send = PoissonNextSend(current_time, AVG_ADDRESS_BROADCAST_INTERVAL); + std::vector vAddr; + vAddr.reserve(node.vAddrToSend.size()); + + const char* msg_type; + int make_flags; + if (node.m_wants_addrv2) { + msg_type = NetMsgType::ADDRV2; + make_flags = ADDRV2_FORMAT; + } else { + msg_type = NetMsgType::ADDR; + make_flags = 0; + } + + for (const CAddress& addr : node.vAddrToSend) { - node.m_next_addr_send = PoissonNextSend(current_time, AVG_ADDRESS_BROADCAST_INTERVAL); - std::vector vAddr; - vAddr.reserve(node.vAddrToSend.size()); - - const char* msg_type; - int make_flags; - if (node.m_wants_addrv2) { - msg_type = NetMsgType::ADDRV2; - make_flags = ADDRV2_FORMAT; - } else { - msg_type = NetMsgType::ADDR; - make_flags = 0; - } - - for (const CAddress& addr : node.vAddrToSend) + if (!node.m_addr_known->contains(addr.GetKey())) { - if (!node.m_addr_known->contains(addr.GetKey())) + node.m_addr_known->insert(addr.GetKey()); + vAddr.push_back(addr); + // receiver rejects addr messages larger than MAX_ADDR_TO_SEND + if (vAddr.size() >= MAX_ADDR_TO_SEND) { - node.m_addr_known->insert(addr.GetKey()); - vAddr.push_back(addr); - // receiver rejects addr messages larger than MAX_ADDR_TO_SEND - if (vAddr.size() >= MAX_ADDR_TO_SEND) - { - m_connman.PushMessage(&node, msgMaker.Make(make_flags, msg_type, vAddr)); - vAddr.clear(); - } + m_connman.PushMessage(&node, msgMaker.Make(make_flags, msg_type, vAddr)); + vAddr.clear(); } } - node.vAddrToSend.clear(); - if (!vAddr.empty()) - m_connman.PushMessage(&node, msgMaker.Make(make_flags, msg_type, vAddr)); - // we only send the big addr message once - if (node.vAddrToSend.capacity() > 40) - node.vAddrToSend.shrink_to_fit(); } + node.vAddrToSend.clear(); + if (!vAddr.empty()) + m_connman.PushMessage(&node, msgMaker.Make(make_flags, msg_type, vAddr)); + // we only send the big addr message once + if (node.vAddrToSend.capacity() > 40) + node.vAddrToSend.shrink_to_fit(); } namespace {