Pārlūkot izejas kodu

Reorg fields to be in same order as FS scheme.

Adam Ierymenko 9 gadi atpakaļ
vecāks
revīzija
7d01fab132
1 mainītis faili ar 6 papildinājumiem un 6 dzēšanām
  1. 6 6
      controller/SqliteNetworkController.cpp

+ 6 - 6
controller/SqliteNetworkController.cpp

@@ -1891,10 +1891,10 @@ void SqliteNetworkController::_circuitTestCallback(ZT_Node *node,ZT_CircuitTest
 			return;
 		fseek(f,0,SEEK_END);
 		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\"testId\": \"%.16llx\","ZT_EOL_S
+			"\t\"upstream\": \"%.10llx\","ZT_EOL_S
+			"\t\"current\": \"%.10llx\","ZT_EOL_S
 			"\t\"receivedTimestamp\": %llu,"ZT_EOL_S
 			"\t\"remoteTimestamp\": %llu,"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
 			"}",
 			((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)test->testId,
+			(unsigned long long)report->upstream,
+			(unsigned long long)report->current,
 			(unsigned long long)now,
 			(unsigned long long)report->remoteTimestamp,
 			(unsigned long long)report->sourcePacketId,