phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-26 19:23:26 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Actually only use filterInventoryKnown with MSG_TX inventory messages.

Browse source 
Previously this logic could erroneously filter a MSG_BLOCK inventory message.
This commit is contained in:
Gregory Maxwell 2015-11-29 22:10:31 +00:00 • committed by Pieter Wuille
parent b6a0da45db
commit d41e44c9ac
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main.cpp
View file

@ -5510,7 +5510,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
vInvWait.reserve(pto->vInventoryToSend.size()); vInvWait.reserve(pto->vInventoryToSend.size());
BOOST_FOREACH(const CInv& inv, pto->vInventoryToSend) BOOST_FOREACH(const CInv& inv, pto->vInventoryToSend)
{ {
if (pto->filterInventoryKnown.contains(inv.hash)) if (inv.type == MSG_TX && pto->filterInventoryKnown.contains(inv.hash))
continue; continue;
// trickle out tx inv to protect privacy // trickle out tx inv to protect privacy
@ -5531,9 +5531,8 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
} }
} }
if (!pto->filterInventoryKnown.contains(inv.hash))
{
pto->filterInventoryKnown.insert(inv.hash); pto->filterInventoryKnown.insert(inv.hash);
vInv.push_back(inv); vInv.push_back(inv);
if (vInv.size() >= 1000) if (vInv.size() >= 1000)
{ {
@ -5541,7 +5540,6 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
vInv.clear(); vInv.clear();
} }
} }
}
pto->vInventoryToSend = vInvWait; pto->vInventoryToSend = vInvWait;
} }
if (!vInv.empty()) if (!vInv.empty())