diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-05-01 15:23:21 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-05-01 15:23:21 -0700 |
| commit | bcc67999023c06f97402b4eef70443b39e091e65 (patch) | |
| tree | 94f279921567d7c0735c34d07d522866c7f9303b /controller/EmbeddedNetworkController.hpp | |
| parent | 718e1d6c082453bfbab8b900f5ffde42047fc814 (diff) | |
| download | infinitytier-bcc67999023c06f97402b4eef70443b39e091e65.tar.gz infinitytier-bcc67999023c06f97402b4eef70443b39e091e65.zip | |
Send member uptime in pong posts.
Diffstat (limited to 'controller/EmbeddedNetworkController.hpp')
| -rw-r--r-- | controller/EmbeddedNetworkController.hpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp index faf7f029..0a6b8176 100644 --- a/controller/EmbeddedNetworkController.hpp +++ b/controller/EmbeddedNetworkController.hpp @@ -114,7 +114,6 @@ private: if (!member.count("authorized")) member["authorized"] = false; if (!member.count("authHistory")) member["authHistory"] = nlohmann::json::array(); if (!member.count("ipAssignments")) member["ipAssignments"] = nlohmann::json::array(); - if (!member.count("recentLog")) member["recentLog"] = nlohmann::json::array(); if (!member.count("activeBridge")) member["activeBridge"] = false; if (!member.count("tags")) member["tags"] = nlohmann::json::array(); if (!member.count("capabilities")) member["capabilities"] = nlohmann::json::array(); @@ -123,6 +122,11 @@ private: if (!member.count("revision")) member["revision"] = 0ULL; if (!member.count("lastDeauthorizedTime")) member["lastDeauthorizedTime"] = 0ULL; if (!member.count("lastAuthorizedTime")) member["lastAuthorizedTime"] = 0ULL; + if (!member.count("vMajor")) member["vMajor"] = -1; + if (!member.count("vMinor")) member["vMinor"] = -1; + if (!member.count("vRev")) member["vRev"] = -1; + if (!member.count("vProto")) member["vProto"] = -1; + if (!member.count("physicalAddr")) member["physicalAddr"] = nlohmann::json(); member["objtype"] = "member"; } inline void _initNetwork(nlohmann::json &network) @@ -162,6 +166,8 @@ private: network.erase("authorizedMemberCount"); network.erase("activeMemberCount"); network.erase("totalMemberCount"); + // legacy fields + network.erase("lastModified"); } inline void _addMemberNonPersistedFields(uint64_t nwid,uint64_t nodeId,nlohmann::json &member,uint64_t now) { @@ -172,6 +178,10 @@ private: inline void _removeMemberNonPersistedFields(nlohmann::json &member) { member.erase("clock"); + // legacy fields + member.erase("recentLog"); + member.erase("lastModified"); + member.erase("lastRequestMetaData"); } const uint64_t _startTime; |