Move filtering banned addrs inside GetAddresses()

naumenkogs · naumenkogs · commit ded742bc5b96 · 2020-07-24T18:02:20.000+03:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -2530,7 +2530,13 @@ void CConnman::AddNewAddresses(const std::vector<CAddress>& vAddr, const CAddres
 
 std::vector<CAddress> CConnman::GetAddresses()
 {
-    return addrman.GetAddr();
+    std::vector<CAddress> addresses = addrman.GetAddr();
+    if (m_banman) {
+        addresses.erase(std::remove_if(addresses.begin(), addresses.end(),
+                        [this](const CAddress& addr){return m_banman->IsDiscouraged(addr) || m_banman->IsBanned(addr);}),
+                        addresses.end());
+    }
+    return addresses;
 }
 
 bool CConnman::AddNode(const std::string& strNode)
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -3480,10 +3480,7 @@ void ProcessMessage(
         std::vector<CAddress> vAddr = connman.GetAddresses();
         FastRandomContext insecure_rand;
         for (const CAddress &addr : vAddr) {
-            bool banned_or_discouraged = banman && (banman->IsDiscouraged(addr) || banman->IsBanned(addr));
-            if (!banned_or_discouraged) {
-                pfrom.PushAddress(addr, insecure_rand);
-            }
+            pfrom.PushAddress(addr, insecure_rand);
         }
         return;
     }

Original file line number	Diff line number	Diff line change
`@@ -2530,7 +2530,13 @@ void CConnman::AddNewAddresses(const std::vector<CAddress>& vAddr, const CAddres`
`2530`	`2530`
`2531`	`2531`	`std::vector<CAddress> CConnman::GetAddresses()`
`2532`	`2532`	`{`
`2533`		`- return addrman.GetAddr();`
	`2533`	`+ std::vector<CAddress> addresses = addrman.GetAddr();`
	`2534`	`+ if (m_banman) {`
	`2535`	`+ addresses.erase(std::remove_if(addresses.begin(), addresses.end(),`
	`2536`	`+ [this](const CAddress& addr){return m_banman->IsDiscouraged(addr) \|\| m_banman->IsBanned(addr);}),`
	`2537`	`+ addresses.end());`
	`2538`	`+ }`
	`2539`	`+ return addresses;`
`2534`	`2540`	`}`
`2535`	`2541`
`2536`	`2542`	`bool CConnman::AddNode(const std::string& strNode)`
Original file line number	Diff line number	Diff line change
`@@ -3480,10 +3480,7 @@ void ProcessMessage(`
`3480`	`3480`	`std::vector<CAddress> vAddr = connman.GetAddresses();`
`3481`	`3481`	`FastRandomContext insecure_rand;`
`3482`	`3482`	`for (const CAddress &addr : vAddr) {`
`3483`		`- bool banned_or_discouraged = banman && (banman->IsDiscouraged(addr) \|\| banman->IsBanned(addr));`
`3484`		`- if (!banned_or_discouraged) {`
`3485`		`- pfrom.PushAddress(addr, insecure_rand);`
`3486`		`- }`
	`3483`	`+ pfrom.PushAddress(addr, insecure_rand);`
`3487`	`3484`	`}`
`3488`	`3485`	`return;`
`3489`	`3486`	`}`