We now always build the controller in ZeroTier One, at least for desktop and server targets. Also means that ZeroTier One now requires C++11. (Still keeping C++11 out of the core in node/ though.)

1 files changed, 0 insertions, 173 deletions

diff --git a/controller/SqliteNetworkController.hpp b/controller/SqliteNetworkController.hpp
deleted file mode 100644
index 288ea23a..00000000
--- a/controller/SqliteNetworkController.hpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2015  ZeroTier, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef ZT_SQLITENETWORKCONTROLLER_HPP
-#define ZT_SQLITENETWORKCONTROLLER_HPP
-
-#include <stdint.h>
-
-#include <string>
-#include <map>
-#include <vector>
-#include <set>
-
-#include "../node/Constants.hpp"
-
-#include "../node/NetworkController.hpp"
-#include "../node/Mutex.hpp"
-#include "../node/Utils.hpp"
-#include "../node/InetAddress.hpp"
-
-#include "../osdep/OSUtils.hpp"
-
-#include "../ext/json/json.hpp"
-
-namespace ZeroTier {
-
-class Node;
-
-class SqliteNetworkController : public NetworkController
-{
-public:
-	SqliteNetworkController(Node *node,const char *dbPath);
-	virtual ~SqliteNetworkController();
-
-	virtual NetworkController::ResultCode doNetworkConfigRequest(
-		const InetAddress &fromAddr,
-		const Identity &signingId,
-		const Identity &identity,
-		uint64_t nwid,
-		const Dictionary<ZT_NETWORKCONFIG_METADATA_DICT_CAPACITY> &metaData,
-		NetworkConfig &nc);
-
-	unsigned int handleControlPlaneHttpGET(
-		const std::vector<std::string> &path,
-		const std::map<std::string,std::string> &urlArgs,
-		const std::map<std::string,std::string> &headers,
-		const std::string &body,
-		std::string &responseBody,
-		std::string &responseContentType);
-	unsigned int handleControlPlaneHttpPOST(
-		const std::vector<std::string> &path,
-		const std::map<std::string,std::string> &urlArgs,
-		const std::map<std::string,std::string> &headers,
-		const std::string &body,
-		std::string &responseBody,
-		std::string &responseContentType);
-	unsigned int handleControlPlaneHttpDELETE(
-		const std::vector<std::string> &path,
-		const std::map<std::string,std::string> &urlArgs,
-		const std::map<std::string,std::string> &headers,
-		const std::string &body,
-		std::string &responseBody,
-		std::string &responseContentType);
-
-private:
-	static void _circuitTestCallback(ZT_Node *node,ZT_CircuitTest *test,const ZT_CircuitTestReport *report);
-
-	inline nlohmann::json _readJson(const std::string &path)
-	{
-		std::string buf;
-		if (OSUtils::readFile(path.c_str(),buf)) {
-			try {
-				return nlohmann::json::parse(buf);
-			} catch ( ... ) {}
-		}
-		return nlohmann::json::object();
-	}
-
-	inline bool _writeJson(const std::string &path,const nlohmann::json &obj)
-	{
-		std::string buf(obj.dump(2));
-		return OSUtils::writeFile(path.c_str(),buf);
-	}
-
-	inline std::string _networkBP(const uint64_t nwid,bool create)
-	{
-		char tmp[64];
-		Utils::snprintf(tmp,sizeof(tmp),"%.16llx",nwid);
-		std::string p(_path + ZT_PATH_SEPARATOR_S + "network");
-		if (create) OSUtils::mkdir(p.c_str());
-		p.push_back(ZT_PATH_SEPARATOR);
-		p.append(tmp);
-		if (create) OSUtils::mkdir(p.c_str());
-		return p;
-	}
-	inline std::string _networkJP(const uint64_t nwid,bool create)
-	{
-		return (_networkBP(nwid,create) + ZT_PATH_SEPARATOR + "config.json");
-	}
-	inline std::string _memberBP(const uint64_t nwid,const Address &member,bool create)
-	{
-		std::string p(_networkBP(nwid,create));
-		p.push_back(ZT_PATH_SEPARATOR);
-		p.append("member");
-		if (create) OSUtils::mkdir(p.c_str());
-		p.push_back(ZT_PATH_SEPARATOR);
-		p.append(member.toString());
-		if (create) OSUtils::mkdir(p.c_str());
-		return p;
-	}
-	inline std::string _memberJP(const uint64_t nwid,const Address &member,bool create)
-	{
-		return (_memberBP(nwid,member,create) + ZT_PATH_SEPARATOR + "config.json");
-	}
-
-	inline std::set<InetAddress> _getAlreadyAllocatedIps(const uint64_t nwid)
-	{
-		std::set<InetAddress> ips;
-		std::string bp(_networkBP(nwid,false) + ZT_PATH_SEPARATOR_S + "member");
-		std::vector<std::string> members(OSUtils::listSubdirectories(bp.c_str()));
-		for(std::vector<std::string>::iterator m(members.begin());m!=members.end();++m) {
-			if (m->length() == ZT_ADDRESS_LENGTH_HEX) {
-				nlohmann::json mj = _readJson(bp + ZT_PATH_SEPARATOR_S + *m + ZT_PATH_SEPARATOR_S + "config.json");
-				auto ipAssignments = mj["ipAssignments"];
-				if (ipAssignments.is_array()) {
-					for(unsigned long i=0;i<ipAssignments.size();++i) {
-						std::string ipstr = ipAssignments[i];
-						InetAddress ip(ipstr);
-						if (ip)
-							ips.insert(ip);
-					}
-				}
-			}
-		}
-		return ips;
-	}
-
-	// These are const after construction
-	Node *const _node;
-	std::string _path;
-
-	// Circuit tests outstanding
-	struct _CircuitTestEntry
-	{
-		ZT_CircuitTest *test;
-		std::string jsonResults;
-	};
-	std::map< uint64_t,_CircuitTestEntry > _circuitTests;
-	Mutex _circuitTests_m;
-
-	// Last request time by address, for rate limitation
-	std::map< std::pair<uint64_t,uint64_t>,uint64_t > _lastRequestTime;
-	Mutex _lastRequestTime_m;
-};
-
-} // namespace ZeroTier
-
-#endif