Skip to content

Commit 01a79ff

Browse files
committed
[net processing] Fix overindentation in MaybeSendAddr()
Reviewer hint: review with `git diff --ignore-all-space`.
1 parent 38c0be5 commit 01a79ff

File tree

1 file changed

+28
-29
lines changed

1 file changed

+28
-29
lines changed

src/net_processing.cpp

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4172,42 +4172,41 @@ void PeerManagerImpl::MaybeSendAddr(CNode& node, std::chrono::microseconds curre
41724172

41734173
// We sent an `addr` message to this peer recently. Nothing more to do.
41744174
if (current_time <= node.m_next_addr_send) return;
4175-
{
4176-
node.m_next_addr_send = PoissonNextSend(current_time, AVG_ADDRESS_BROADCAST_INTERVAL);
4177-
std::vector<CAddress> vAddr;
4178-
vAddr.reserve(node.vAddrToSend.size());
41794175

4180-
const char* msg_type;
4181-
int make_flags;
4182-
if (node.m_wants_addrv2) {
4183-
msg_type = NetMsgType::ADDRV2;
4184-
make_flags = ADDRV2_FORMAT;
4185-
} else {
4186-
msg_type = NetMsgType::ADDR;
4187-
make_flags = 0;
4188-
}
4176+
node.m_next_addr_send = PoissonNextSend(current_time, AVG_ADDRESS_BROADCAST_INTERVAL);
4177+
std::vector<CAddress> vAddr;
4178+
vAddr.reserve(node.vAddrToSend.size());
4179+
4180+
const char* msg_type;
4181+
int make_flags;
4182+
if (node.m_wants_addrv2) {
4183+
msg_type = NetMsgType::ADDRV2;
4184+
make_flags = ADDRV2_FORMAT;
4185+
} else {
4186+
msg_type = NetMsgType::ADDR;
4187+
make_flags = 0;
4188+
}
41894189

4190-
for (const CAddress& addr : node.vAddrToSend)
4190+
for (const CAddress& addr : node.vAddrToSend)
4191+
{
4192+
if (!node.m_addr_known->contains(addr.GetKey()))
41914193
{
4192-
if (!node.m_addr_known->contains(addr.GetKey()))
4194+
node.m_addr_known->insert(addr.GetKey());
4195+
vAddr.push_back(addr);
4196+
// receiver rejects addr messages larger than MAX_ADDR_TO_SEND
4197+
if (vAddr.size() >= MAX_ADDR_TO_SEND)
41934198
{
4194-
node.m_addr_known->insert(addr.GetKey());
4195-
vAddr.push_back(addr);
4196-
// receiver rejects addr messages larger than MAX_ADDR_TO_SEND
4197-
if (vAddr.size() >= MAX_ADDR_TO_SEND)
4198-
{
4199-
m_connman.PushMessage(&node, msgMaker.Make(make_flags, msg_type, vAddr));
4200-
vAddr.clear();
4201-
}
4199+
m_connman.PushMessage(&node, msgMaker.Make(make_flags, msg_type, vAddr));
4200+
vAddr.clear();
42024201
}
42034202
}
4204-
node.vAddrToSend.clear();
4205-
if (!vAddr.empty())
4206-
m_connman.PushMessage(&node, msgMaker.Make(make_flags, msg_type, vAddr));
4207-
// we only send the big addr message once
4208-
if (node.vAddrToSend.capacity() > 40)
4209-
node.vAddrToSend.shrink_to_fit();
42104203
}
4204+
node.vAddrToSend.clear();
4205+
if (!vAddr.empty())
4206+
m_connman.PushMessage(&node, msgMaker.Make(make_flags, msg_type, vAddr));
4207+
// we only send the big addr message once
4208+
if (node.vAddrToSend.capacity() > 40)
4209+
node.vAddrToSend.shrink_to_fit();
42114210
}
42124211

42134212
namespace {

0 commit comments

Comments
 (0)