ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-14 05:08:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup and replace trace field names with sane ones because usability > a few bytes.

Browse Source
This commit is contained in:
Adam Ierymenko
2017-07-18 14:28:38 -07:00
parent 727ccb1125
commit ae65eb5105
3 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
controller/EmbeddedNetworkController.cpp
View File

@ -1087,6 +1087,9 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpDELETE(
void EmbeddedNetworkController::handleRemoteTrace(const ZT_RemoteTrace &rt)
{
static volatile unsigned long idCounter = 0;
char id[128];
try {
std::vector<uint64_t> nw4m(_db.networksForMember(rt.origin));
@ -1135,6 +1138,10 @@ void EmbeddedNetworkController::handleRemoteTrace(const ZT_RemoteTrace &rt)
}
}
OSUtils::ztsnprintf(id,sizeof(id),"%.10llx-%.10llx-%.16llx-%.8lx",_signingId.address().toInt(),rt.origin,OSUtils::now(),++idCounter);
d["id"] = id;
d["objtype"] = "trace";
bool accept = true;
/*
for(std::vector<uint64_t>::const_iterator nwid(nw4m.begin());nwid!=nw4m.end();++nwid) {
@ -1159,7 +1166,7 @@ void EmbeddedNetworkController::handleRemoteTrace(const ZT_RemoteTrace &rt)
*/
if (accept) {
char p[128];
OSUtils::ztsnprintf(p,sizeof(p),"trace/%.10llx-%.10llx-%.16llx",_signingId.address().toInt(),rt.origin,OSUtils::now());
OSUtils::ztsnprintf(p,sizeof(p),"trace/%s",id);
_db.writeRaw(p,OSUtils::jsonDump(d));
}
} catch ( ... ) {