Skip to content

Commit

Permalink
Add a filter field in CNode, add filterload+filteradd+filterclear
Browse files Browse the repository at this point in the history
  • Loading branch information
TheBlueMatt committed Jan 16, 2013
1 parent 133a546 commit 422d122
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 0 deletions.
45 changes: 45 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3332,6 +3332,51 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
}


else if (strCommand == "filterload")
{
CBloomFilter filter;
vRecv >> filter;

if (!filter.IsWithinSizeConstraints())
// There is no excuse for sending a too-large filter
pfrom->Misbehaving(100);
else
{
LOCK(pfrom->cs_filter);
delete pfrom->pfilter;
pfrom->pfilter = new CBloomFilter(filter);
}
}


else if (strCommand == "filteradd")
{
vector<unsigned char> vData;
vRecv >> vData;

// Nodes must NEVER send a data item > 520 bytes (the max size for a script data object,
// and thus, the maximum size any matched object can have) in a filteradd message
if (vData.size() > 520)
{
pfrom->Misbehaving(100);
} else {
LOCK(pfrom->cs_filter);
if (pfrom->pfilter)
pfrom->pfilter->insert(vData);
else
pfrom->Misbehaving(100);
}
}


else if (strCommand == "filterclear")
{
LOCK(pfrom->cs_filter);
delete pfrom->pfilter;
pfrom->pfilter = NULL;
}


else
{
// Ignore unknown commands for extensibility
Expand Down
6 changes: 6 additions & 0 deletions src/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "protocol.h"
#include "addrman.h"
#include "hash.h"
#include "bloom.h"

class CNode;
class CBlockIndex;
Expand Down Expand Up @@ -152,6 +153,8 @@ class CNode
bool fSuccessfullyConnected;
bool fDisconnect;
CSemaphoreGrant grantOutbound;
CCriticalSection cs_filter;
CBloomFilter* pfilter;
protected:
int nRefCount;

Expand Down Expand Up @@ -209,6 +212,7 @@ class CNode
fGetAddr = false;
nMisbehavior = 0;
setInventoryKnown.max_size(SendBufferSize() / 1000);
pfilter = NULL;

// Be shy and don't send version until we hear
if (!fInbound)
Expand All @@ -222,6 +226,8 @@ class CNode
closesocket(hSocket);
hSocket = INVALID_SOCKET;
}
if (pfilter)
delete pfilter;
}

private:
Expand Down

0 comments on commit 422d122

Please sign in to comment.