ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-20 17:52:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add config to status in JSON API.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-03-07 14:17:51 -08:00
parent a97918f812
commit 5dbafc2eeb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/OneService.cpp
View File

@ -1126,7 +1126,16 @@ public:
res["version"] = tmp;
res["clock"] = OSUtils::now();
World planet(_node->planet());
{
Mutex::Lock _l(_localConfig_m);
res["config"] = _localConfig;
}
json &settings = res["config"]["settings"];
settings["primaryPort"] = OSUtils::jsonInt(settings["primaryPort"],(uint64_t)_primaryPort) & 0xffff;
settings["portMappingEnabled"] = OSUtils::jsonBool(settings["portMappingEnabled"],true);
settings["softwareUpdate"] = OSUtils::jsonString(settings["softwareUpdate"],ZT_SOFTWARE_UPDATE_DEFAULT);
const World planet(_node->planet());
res["planetWorldId"] = planet.id();
res["planetWorldTimestamp"] = planet.timestamp();