github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 13:24:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Minor tweaks to member code in controller, and fix Linux build.

Browse source
This commit is contained in:
Adam Ierymenko 2016-09-29 14:48:39 -07:00
commit 2fc3d12fb6
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
controller/EmbeddedNetworkController.cpp
View file

@ -1004,12 +1004,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpGET(
if (!member.size())
return 404;
char addrs[24];
Utils::snprintf(addrs,sizeof(addrs),"%.10llx",address);
// Add non-persisted fields
member["clock"] = OSUtils::now();
_addMemberNonPersistedFields(member,now);
responseBody = member.dump(2);
responseContentType = "application/json";

4
controller/EmbeddedNetworkController.hpp
View file

@ -181,6 +181,10 @@ private:
network["activeMemberCount"] = nmi.activeMemberCount;
network["totalMemberCount"] = nmi.totalMemberCount;
}
inline void _addMemberNonPersistedFields(nlohmann::json &member,uint64_t now)
{
member["clock"] = now;
}
// These are const after construction
Node *const _node;