aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2019-03-17 22:05:49 -0700
committerPieter Wuille <pieter.wuille@gmail.com>2019-03-17 22:05:49 -0700
commit054d01d0a87a5adc43428588ecc29f1339a69dd2 (patch)
treeda9594067258f2752871eb4f67dd145dfd8732d1 /src
parentacbbb7bf0d453a6ec586087c680c5c548b1dd24d (diff)
downloadbitcoin-054d01d0a87a5adc43428588ecc29f1339a69dd2.tar.xz
Do not relay banned IP addresses
Diffstat (limited to 'src')
-rw-r--r--src/net_processing.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 18dd2f010c..a37451e39a 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -2022,6 +2022,7 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
if (addr.nTime <= 100000000 || addr.nTime > nNow + 10 * 60)
addr.nTime = nNow - 5 * 24 * 60 * 60;
pfrom->AddAddressKnown(addr);
+ if (g_banman->IsBanned(addr)) continue; // Do not process banned addresses beyond remembering we received them
bool fReachable = IsReachable(addr);
if (addr.nTime > nSince && !pfrom->fGetAddr && vAddr.size() <= 10 && addr.IsRoutable())
{
@@ -2912,8 +2913,11 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
pfrom->vAddrToSend.clear();
std::vector<CAddress> vAddr = connman->GetAddresses();
FastRandomContext insecure_rand;
- for (const CAddress &addr : vAddr)
- pfrom->PushAddress(addr, insecure_rand);
+ for (const CAddress &addr : vAddr) {
+ if (!g_banman->IsBanned(addr)) {
+ pfrom->PushAddress(addr, insecure_rand);
+ }
+ }
return true;
}