Remove useless 2500 limit on AddrMan queries

naumenkogs · naumenkogs · commit 7cc0e8101f01 · 2020-07-24T18:02:20.000+03:00
diff --git a/src/addrman.h b/src/addrman.h
@@ -157,7 +157,7 @@ class CAddrInfo : public CAddress
 #define ADDRMAN_GETADDR_MAX_PCT 23
 
 //! the maximum number of nodes to return in a getaddr call
-#define ADDRMAN_GETADDR_MAX 2500
+#define ADDRMAN_GETADDR_MAX 1000
 
 //! Convenience
 #define ADDRMAN_TRIED_BUCKET_COUNT (1 << ADDRMAN_TRIED_BUCKET_COUNT_LOG2)
diff --git a/src/net.h b/src/net.h
@@ -52,6 +52,9 @@ static const int TIMEOUT_INTERVAL = 20 * 60;
 static const int FEELER_INTERVAL = 120;
 /** The maximum number of new addresses to accumulate before announcing. */
 static const unsigned int MAX_ADDR_TO_SEND = 1000;
+// TODO: remove ADDRMAN_GETADDR_MAX and let the caller specify this limit with MAX_ADDR_TO_SEND.
+static_assert(MAX_ADDR_TO_SEND == ADDRMAN_GETADDR_MAX,
+    "Max allowed ADDR message size should be equal to the max number of records returned from AddrMan.");
 /** Maximum length of incoming protocol messages (no message over 4 MB is currently acceptable). */
 static const unsigned int MAX_PROTOCOL_MESSAGE_LENGTH = 4 * 1000 * 1000;
 /** Maximum length of the user agent string in `version` message */
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -2546,7 +2546,7 @@ void ProcessMessage(
         if (!pfrom.IsAddrRelayPeer()) {
             return;
         }
-        if (vAddr.size() > 1000)
+        if (vAddr.size() > MAX_ADDR_TO_SEND)
         {
             LOCK(cs_main);
             Misbehaving(pfrom.GetId(), 20, strprintf("addr message size = %u", vAddr.size()));
@@ -4064,8 +4064,8 @@ bool PeerLogicValidation::SendMessages(CNode* pto)
                 {
                     pto->m_addr_known->insert(addr.GetKey());
                     vAddr.push_back(addr);
-                    // receiver rejects addr messages larger than 1000
-                    if (vAddr.size() >= 1000)
+                    // receiver rejects addr messages larger than MAX_ADDR_TO_SEND
+                    if (vAddr.size() >= MAX_ADDR_TO_SEND)
                     {
                         connman->PushMessage(pto, msgMaker.Make(NetMsgType::ADDR, vAddr));
                         vAddr.clear();

Original file line number	Diff line number	Diff line change
`@@ -2546,7 +2546,7 @@ void ProcessMessage(`
`2546`	`2546`	`if (!pfrom.IsAddrRelayPeer()) {`
`2547`	`2547`	`return;`
`2548`	`2548`	`}`
`2549`		`- if (vAddr.size() > 1000)`
	`2549`	`+ if (vAddr.size() > MAX_ADDR_TO_SEND)`
`2550`	`2550`	`{`
`2551`	`2551`	`LOCK(cs_main);`
`2552`	`2552`	`Misbehaving(pfrom.GetId(), 20, strprintf("addr message size = %u", vAddr.size()));`
`@@ -4064,8 +4064,8 @@ bool PeerLogicValidation::SendMessages(CNode* pto)`
`4064`	`4064`	`{`
`4065`	`4065`	`pto->m_addr_known->insert(addr.GetKey());`
`4066`	`4066`	`vAddr.push_back(addr);`
`4067`		`- // receiver rejects addr messages larger than 1000`
`4068`		`- if (vAddr.size() >= 1000)`
	`4067`	`+ // receiver rejects addr messages larger than MAX_ADDR_TO_SEND`
	`4068`	`+ if (vAddr.size() >= MAX_ADDR_TO_SEND)`
`4069`	`4069`	`{`
`4070`	`4070`	`connman->PushMessage(pto, msgMaker.Make(NetMsgType::ADDR, vAddr));`
`4071`	`4071`	`vAddr.clear();`