Merge #7708: De-neuter NODE_BLOOM

c90036f Always disconnect old nodes which request filtered connections. (Patrick Strateman)
2016-03-21 12:43:15 +01:00
parent ddfd79659e c90036f664
commit 9426632cb5
4 changed files with 2 additions and 5 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4482,7 +4482,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
        if (pfrom->nVersion >= NO_BLOOM_VERSION) {
            Misbehaving(pfrom->GetId(), 100);
            return false;
-        } else if (GetBoolArg("-enforcenodebloom", DEFAULT_ENFORCENODEBLOOM)) {
+        } else {
            pfrom->fDisconnect = true;
            return false;
        }