void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2232 from zerotier/unstable-api-fixes

Browse source 
Unstable api fixes
This commit is contained in:
Joseph Henry 2024-03-04 13:11:30 -08:00 • committed by GitHub
commit 5d8bd674cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
controller/EmbeddedNetworkController.cpp
View file

@ -918,6 +918,7 @@ void EmbeddedNetworkController::configureHTTPControlPlane(
auto meta = json::object(); auto meta = json::object();
auto data = json::array(); auto data = json::array();
uint64_t networkCount = 0;
for(std::set<uint64_t>::const_iterator nwid(networkIds.begin()); nwid != networkIds.end(); ++nwid) { for(std::set<uint64_t>::const_iterator nwid(networkIds.begin()); nwid != networkIds.end(); ++nwid) {
json network; json network;
@ -927,23 +928,26 @@ void EmbeddedNetworkController::configureHTTPControlPlane(
std::vector<json> memTmp; std::vector<json> memTmp;
if (_db.get(*nwid, network, memTmp)) { if (_db.get(*nwid, network, memTmp)) {
uint64_t authorizedCount = 0; if (!network.is_null()) {
uint64_t totalCount = memTmp.size(); uint64_t authorizedCount = 0;
uint64_t totalCount = memTmp.size();
networkCount++;
for (auto m = memTmp.begin(); m != memTmp.end(); ++m) { for (auto m = memTmp.begin(); m != memTmp.end(); ++m) {
bool a = OSUtils::jsonBool((*m)["authorized"], 0); bool a = OSUtils::jsonBool((*m)["authorized"], 0);
if (a) { authorizedCount++; } if (a) { authorizedCount++; }
}
auto nwMeta = json::object();
nwMeta["totalMemberCount"] = totalCount;
nwMeta["authorizedMemberCount"] = authorizedCount;
network["meta"] = nwMeta;
data.push_back(network);
} }
auto nwMeta = json::object();
nwMeta["totalMemberCount"] = totalCount;
nwMeta["authorizedMemberCount"] = authorizedCount;
network["meta"] = nwMeta;
} }
data.push_back(network);
} }
meta["networkCount"] = networkIds.size(); meta["networkCount"] = networkCount;
auto out = json::object(); auto out = json::object();
out["data"] = data; out["data"] = data;
@ -1090,26 +1094,26 @@ void EmbeddedNetworkController::configureHTTPControlPlane(
auto out = nlohmann::json::object(); auto out = nlohmann::json::object();
auto meta = nlohmann::json::object(); auto meta = nlohmann::json::object();
auto members = nlohmann::json::array();
std::vector<json> memTmp; std::vector<json> memTmp;
if (_db.get(nwid, network, memTmp)) { if (_db.get(nwid, network, memTmp)) {
members.push_back(memTmp); uint64_t authorizedCount = 0;
uint64_t totalCount = memTmp.size();
for (auto m = memTmp.begin(); m != memTmp.end(); ++m) {
bool a = OSUtils::jsonBool((*m)["authorized"], 0);
if (a) { authorizedCount++; }
}
meta["totalCount"] = totalCount;
meta["authorizedCount"] = authorizedCount;
out["data"] = memTmp;
out["meta"] = meta;
setContent(req, res, out.dump());
} else {
res.status = 404;
return;
} }
uint64_t authorizedCount = 0;
uint64_t totalCount = memTmp.size();
for (auto m = memTmp.begin(); m != memTmp.end(); ++m) {
bool a = OSUtils::jsonBool((*m)["authorized"], 0);
if (a) { authorizedCount++; }
}
meta["totalCount"] = totalCount;
meta["authorizedCount"] = authorizedCount;
out["data"] = members;
out["meta"] = meta;
setContent(req, res, out.dump());
}; };
s.Get(memberListPath2, memberListGet2); s.Get(memberListPath2, memberListGet2);
sv6.Get(memberListPath2, memberListGet2); sv6.Get(memberListPath2, memberListGet2);