dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'adamierymenko-dev' of /Users/api/Code/local-ZeroTierOne into adamierymenko-dev

Browse source
This commit is contained in:
Adam Ierymenko 2013-10-01 17:19:36 -04:00
commit 929ed5d8b8
4 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
node/Multicaster.hpp
View file

@ -156,11 +156,11 @@ public:
throw() :
_origin(origin),
_bloomNonce((uint64_t)bloomNonce),
_prefixMask(0xffffffffffffffffULL >> (64 - prefixBits)),
_prefix((uint64_t)prefix & _prefixMask),
_ptr(ptr),
_end(end),
_bloom(bloom),
_prefix(prefix),
_prefixBits(std::min(prefixBits,(unsigned int)16)) {}
_bloom(bloom) {}
inline bool operator()(const Address &a)
throw()
@ -169,10 +169,8 @@ public:
if (a == _origin)
return true;
// Prefixes match if N least significant bits in address are equal to the
// prefix. (e.g. 0 bits and 0 prefix would match all, 1 bit and 0 prefix
// would match addresses with LSB == 0)
if (((unsigned int)a.toInt() & (0xffff >> (16 - _prefixBits))) != _prefix)
// Exclude addresses not in this prefix domain
if ((a.toInt() & _prefixMask) != _prefix)
return true;
// Exclude addresses remembered in bloom filter -- or else remember them
@ -191,11 +189,11 @@ public:
private:
const Address _origin;
const uint64_t _bloomNonce;
const uint64_t _prefixMask;
const uint64_t _prefix;
unsigned char **const _ptr;
unsigned char *const _end;
unsigned char *const _bloom;
const unsigned int _prefix;
const unsigned int _prefixBits;
};
private: