void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 04:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reorg fields to be in same order as FS scheme.

Browse source
This commit is contained in:
Adam Ierymenko 2015-10-09 15:18:01 -07:00
parent c9295a5883
commit 7d01fab132
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
controller/SqliteNetworkController.cpp
View file

@ -1891,10 +1891,10 @@ void SqliteNetworkController::_circuitTestCallback(ZT_Node *node,ZT_CircuitTest
return; return;
fseek(f,0,SEEK_END); fseek(f,0,SEEK_END);
fprintf(f,"%s{\n" fprintf(f,"%s{\n"
"\t\"current\": \"%.10llx\","ZT_EOL_S
"\t\"upstream\": \"%.10llx\","ZT_EOL_S
"\t\"testId\": \"%.16llx\","ZT_EOL_S
"\t\"timestamp\": %llu,"ZT_EOL_S "\t\"timestamp\": %llu,"ZT_EOL_S
"\t\"testId\": \"%.16llx\","ZT_EOL_S
"\t\"upstream\": \"%.10llx\","ZT_EOL_S
"\t\"current\": \"%.10llx\","ZT_EOL_S
"\t\"receivedTimestamp\": %llu,"ZT_EOL_S "\t\"receivedTimestamp\": %llu,"ZT_EOL_S
"\t\"remoteTimestamp\": %llu,"ZT_EOL_S "\t\"remoteTimestamp\": %llu,"ZT_EOL_S
"\t\"sourcePacketId\": \"%.16llx\","ZT_EOL_S "\t\"sourcePacketId\": \"%.16llx\","ZT_EOL_S
@ -1912,10 +1912,10 @@ void SqliteNetworkController::_circuitTestCallback(ZT_Node *node,ZT_CircuitTest
"\t\"receivedFromRemoteAddress\": \"%s\""ZT_EOL_S "\t\"receivedFromRemoteAddress\": \"%s\""ZT_EOL_S
"}", "}",
((ftell(f) > 0) ? ",\n" : ""), ((ftell(f) > 0) ? ",\n" : ""),
(unsigned long long)report->current,
(unsigned long long)report->upstream,
(unsigned long long)test->testId,
(unsigned long long)report->timestamp, (unsigned long long)report->timestamp,
(unsigned long long)test->testId,
(unsigned long long)report->upstream,
(unsigned long long)report->current,
(unsigned long long)now, (unsigned long long)now,
(unsigned long long)report->remoteTimestamp, (unsigned long long)report->remoteTimestamp,
(unsigned long long)report->sourcePacketId, (unsigned long long)report->sourcePacketId,