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

Revert backgrounding of controller requests hack. Controller code is not really parallel anyway and we fixed the perf problem.

Browse Source
This commit is contained in:
Adam Ierymenko 2016-06-29 11:43:22 -07:00
parent bb63646682
commit 19735e7050
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
node/IncomingPacket.cpp
View File

@ -61,7 +61,6 @@ bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,bool deferred)
SharedPtr<Peer> peer(RR->topology->getPeer(sourceAddress)); SharedPtr<Peer> peer(RR->topology->getPeer(sourceAddress));
if (peer) { if (peer) {
if (!_authenticated) {
if (!dearmor(peer->key())) { if (!dearmor(peer->key())) {
TRACE("dropped packet from %s(%s), MAC authentication failed (size: %u)",peer->address().toString().c_str(),_remoteAddress.toString().c_str(),size()); TRACE("dropped packet from %s(%s), MAC authentication failed (size: %u)",peer->address().toString().c_str(),_remoteAddress.toString().c_str(),size());
return true; return true;
@ -70,8 +69,6 @@ bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,bool deferred)
TRACE("dropped packet from %s(%s), compressed data invalid",peer->address().toString().c_str(),_remoteAddress.toString().c_str()); TRACE("dropped packet from %s(%s), compressed data invalid",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
return true; return true;
} }
_authenticated = true;
}
const Packet::Verb v = verb(); const Packet::Verb v = verb();
//TRACE("<< %s from %s(%s)",Packet::verbString(v),sourceAddress.toString().c_str(),_remoteAddress.toString().c_str()); //TRACE("<< %s from %s(%s)",Packet::verbString(v),sourceAddress.toString().c_str(),_remoteAddress.toString().c_str());
@ -91,13 +88,7 @@ bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,bool deferred)
case Packet::VERB_ECHO: return _doECHO(RR,peer); case Packet::VERB_ECHO: return _doECHO(RR,peer);
case Packet::VERB_MULTICAST_LIKE: return _doMULTICAST_LIKE(RR,peer); case Packet::VERB_MULTICAST_LIKE: return _doMULTICAST_LIKE(RR,peer);
case Packet::VERB_NETWORK_MEMBERSHIP_CERTIFICATE: return _doNETWORK_MEMBERSHIP_CERTIFICATE(RR,peer); case Packet::VERB_NETWORK_MEMBERSHIP_CERTIFICATE: return _doNETWORK_MEMBERSHIP_CERTIFICATE(RR,peer);
case Packet::VERB_NETWORK_CONFIG_REQUEST: case Packet::VERB_NETWORK_CONFIG_REQUEST: return _doNETWORK_CONFIG_REQUEST(RR,peer);
if ((RR->dpEnabled > 0)&&(!deferred)) {
RR->dp->enqueue(this);
return true;
} else {
return _doNETWORK_CONFIG_REQUEST(RR,peer);
}
case Packet::VERB_NETWORK_CONFIG_REFRESH: return _doNETWORK_CONFIG_REFRESH(RR,peer); case Packet::VERB_NETWORK_CONFIG_REFRESH: return _doNETWORK_CONFIG_REFRESH(RR,peer);
case Packet::VERB_MULTICAST_GATHER: return _doMULTICAST_GATHER(RR,peer); case Packet::VERB_MULTICAST_GATHER: return _doMULTICAST_GATHER(RR,peer);
case Packet::VERB_MULTICAST_FRAME: return _doMULTICAST_FRAME(RR,peer); case Packet::VERB_MULTICAST_FRAME: return _doMULTICAST_FRAME(RR,peer);

7
node/IncomingPacket.hpp
View File

@ -58,8 +58,7 @@ public:
Packet(), Packet(),
_receiveTime(0), _receiveTime(0),
_localAddress(), _localAddress(),
_remoteAddress(), _remoteAddress()
_authenticated(false)
{ {
} }
@ -83,8 +82,7 @@ public:
Packet(data,len), Packet(data,len),
_receiveTime(now), _receiveTime(now),
_localAddress(localAddress), _localAddress(localAddress),
_remoteAddress(remoteAddress), _remoteAddress(remoteAddress)
_authenticated(false)
{ {
} }
@ -190,7 +188,6 @@ private:
uint64_t _receiveTime; uint64_t _receiveTime;
InetAddress _localAddress; InetAddress _localAddress;
InetAddress _remoteAddress; InetAddress _remoteAddress;
bool _authenticated;
}; };
} // namespace ZeroTier } // namespace ZeroTier