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

1 files changed, 0 insertions, 67 deletions

diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp
index 5864100d..e9b4764a 100644
--- a/controller/EmbeddedNetworkController.hpp
+++ b/controller/EmbeddedNetworkController.hpp
@@ -105,73 +105,6 @@ private:
 	void _request(uint64_t nwid,const InetAddress &fromAddr,uint64_t requestPacketId,const Identity &identity,const Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY> &metaData);
 	void _startThreads();
 
-	// These init objects with default and static/informational fields
-	inline void _initMember(nlohmann::json &member)
-	{
-		if (!member.count("authorized")) member["authorized"] = false;
- 		if (!member.count("ipAssignments")) member["ipAssignments"] = nlohmann::json::array();
-		if (!member.count("activeBridge")) member["activeBridge"] = false;
-		if (!member.count("tags")) member["tags"] = nlohmann::json::array();
-		if (!member.count("capabilities")) member["capabilities"] = nlohmann::json::array();
-		if (!member.count("creationTime")) member["creationTime"] = OSUtils::now();
-		if (!member.count("noAutoAssignIps")) member["noAutoAssignIps"] = false;
-		if (!member.count("revision")) member["revision"] = 0ULL;
-		if (!member.count("lastDeauthorizedTime")) member["lastDeauthorizedTime"] = 0ULL;
-		if (!member.count("lastAuthorizedTime")) member["lastAuthorizedTime"] = 0ULL;
-		if (!member.count("lastAuthorizedCredentialType")) member["lastAuthorizedCredentialType"] = nlohmann::json();
-		if (!member.count("lastAuthorizedCredential")) member["lastAuthorizedCredential"] = nlohmann::json();
-		if (!member.count("vMajor")) member["vMajor"] = -1;
-		if (!member.count("vMinor")) member["vMinor"] = -1;
-		if (!member.count("vRev")) member["vRev"] = -1;
-		if (!member.count("vProto")) member["vProto"] = -1;
-		if (!member.count("remoteTraceTarget")) member["remoteTraceTarget"] = nlohmann::json();
-		if (!member.count("removeTraceLevel")) member["remoteTraceLevel"] = 0;
-		member["objtype"] = "member";
-	}
-	inline void _initNetwork(nlohmann::json &network)
-	{
-		if (!network.count("private")) network["private"] = true;
-		if (!network.count("creationTime")) network["creationTime"] = OSUtils::now();
-		if (!network.count("name")) network["name"] = "";
-		if (!network.count("multicastLimit")) network["multicastLimit"] = (uint64_t)32;
-		if (!network.count("enableBroadcast")) network["enableBroadcast"] = true;
-		if (!network.count("v4AssignMode")) network["v4AssignMode"] = {{"zt",false}};
-		if (!network.count("v6AssignMode")) network["v6AssignMode"] = {{"rfc4193",false},{"zt",false},{"6plane",false}};
-		if (!network.count("authTokens")) network["authTokens"] = {{}};
-		if (!network.count("capabilities")) network["capabilities"] = nlohmann::json::array();
-		if (!network.count("tags")) network["tags"] = nlohmann::json::array();
-		if (!network.count("routes")) network["routes"] = nlohmann::json::array();
-		if (!network.count("ipAssignmentPools")) network["ipAssignmentPools"] = nlohmann::json::array();
-		if (!network.count("mtu")) network["mtu"] = ZT_DEFAULT_MTU;
-		if (!network.count("remoteTraceTarget")) network["remoteTraceTarget"] = nlohmann::json();
-		if (!network.count("removeTraceLevel")) network["remoteTraceLevel"] = 0;
-		if (!network.count("rules")) {
-			// If unspecified, rules are set to allow anything and behave like a flat L2 segment
-			network["rules"] = {{
-				{ "not",false },
-				{ "or", false },
-				{ "type","ACTION_ACCEPT" }
-			}};
-		}
-		network["objtype"] = "network";
-	}
-	inline void _cleanNetwork(nlohmann::json &network)
-	{
-		network.erase("clock");
-		network.erase("authorizedMemberCount");
-		network.erase("activeMemberCount");
-		network.erase("totalMemberCount");
-		network.erase("lastModified");
-	}
-	inline void _cleanMember(nlohmann::json &member)
-	{
-		member.erase("clock");
-		member.erase("physicalAddr");
-		member.erase("recentLog");
-		member.erase("lastModified");
-		member.erase("lastRequestMetaData");
-	}
-
 	struct _RQEntry
 	{
 		uint64_t nwid;