From 19735e70505a5f40fedede0b05764f5b1a1ef383 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Wed, 29 Jun 2016 11:43:22 -0700
Subject: [PATCH] Revert backgrounding of controller requests hack. Controller
 code is not really parallel anyway and we fixed the perf problem.

---
 node/IncomingPacket.cpp | 25 ++++++++-----------------
 node/IncomingPacket.hpp |  7 ++-----
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp
index e6959be6d..871297f75 100644
--- a/node/IncomingPacket.cpp
+++ b/node/IncomingPacket.cpp
@@ -61,16 +61,13 @@ bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,bool deferred)
 
 		SharedPtr<Peer> peer(RR->topology->getPeer(sourceAddress));
 		if (peer) {
-			if (!_authenticated) {
-				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());
-					return true;
-				}
-				if (!uncompress()) {
-					TRACE("dropped packet from %s(%s), compressed data invalid",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
-					return true;
-				}
-				_authenticated = true;
+			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());
+				return true;
+			}
+			if (!uncompress()) {
+				TRACE("dropped packet from %s(%s), compressed data invalid",peer->address().toString().c_str(),_remoteAddress.toString().c_str());
+				return true;
 			}
 
 			const Packet::Verb v = verb();
@@ -91,13 +88,7 @@ bool IncomingPacket::tryDecode(const RuntimeEnvironment *RR,bool deferred)
 				case Packet::VERB_ECHO:                           return _doECHO(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_CONFIG_REQUEST:
-					if ((RR->dpEnabled > 0)&&(!deferred)) {
-						RR->dp->enqueue(this);
-						return true;
-					} else {
-						return _doNETWORK_CONFIG_REQUEST(RR,peer);
-					}
+				case Packet::VERB_NETWORK_CONFIG_REQUEST:         return _doNETWORK_CONFIG_REQUEST(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_FRAME:                return _doMULTICAST_FRAME(RR,peer);
diff --git a/node/IncomingPacket.hpp b/node/IncomingPacket.hpp
index 3be49bf8d..cd0b7dcfd 100644
--- a/node/IncomingPacket.hpp
+++ b/node/IncomingPacket.hpp
@@ -58,8 +58,7 @@ public:
 		Packet(),
 		_receiveTime(0),
 		_localAddress(),
-		_remoteAddress(),
-		_authenticated(false)
+		_remoteAddress()
 	{
 	}
 
@@ -83,8 +82,7 @@ public:
 		Packet(data,len),
 		_receiveTime(now),
 		_localAddress(localAddress),
-		_remoteAddress(remoteAddress),
-		_authenticated(false)
+		_remoteAddress(remoteAddress)
 	{
 	}
 
@@ -190,7 +188,6 @@ private:
 	uint64_t _receiveTime;
 	InetAddress _localAddress;
 	InetAddress _remoteAddress;
-	bool _authenticated;
 };
 
 } // namespace ZeroTier