Auto merge of #1589 - bitcartel:upstream_7856_one_getaddr_per_connection, r=daira

Upstream: Only send one GetAddr response per connection.

bitcoin/bitcoin#8427
This commit is contained in:
zkbot
2016-10-21 22:53:19 -04:00
3 changed files with 10 additions and 0 deletions

View File

@@ -4867,6 +4867,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
// the getaddr message mitigates the attack.
else if ((strCommand == "getaddr") && (pfrom->fInbound))
{
// Only send one GetAddr response per connection to reduce resource waste
// and discourage addr stamping of INV announcements.
if (pfrom->fSentAddr) {
LogPrint("net", "Ignoring repeated \"getaddr\". peer=%d\n", pfrom->id);
return true;
}
pfrom->fSentAddr = true;
pfrom->vAddrToSend.clear();
vector<CAddress> vAddr = addrman.GetAddr();
BOOST_FOREACH(const CAddress &addr, vAddr)