From d87a1d6b99e8952b4862cf6dc5965f6b5b54bc85 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 13 Sep 2013 13:35:31 -0400 Subject: [PATCH] Add version info to OK(HELLO) so both sides know their version info. --- node/Packet.hpp | 4 ++++ node/PacketDecoder.cpp | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/node/Packet.hpp b/node/Packet.hpp index 3ee8fb53c..28b7551d9 100644 --- a/node/Packet.hpp +++ b/node/Packet.hpp @@ -374,6 +374,10 @@ public: * * OK payload: * <[8] timestamp (echoed from original HELLO)> + * <[1] protocol version> + * <[1] software major version> + * <[1] software minor version> + * <[2] software revision> * * ERROR has no payload. */ diff --git a/node/PacketDecoder.cpp b/node/PacketDecoder.cpp index 13937a522..67f70554e 100644 --- a/node/PacketDecoder.cpp +++ b/node/PacketDecoder.cpp @@ -151,11 +151,14 @@ void PacketDecoder::_CBaddPeerFromHello(void *arg,const SharedPtr &p,Topol case Topology::PEER_VERIFY_ACCEPTED_ALREADY_HAVE: case Topology::PEER_VERIFY_ACCEPTED_DISPLACED_INVALID_ADDRESS: { _r->sw->doAnythingWaitingForPeer(p); - Packet outp(req->source,_r->identity.address(),Packet::VERB_OK); outp.append((unsigned char)Packet::VERB_HELLO); outp.append(req->helloPacketId); outp.append(req->helloTimestamp); + outp.append((unsigned char)ZT_PROTO_VERSION); + outp.append((unsigned char)ZEROTIER_ONE_VERSION_MAJOR); + outp.append((unsigned char)ZEROTIER_ONE_VERSION_MINOR); + outp.append((uint16_t)ZEROTIER_ONE_VERSION_REVISION); outp.encrypt(p->cryptKey()); outp.hmacSet(p->macKey()); _r->demarc->send(req->localPort,req->remoteAddress,outp.data(),outp.size(),-1);