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

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
parent 4fe9a4fe83
commit 2fc3d12fb6
3 changed files with 7 additions and 8 deletions
Show Stats 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;

4
osdep/ManagedRoute.cpp
View File

@ -524,11 +524,11 @@ void ManagedRoute::remove()
#endif // __BSD__ ------------------------------------------------------------
#ifdef __LINUX__ // ----------------------------------------------------------
_routeCmd("del",*r,_via,(_via) ? (const char *)0 : _device);
_routeCmd("del",r->first,_via,(_via) ? (const char *)0 : _device);
#endif // __LINUX__ ----------------------------------------------------------
#ifdef __WINDOWS__ // --------------------------------------------------------
_winRoute(true,interfaceLuid,interfaceIndex,*r,_via);
_winRoute(true,interfaceLuid,interfaceIndex,r->first,_via);
#endif // __WINDOWS__ --------------------------------------------------------
}