From f07ad435532a44158182fdf43abc9d1cb8402104 Mon Sep 17 00:00:00 2001
From: Patick Strateman <patrick.strateman@gmail.com>
Date: Tue, 24 Nov 2015 01:51:53 -0800
Subject: [PATCH] Add enforcenodebloom option.

Previously peers which implement a protocol version less than NO_BLOOM_VERSION
would not be disconnected for sending a filter command, regardless of the
peerbloomfilter option.

Many node operators do not wish to provide expensive bloom filtering for SPV
clients, previously they had to cherry pick the commit which enabled the
disconnect logic.

The default should remain false until a sufficient percent of SPV clients
have updated.
---
 src/main.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 60a14fd15..6d1c04b08 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4729,12 +4729,10 @@ 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", false)) {
+            pfrom->fDisconnect = true;
+            return false;
         }
-        //TODO: Enable this after reasonable network upgrade
-        //else {
-        //    pfrom->fDisconnect = true;
-        //    return false;
-        //}
     }