Move filtering banned addrs inside GetAddresses()

1 files changed, 7 insertions, 1 deletions

diff --git a/src/net.cpp b/src/net.cpp
index 0c56cddbdc..171358bb5f 100644
--- 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)