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

Prevent recursive transit of ZeroTier packets, toward GitHub issue #56

Browse source
This commit is contained in:
Adam Ierymenko 2014-04-10 14:22:25 -07:00
parent b117ff5435
commit c9294c1a78
6 changed files with 141 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
node/Switch.cpp
View file

@ -48,6 +48,7 @@
#include "Peer.hpp"
#include "NodeConfig.hpp"
#include "CMWC4096.hpp"
#include "AntiRecursion.hpp"
#include "../version.h"
@ -85,6 +86,11 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c
if (!nconf)
return;
if (!_r->antiRec->checkEthernetFrame(data.data(),data.size())) {
TRACE("%s: rejected recursively addressed ZeroTier packet by tail match",network->tapDeviceName().c_str());
return;
}
if (to == network->mac()) {
LOG("%s: frame received from self, ignoring (bridge loop? OS bug?)",network->tapDeviceName().c_str());
return;
@ -225,7 +231,11 @@ bool Switch::sendHELLO(const SharedPtr<Peer> &dest,const Path &path)
outp.append(now);
_r->identity.serialize(outp,false);
outp.armor(dest->key(),false);
return _r->sm->send(path.address(),path.tcp(),path.type() == Path::PATH_TYPE_TCP_OUT,outp.data(),outp.size());
if (_r->sm->send(path.address(),path.tcp(),path.type() == Path::PATH_TYPE_TCP_OUT,outp.data(),outp.size())) {
_r->antiRec->logOutgoingZT(outp.data(),outp.size());
return true;
}
return false;
}
bool Switch::sendHELLO(const SharedPtr<Peer> &dest,const InetAddress &destUdp)
@ -239,7 +249,11 @@ bool Switch::sendHELLO(const SharedPtr<Peer> &dest,const InetAddress &destUdp)
outp.append(now);
_r->identity.serialize(outp,false);
outp.armor(dest->key(),false);
return _r->sm->send(destUdp,false,false,outp.data(),outp.size());
if (_r->sm->send(destUdp,false,false,outp.data(),outp.size())) {
_r->antiRec->logOutgoingZT(outp.data(),outp.size());
return true;
}
return false;
}
bool Switch::unite(const Address &p1,const Address &p2,bool force)