diff options
Diffstat (limited to 'controller/EmbeddedNetworkController.hpp')
| -rw-r--r-- | controller/EmbeddedNetworkController.hpp | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp index f6e6b098..16a1adbe 100644 --- a/controller/EmbeddedNetworkController.hpp +++ b/controller/EmbeddedNetworkController.hpp @@ -37,6 +37,9 @@ #include "../ext/json/json.hpp" +// Expiration time for network member cache entries in ms +#define ZT_NETCONF_NETWORK_MEMBER_CACHE_EXPIRE 30000 + namespace ZeroTier { class Node; @@ -80,6 +83,7 @@ public: private: static void _circuitTestCallback(ZT_Node *node,ZT_CircuitTest *test,const ZT_CircuitTestReport *report); + // JSON blob I/O inline nlohmann::json _readJson(const std::string &path) { std::string buf; @@ -90,20 +94,19 @@ private: } 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); + return OSUtils::writeFile(path.c_str(),obj.dump(2)); } + // Network base path and network JSON path 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); + Utils::snprintf(tmp,sizeof(tmp),"%.16llx",nwid); p.append(tmp); if (create) OSUtils::mkdir(p.c_str()); return p; @@ -112,6 +115,8 @@ private: { return (_networkBP(nwid,create) + ZT_PATH_SEPARATOR + "config.json"); } + + // Member base path and member JSON path inline std::string _memberBP(const uint64_t nwid,const Address &member,bool create) { std::string p(_networkBP(nwid,create)); @@ -128,26 +133,29 @@ private: return (_memberBP(nwid,member,create) + ZT_PATH_SEPARATOR + "config.json"); } - inline std::set<InetAddress> _getAlreadyAllocatedIps(const uint64_t nwid) + // We cache the members of networks in memory to avoid having to scan the filesystem so much + std::map< uint64_t,std::pair< std::map< Address,nlohmann::json >,uint64_t > > _networkMemberCache; + Mutex _networkMemberCache_m; + + // Gathers a bunch of statistics about members of a network, IP assignments, etc. that we need in various places + // This does lock _networkMemberCache_m + struct _NetworkMemberInfo { - 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; + _NetworkMemberInfo() : authorizedMemberCount(0),activeMemberCount(0),totalMemberCount(0) {} + std::set<Address> activeBridges; + std::set<InetAddress> allocatedIps; + unsigned long authorizedMemberCount; + unsigned long activeMemberCount; + unsigned long totalMemberCount; + }; + void _getNetworkMemberInfo(uint64_t now,uint64_t nwid,_NetworkMemberInfo &nmi); + + inline void _addNetworkNonPersistedFields(nlohmann::json &network,uint64_t now,const _NetworkMemberInfo &nmi) + { + network["clock"] = now; + network["authorizedMemberCount"] = nmi.authorizedMemberCount; + network["activeMemberCount"] = nmi.activeMemberCount; + network["totalMemberCount"] = nmi.totalMemberCount; } // These are const after construction |