mirrors/ZeroTierOne
1
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-12-15 14:51:08 -08:00
Code Issues Projects Releases Wiki Activity

fix tags/capabilities?

Browse source
This commit is contained in:
Grant Limberg 2025-10-01 14:00:17 -07:00
parent 7faf705e10
commit 80f82132dd
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
nonfree/controller/PubSubWriter.cpp
View file

@ -261,8 +261,26 @@ pbmessages::MemberChange_Member* memberFromJson(const nlohmann::json& j)
}
}
m->set_active_bridge(j.value("activeBridge", false));
m->set_tags(OSUtils::jsonDump(j.value("tags", nlohmann::json::array()), -1));
m->set_capabilities(OSUtils::jsonDump(j.value("capabilities", nlohmann::json::array()), -1));
if (j["tags"].is_array()) {
nlohmann::json tags = j["tags"];
std::string tagsStr = OSUtils::jsonDump(tags, -1);
m->set_tags(tagsStr);
}
else {
nlohmann::json tags = nlohmann::json::array();
std::string tagsStr = OSUtils::jsonDump(tags, -1);
m->set_tags(tagsStr);
}
if (j["capabilities"].is_array()) {
nlohmann::json caps = j["capabilities"];
std::string capsStr = OSUtils::jsonDump(caps, -1);
m->set_capabilities(capsStr);
}
else {
nlohmann::json caps = nlohmann::json::array();
std::string capsStr = OSUtils::jsonDump(caps, -1);
m->set_capabilities(capsStr);
}
m->set_creation_time(j.value("creationTime", 0));
m->set_no_auto_assign_ips(j.value("noAutoAssignIps", false));
m->set_revision(j.value("revision", 0));