void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Now with less bugs.

Browse source
This commit is contained in:
Adam Ierymenko 2017-03-03 13:49:21 -08:00
parent a109d341ef
commit d56f740dc6
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
node/IncomingPacket.cpp
View file

@ -875,6 +875,8 @@ bool IncomingPacket::_doNETWORK_CREDENTIALS(const RuntimeEnvironment *RR,const S
} }
} }
if (p >= size()) return true;
const unsigned int numTags = at<uint16_t>(p); p += 2; const unsigned int numTags = at<uint16_t>(p); p += 2;
for(unsigned int i=0;i<numTags;++i) { for(unsigned int i=0;i<numTags;++i) {
p += tag.deserialize(*this,p); p += tag.deserialize(*this,p);
@ -893,6 +895,8 @@ bool IncomingPacket::_doNETWORK_CREDENTIALS(const RuntimeEnvironment *RR,const S
} }
} }
if (p >= size()) return true;
const unsigned int numRevocations = at<uint16_t>(p); p += 2; const unsigned int numRevocations = at<uint16_t>(p); p += 2;
for(unsigned int i=0;i<numRevocations;++i) { for(unsigned int i=0;i<numRevocations;++i) {
p += revocation.deserialize(*this,p); p += revocation.deserialize(*this,p);
@ -911,6 +915,8 @@ bool IncomingPacket::_doNETWORK_CREDENTIALS(const RuntimeEnvironment *RR,const S
} }
} }
if (p >= size()) return true;
const unsigned int numCoos = at<uint16_t>(p); p += 2; const unsigned int numCoos = at<uint16_t>(p); p += 2;
for(unsigned int i=0;i<numCoos;++i) { for(unsigned int i=0;i<numCoos;++i) {
p += coo.deserialize(*this,p); p += coo.deserialize(*this,p);

11
node/Node.hpp
View file

@ -227,8 +227,9 @@ public:
*/ */
inline void expectReplyTo(const uint64_t packetId) inline void expectReplyTo(const uint64_t packetId)
{ {
const unsigned long bucket = (unsigned long)(packetId & ZT_EXPECTING_REPLIES_BUCKET_MASK1); const unsigned long pid2 = (unsigned long)(packetId >> 32);
_expectingRepliesTo[bucket][_expectingRepliesToBucketPtr[bucket]++ & ZT_EXPECTING_REPLIES_BUCKET_MASK2] = (uint32_t)(packetId >> 32); const unsigned long bucket = (unsigned long)(pid2 & ZT_EXPECTING_REPLIES_BUCKET_MASK1);
_expectingRepliesTo[bucket][_expectingRepliesToBucketPtr[bucket]++ & ZT_EXPECTING_REPLIES_BUCKET_MASK2] = (uint32_t)pid2;
} }
/** /**
@ -243,10 +244,10 @@ public:
*/ */
inline bool expectingReplyTo(const uint64_t packetId) const inline bool expectingReplyTo(const uint64_t packetId) const
{ {
const unsigned long bucket = (unsigned long)(packetId & ZT_EXPECTING_REPLIES_BUCKET_MASK1); const uint32_t pid2 = (uint32_t)(packetId >> 32);
const uint32_t pid = (uint32_t)(packetId >> 32); const unsigned long bucket = (unsigned long)(pid2 & ZT_EXPECTING_REPLIES_BUCKET_MASK1);
for(unsigned long i=0;i<=ZT_EXPECTING_REPLIES_BUCKET_MASK2;++i) { for(unsigned long i=0;i<=ZT_EXPECTING_REPLIES_BUCKET_MASK2;++i) {
if (_expectingRepliesTo[bucket][i] == pid) if (_expectingRepliesTo[bucket][i] == pid2)
return true; return true;
} }
return false; return false;