Browse Source

Replace setInventoryKnown with a rolling bloom filter.

Mruset setInventoryKnown was reduced to a remarkably small 1000
 entries as a side effect of sendbuffer size reductions in 2012.

This removes setInventoryKnown filtering from merkleBlock responses
 because false positives there are especially unattractive and
 also because I'm not sure if there aren't race conditions around
 the relay pool that would cause some transactions there to
 be suppressed. (Also, ProcessGetData was accessing
 setInventoryKnown without taking the required lock.)
0.13
Gregory Maxwell 9 years ago committed by Pieter Wuille
parent
commit
ec73ef37ec
  1. 9
      src/main.cpp
  2. 3
      src/net.cpp
  3. 6
      src/net.h

9
src/main.cpp

@ -4138,8 +4138,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
// however we MUST always provide at least what the remote peer needs // however we MUST always provide at least what the remote peer needs
typedef std::pair<unsigned int, uint256> PairType; typedef std::pair<unsigned int, uint256> PairType;
BOOST_FOREACH(PairType& pair, merkleBlock.vMatchedTxn) BOOST_FOREACH(PairType& pair, merkleBlock.vMatchedTxn)
if (!pfrom->setInventoryKnown.count(CInv(MSG_TX, pair.second))) pfrom->PushMessage("tx", block.vtx[pair.first]);
pfrom->PushMessage("tx", block.vtx[pair.first]);
} }
// else // else
// no response // no response
@ -5511,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->setInventoryKnown.count(inv)) if (pto->setInventoryKnown.contains(inv.hash))
continue; continue;
// trickle out tx inv to protect privacy // trickle out tx inv to protect privacy
@ -5532,9 +5531,9 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
} }
} }
// returns true if wasn't already contained in the set if (!pto->setInventoryKnown.contains(inv.hash))
if (pto->setInventoryKnown.insert(inv).second)
{ {
pto->setInventoryKnown.insert(inv.hash);
vInv.push_back(inv); vInv.push_back(inv);
if (vInv.size() >= 1000) if (vInv.size() >= 1000)
{ {

3
src/net.cpp

@ -2342,7 +2342,7 @@ unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", DEFAULT_MAX
CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) : CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
ssSend(SER_NETWORK, INIT_PROTO_VERSION), ssSend(SER_NETWORK, INIT_PROTO_VERSION),
addrKnown(5000, 0.001), addrKnown(5000, 0.001),
setInventoryKnown(SendBufferSize() / 1000) setInventoryKnown(50000, 0.000001)
{ {
nServices = 0; nServices = 0;
hSocket = hSocketIn; hSocket = hSocketIn;
@ -2369,6 +2369,7 @@ CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNa
nSendOffset = 0; nSendOffset = 0;
hashContinue = uint256(); hashContinue = uint256();
nStartingHeight = -1; nStartingHeight = -1;
setInventoryKnown.reset();
fGetAddr = false; fGetAddr = false;
fRelayTxes = false; fRelayTxes = false;
pfilter = new CBloomFilter(); pfilter = new CBloomFilter();

6
src/net.h

@ -386,7 +386,7 @@ public:
std::set<uint256> setKnown; std::set<uint256> setKnown;
// inventory based relay // inventory based relay
mruset<CInv> setInventoryKnown; CRollingBloomFilter setInventoryKnown;
std::vector<CInv> vInventoryToSend; std::vector<CInv> vInventoryToSend;
CCriticalSection cs_inventory; CCriticalSection cs_inventory;
std::multimap<int64_t, CInv> mapAskFor; std::multimap<int64_t, CInv> mapAskFor;
@ -494,7 +494,7 @@ public:
{ {
{ {
LOCK(cs_inventory); LOCK(cs_inventory);
setInventoryKnown.insert(inv); setInventoryKnown.insert(inv.hash);
} }
} }
@ -502,7 +502,7 @@ public:
{ {
{ {
LOCK(cs_inventory); LOCK(cs_inventory);
if (!setInventoryKnown.count(inv)) if (!setInventoryKnown.contains(inv.hash))
vInventoryToSend.push_back(inv); vInventoryToSend.push_back(inv);
} }
} }

Loading…
Cancel
Save