ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-15 21:58:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only accept world updates from upstreams.

Browse Source
This commit is contained in:
Adam Ierymenko
2017-02-13 09:46:34 -08:00
parent e6840a1863
commit e4b6611201
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
node/IncomingPacket.cpp
View File

@ -449,22 +449,26 @@ bool IncomingPacket::_doOK(const RuntimeEnvironment *RR,const SharedPtr<Peer> &p
InetAddress externalSurfaceAddress;
unsigned int ptr = ZT_PROTO_VERB_HELLO__OK__IDX_REVISION + 2;
// Get reported external surface address if present (was not on old versions)
// Get reported external surface address if present
if (ptr < size())
ptr += externalSurfaceAddress.deserialize(*this,ptr);
// Handle planet or moon updates if present (older versions don't send this)
// Handle planet or moon updates if present
if ((ptr + 2) <= size()) {
const unsigned int worldLen = at<uint16_t>(ptr); ptr += 2;
const unsigned int endOfWorlds = ptr + worldLen;
while (ptr < endOfWorlds) {
World w;
ptr += w.deserialize(*this,ptr);
RR->topology->addWorld(w);
if (RR->topology->isUpstream(peer->identity())) {
const unsigned int endOfWorlds = ptr + worldLen;
while (ptr < endOfWorlds) {
World w;
ptr += w.deserialize(*this,ptr);
RR->topology->addWorld(w);
}
} else {
ptr += worldLen;
}
}
// Handle COR if present (older versions don't send this)
// Handle certificate of representation if present
if ((ptr + 2) <= size()) {
if (at<uint16_t>(ptr) > 0) {
CertificateOfRepresentation cor;