Merge #7856: Only send one GetAddr response per connection.

66b0724 Only send one GetAddr response per connection. (Gregory Maxwell)

1 files changed, 8 insertions, 0 deletions

diff --git a/src/main.cpp b/src/main.cpp
index ed9ee16545..a94d52f895 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5212,6 +5212,14 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             return true;
         }
 
+        // 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)