From c0639ccd37d9904ad0411a38f0a38f5d7d329f1e Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Tue, 16 Aug 2016 16:46:08 -0700
Subject: Just about ready to test.

---
 controller/SqliteNetworkController.hpp | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

(limited to 'controller/SqliteNetworkController.hpp')

diff --git a/controller/SqliteNetworkController.hpp b/controller/SqliteNetworkController.hpp
index 15e0968f..288ea23a 100644
--- a/controller/SqliteNetworkController.hpp
+++ b/controller/SqliteNetworkController.hpp
@@ -24,12 +24,14 @@
 #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"
 
@@ -76,14 +78,6 @@ public:
 		std::string &responseContentType);
 
 private:
-	unsigned int _doCPGet(
-		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);
-
 	static void _circuitTestCallback(ZT_Node *node,ZT_CircuitTest *test,const ZT_CircuitTestReport *report);
 
 	inline nlohmann::json _readJson(const std::string &path)
@@ -134,6 +128,28 @@ private:
 		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;
-- 
cgit v1.2.3