From 3689088c6d84178555cc98d27620d4fec51008a0 Mon Sep 17 00:00:00 2001
From: Peter Todd <pete@petertodd.org>
Date: Sat, 26 Oct 2013 02:41:03 -0400
Subject: [PATCH] Enable NODE_BLOOM by default

Also change behavior to simply disconnect peers, rather than DoS-ban
them.
---
 src/init.cpp | 4 ++--
 src/main.cpp | 2 +-
 src/util.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 50e30972f..e9a24e469 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -317,7 +317,7 @@ std::string HelpMessage()
         "  -bantime=<n>           " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" +
         "  -maxreceivebuffer=<n>  " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n" +
         "  -maxsendbuffer=<n>     " + _("Maximum per-connection send buffer, <n>*1000 bytes (default: 1000)") + "\n" +
-        "  -bloomfilters          " + _("Allow peers to set bloom filters (default: 0)") + "\n" +
+        "  -bloomfilters          " + _("Allow peers to set bloom filters (default: 1)") + "\n" +
 #ifdef USE_UPNP
 #if USE_UPNP
         "  -upnp                  " + _("Use UPnP to map the listening port (default: 1 when listening)") + "\n" +
@@ -497,7 +497,7 @@ bool AppInit2(boost::thread_group& threadGroup)
     // ********************************************************* Step 2: parameter interactions
 
     fTestNet = GetBoolArg("-testnet");
-    fBloomFilters = GetBoolArg("-bloomfilters");
+    fBloomFilters = GetBoolArg("-bloomfilters", true);
     if (fBloomFilters)
         nLocalServices |= NODE_BLOOM;
 
diff --git a/src/main.cpp b/src/main.cpp
index 8858fa732..218c3154f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3718,7 +3718,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
               strCommand == "filteradd" ||
               strCommand == "filterclear"))
     {
-        pfrom->Misbehaving(100);
+        pfrom->CloseSocketDisconnect();
         return error("peer %s attempted to set a bloom filter even though we do not advertise that service",
                      pfrom->addr.ToString().c_str());
     }
diff --git a/src/util.cpp b/src/util.cpp
index 977d46b8c..ea8b3cf33 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -79,7 +79,7 @@ bool fServer = false;
 bool fCommandLine = false;
 string strMiscWarning;
 bool fTestNet = false;
-bool fBloomFilters = false;
+bool fBloomFilters = true;
 bool fNoListen = false;
 bool fLogTimestamps = false;
 CMedianFilter<int64> vTimeOffsets(200,0);