Merge #8709: Allow filterclear messages for enabling TX relay only.
1f951c6
Allow filterclear messages for enabling TX relay only. (R E Broadley)
This commit is contained in:
commit
1e50d22ed2
1 changed files with 5 additions and 4 deletions
|
@ -5048,8 +5048,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
|
||||||
|
|
||||||
if (!(pfrom->GetLocalServices() & NODE_BLOOM) &&
|
if (!(pfrom->GetLocalServices() & NODE_BLOOM) &&
|
||||||
(strCommand == NetMsgType::FILTERLOAD ||
|
(strCommand == NetMsgType::FILTERLOAD ||
|
||||||
strCommand == NetMsgType::FILTERADD ||
|
strCommand == NetMsgType::FILTERADD))
|
||||||
strCommand == NetMsgType::FILTERCLEAR))
|
|
||||||
{
|
{
|
||||||
if (pfrom->nVersion >= NO_BLOOM_VERSION) {
|
if (pfrom->nVersion >= NO_BLOOM_VERSION) {
|
||||||
LOCK(cs_main);
|
LOCK(cs_main);
|
||||||
|
@ -6275,8 +6274,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
|
||||||
else if (strCommand == NetMsgType::FILTERCLEAR)
|
else if (strCommand == NetMsgType::FILTERCLEAR)
|
||||||
{
|
{
|
||||||
LOCK(pfrom->cs_filter);
|
LOCK(pfrom->cs_filter);
|
||||||
delete pfrom->pfilter;
|
if (pfrom->GetLocalServices() & NODE_BLOOM) {
|
||||||
pfrom->pfilter = new CBloomFilter();
|
delete pfrom->pfilter;
|
||||||
|
pfrom->pfilter = new CBloomFilter();
|
||||||
|
}
|
||||||
pfrom->fRelayTxes = true;
|
pfrom->fRelayTxes = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue