aboutsummaryrefslogtreecommitdiff
path: root/src/net_processing.cpp
diff options
context:
space:
mode:
authorJohn Newbery <john@johnnewbery.com>2021-02-28 11:17:29 +0000
committerJohn Newbery <john@johnnewbery.com>2021-03-29 12:15:23 +0100
commit01a79ff924b11f91796d4aa63c571897b047ac7d (patch)
tree8713e94bb237bf16fe959657fa036b246fc5beb4 /src/net_processing.cpp
parent38c0be5da3af17208b165e73cee7612d3670b038 (diff)
downloadbitcoin-01a79ff924b11f91796d4aa63c571897b047ac7d.tar.xz
[net processing] Fix overindentation in MaybeSendAddr()
Reviewer hint: review with `git diff --ignore-all-space`.
Diffstat (limited to 'src/net_processing.cpp')
-rw-r--r--src/net_processing.cpp57
1 files changed, 28 insertions, 29 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index fd8c653837..1e58225158 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<CAddress> 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;
- }
+ node.m_next_addr_send = PoissonNextSend(current_time, AVG_ADDRESS_BROADCAST_INTERVAL);
+ std::vector<CAddress> 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)
+ 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 {