diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-07 14:17:51 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-03-07 14:17:51 -0800 |
| commit | 5dbafc2eebced7275d9d85c68abbbee4c0aca948 (patch) | |
| tree | 2b0f638e6b25ba34b51908b5c17bfe6063e9d8d7 /service/OneService.cpp | |
| parent | a97918f81253c0dbb08766271c6ab6111120bf0d (diff) | |
| download | infinitytier-5dbafc2eebced7275d9d85c68abbbee4c0aca948.tar.gz infinitytier-5dbafc2eebced7275d9d85c68abbbee4c0aca948.zip | |
Add config to status in JSON API.
Diffstat (limited to 'service/OneService.cpp')
| -rw-r--r-- | service/OneService.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index eec9ac96..28f6dfcf 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -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(); |