aboutsummaryrefslogtreecommitdiff
path: root/src/net.h
diff options
context:
space:
mode:
authorGregory Maxwell <greg@xiph.org>2015-11-26 05:25:30 +0000
committerPieter Wuille <pieter.wuille@gmail.com>2015-11-30 12:53:48 +0100
commitec73ef37eccfeda76de55c4ff93ea54d4e69e1ec (patch)
treefee5ec5cdc8537bb6bd84d92ab9edd0d7fb1cdd5 /src/net.h
parenta7751824ce8a7e1cc5511794516fe674bc3eaa3c (diff)
downloadbitcoin-ec73ef37eccfeda76de55c4ff93ea54d4e69e1ec.tar.xz
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.)
Diffstat (limited to 'src/net.h')
-rw-r--r--src/net.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net.h b/src/net.h
index fb299fb0b4..b0be3e6523 100644
--- a/src/net.h
+++ b/src/net.h
@@ -386,7 +386,7 @@ public:
std::set<uint256> setKnown;
// inventory based relay
- mruset<CInv> setInventoryKnown;
+ CRollingBloomFilter setInventoryKnown;
std::vector<CInv> vInventoryToSend;
CCriticalSection cs_inventory;
std::multimap<int64_t, CInv> mapAskFor;
@@ -494,7 +494,7 @@ public:
{
{
LOCK(cs_inventory);
- setInventoryKnown.insert(inv);
+ setInventoryKnown.insert(inv.hash);
}
}
@@ -502,7 +502,7 @@ public:
{
{
LOCK(cs_inventory);
- if (!setInventoryKnown.count(inv))
+ if (!setInventoryKnown.contains(inv.hash))
vInventoryToSend.push_back(inv);
}
}