diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-07 13:18:25 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-07 13:19:42 +0100 |
| commit | 1e50d22ed2df9e87d1c33784d4274750546227fc (patch) | |
| tree | cbe47cc9670530674da051661d96e3408935fc7a | |
| parent | c113a651f1f59805a66f0d11617a0c27eb984afe (diff) | |
| parent | 1f951c67a4d1e94895783d2c6b9bd235b2bf66b8 (diff) | |
| download | bitcoin-1e50d22ed2df9e87d1c33784d4274750546227fc.tar.xz | |
Merge #8709: Allow filterclear messages for enabling TX relay only.
1f951c6 Allow filterclear messages for enabling TX relay only. (R E Broadley)
| -rw-r--r-- | src/main.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 590f19526e..e0c614b731 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5048,8 +5048,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, if (!(pfrom->GetLocalServices() & NODE_BLOOM) && (strCommand == NetMsgType::FILTERLOAD || - strCommand == NetMsgType::FILTERADD || - strCommand == NetMsgType::FILTERCLEAR)) + strCommand == NetMsgType::FILTERADD)) { if (pfrom->nVersion >= NO_BLOOM_VERSION) { LOCK(cs_main); @@ -6275,8 +6274,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, else if (strCommand == NetMsgType::FILTERCLEAR) { LOCK(pfrom->cs_filter); - delete pfrom->pfilter; - pfrom->pfilter = new CBloomFilter(); + if (pfrom->GetLocalServices() & NODE_BLOOM) { + delete pfrom->pfilter; + pfrom->pfilter = new CBloomFilter(); + } pfrom->fRelayTxes = true; } |