GitHub issue #460

3 files changed, 13 insertions, 22 deletions

diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp
index d2f40b1c..8fbc1cf8 100644
--- a/controller/EmbeddedNetworkController.cpp
+++ b/controller/EmbeddedNetworkController.cpp
@@ -533,11 +533,10 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpGET(
 						Mutex::Lock _l(_db_m);
 
 						responseBody = "{";
-						std::string pfx(std::string("network/") + nwids + "member/");
-						_db.filter(pfx,ZT_NETCONF_DB_CACHE_TTL,[&responseBody](const std::string &n,const json &member) {
-							if (member.size() > 0) {
+						_db.filter((std::string("network/") + nwids + "/member/"),ZT_NETCONF_DB_CACHE_TTL,[&responseBody](const std::string &n,const json &member) {
+							if ((member.is_object())&&(member.size() > 0)) {
 								responseBody.append((responseBody.length() == 1) ? "\"" : ",\"");
-								responseBody.append(OSUtils::jsonString(member["id"],""));
+								responseBody.append(OSUtils::jsonString(member["id"],"0"));
 								responseBody.append("\":");
 								responseBody.append(OSUtils::jsonString(member["revision"],"0"));
 							}
diff --git a/controller/JSONDB.cpp b/controller/JSONDB.cpp
index 1277aabb..298ac721 100644
--- a/controller/JSONDB.cpp
+++ b/controller/JSONDB.cpp
@@ -126,22 +126,14 @@ void JSONDB::erase(const std::string &n)
 	_db.erase(n);
 }
 
-void JSONDB::_reload(const std::string &p)
+void JSONDB::_reload(const std::string &p,const std::string &b)
 {
-	std::map<std::string,char> l(OSUtils::listDirectoryFull(p.c_str()));
-	for(std::map<std::string,char>::iterator li(l.begin());li!=l.end();++li) {
-		if (li->second == 'f') {
-			// assume p starts with _basePath, which it always does -- will throw otherwise
-			std::string n(p.substr(_basePath.length()));
-			while ((n.length() > 0)&&(n[0] == ZT_PATH_SEPARATOR)) n = n.substr(1);
-			if (ZT_PATH_SEPARATOR != '/') std::replace(n.begin(),n.end(),ZT_PATH_SEPARATOR,'/');
-			if ((n.length() > 0)&&(n[n.length() - 1] != '/')) n.push_back('/');
-			n.append(li->first);
-			if ((n.length() > 5)&&(n.substr(n.length() - 5) == ".json")) {
-				this->get(n.substr(0,n.length() - 5),0); // causes load and cache or update
-			}
-		} else if (li->second == 'd') {
-			this->_reload(p + ZT_PATH_SEPARATOR + li->first);
+	std::vector<std::string> dl(OSUtils::listDirectory(p.c_str()));
+	for(std::vector<std::string>::const_iterator di(dl.begin());di!=dl.end();++di) {
+		if ((di->length() > 5)&&(di->substr(di->length() - 5) == ".json")) {
+			this->get(b + di->substr(0,di->length() - 5),0);
+		} else {
+			this->_reload((p + ZT_PATH_SEPARATOR + *di),(b + *di + ZT_PATH_SEPARATOR));
 		}
 	}
 }
diff --git a/controller/JSONDB.hpp b/controller/JSONDB.hpp
index 5b7c5e50..d2549173 100644
--- a/controller/JSONDB.hpp
+++ b/controller/JSONDB.hpp
@@ -45,13 +45,13 @@ public:
 	JSONDB(const std::string &basePath) :
 		_basePath(basePath)
 	{
-		_reload(_basePath);
+		_reload(_basePath,std::string());
 	}
 
 	inline void reload()
 	{
 		_db.clear();
-		_reload(_basePath);
+		_reload(_basePath,std::string());
 	}
 
 	bool writeRaw(const std::string &n,const std::string &obj);
@@ -95,7 +95,7 @@ public:
 	inline bool operator!=(const JSONDB &db) const { return (!(*this == db)); }
 
 private:
-	void _reload(const std::string &p);
+	void _reload(const std::string &p,const std::string &b);
 	bool _isValidObjectName(const std::string &n);
 	std::string _genPath(const std::string &n,bool create);