Merge bitcoin#8154: drop vAddrToSend after sending big addr message

laanwj · codablock · commit aa6cb48bfa1a · 2017-12-22T17:20:31.000+01:00
d3d02d5 drop vAddrToSend after sending big addr message (Kaz Wesley)
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -2364,6 +2364,9 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg
             pto->vAddrToSend.clear();
             if (!vAddr.empty())
                 connman.PushMessage(pto, NetMsgType::ADDR, vAddr);
+            // we only send the big addr message once
+            if (pto->vAddrToSend.capacity() > 40)
+                pto->vAddrToSend.shrink_to_fit();
         }
 
         CNodeState &state = *State(pto->GetId());

Original file line number	Diff line number	Diff line change
`@@ -2364,6 +2364,9 @@ bool SendMessages(CNode* pto, CConnman& connman, std::atomic<bool>& interruptMsg`
`2364`	`2364`	`pto->vAddrToSend.clear();`
`2365`	`2365`	`if (!vAddr.empty())`
`2366`	`2366`	`connman.PushMessage(pto, NetMsgType::ADDR, vAddr);`
	`2367`	`+ // we only send the big addr message once`
	`2368`	`+ if (pto->vAddrToSend.capacity() > 40)`
	`2369`	`+ pto->vAddrToSend.shrink_to_fit();`
`2367`	`2370`	`}`
`2368`	`2371`
`2369`	`2372`	`CNodeState &state = *State(pto->GetId());`