summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-02-22 12:59:26 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-02-22 12:59:26 -0800
commit43fff1a87ec86470f7f4fe5887d4bf444d1d1b9f (patch)
tree41c27a946aa22bf066ceafe643fa9e578f728125
parent2aa7138373b3d61bf5d6ec8026192ef82a3d6ec3 (diff)
downloadinfinitytier-43fff1a87ec86470f7f4fe5887d4bf444d1d1b9f.tar.gz
infinitytier-43fff1a87ec86470f7f4fe5887d4bf444d1d1b9f.zip
Deprecate reporting of local clock in circuit tests since a small number of users might have security problems with this.
-rw-r--r--node/IncomingPacket.cpp2
-rw-r--r--node/Packet.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp
index 66c956b3..8a180380 100644
--- a/node/IncomingPacket.cpp
+++ b/node/IncomingPacket.cpp
@@ -1078,7 +1078,7 @@ bool IncomingPacket::_doCIRCUIT_TEST(const RuntimeEnvironment *RR,const SharedPt
Packet outp(originatorAddress,RR->identity.address(),Packet::VERB_CIRCUIT_TEST_REPORT);
outp.append((uint64_t)timestamp);
outp.append((uint64_t)testId);
- outp.append((uint64_t)now);
+ outp.append((uint64_t)0); // field reserved for future use
outp.append((uint8_t)ZT_VENDOR_ZEROTIER);
outp.append((uint8_t)ZT_PROTO_VERSION);
outp.append((uint8_t)ZEROTIER_ONE_VERSION_MAJOR);
diff --git a/node/Packet.hpp b/node/Packet.hpp
index 2381397b..7d1e5c68 100644
--- a/node/Packet.hpp
+++ b/node/Packet.hpp
@@ -934,7 +934,7 @@ public:
* Circuit test hop report:
* <[8] 64-bit timestamp (from original test)>
* <[8] 64-bit test ID (from original test)>
- * <[8] 64-bit reporter timestamp (reporter's clock, 0 if unspec)>
+ * <[8] 64-bit reserved field (set to 0, currently unused)>
* <[1] 8-bit vendor ID (set to 0, currently unused)>
* <[1] 8-bit reporter protocol version>
* <[1] 8-bit reporter major version>