Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev

1 files changed, 0 insertions, 20 deletions

diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp
index 4121a241..4f343206 100644
--- a/node/NetworkConfig.hpp
+++ b/node/NetworkConfig.hpp
@@ -102,11 +102,6 @@
  */
 #define ZT_NETWORKCONFIG_SPECIALIST_TYPE_ANCHOR 0x0000040000000000ULL
 
-/**
- * Device can send CIRCUIT_TESTs for this network
- */
-#define ZT_NETWORKCONFIG_SPECIALIST_TYPE_CIRCUIT_TESTER 0x0000080000000000ULL
-
 namespace ZeroTier {
 
 // Dictionary capacity needed for max size network config
@@ -345,21 +340,6 @@ public:
 	}
 
 	/**
-	 * @param byPeer Address to check
-	 * @return True if this peer is allowed to do circuit tests on this network (controller is always true)
-	 */
-	inline bool circuitTestingAllowed(const Address &byPeer) const
-	{
-		if (byPeer.toInt() == ((networkId >> 24) & 0xffffffffffULL))
-			return true;
-		for(unsigned int i=0;i<specialistCount;++i) {
-			if ((byPeer == specialists[i])&&((specialists[i] & ZT_NETWORKCONFIG_SPECIALIST_TYPE_CIRCUIT_TESTER) != 0))
-				return true;
-		}
-		return false;
-	}
-
-	/**
 	 * @return True if this network config is non-NULL
 	 */
 	inline operator bool() const { return (networkId != 0); }