From 59eb09d06318c8378193dfd40fc37bc308ee9044 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 26 Apr 2016 17:20:31 -0700 Subject: Deserialize new style netconf. --- node/NetworkConfig.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'node/NetworkConfig.hpp') diff --git a/node/NetworkConfig.hpp b/node/NetworkConfig.hpp index 6e91cb9d..73f1e3f2 100644 --- a/node/NetworkConfig.hpp +++ b/node/NetworkConfig.hpp @@ -529,6 +529,8 @@ public: } } + _com.serialize(b); + b.append((uint16_t)0); // extended bytes, currently 0 since unused } @@ -540,7 +542,7 @@ public: unsigned int p = startAt; if (b[p++] != ZT_NETWORKCONFIG_V2_MARKER_BYTE) - throw std::invalid_argument("use fromDictionary() for old style netconf deserialization"); + throw std::invalid_argument("unrecognized format"); if (b.template at(p) != 0) throw std::invalid_argument("unrecognized version"); p += 2; @@ -660,6 +662,8 @@ public: p += rlen; } + p += _com.deserialize(b,p); + p += b.template at(p) + 2; return (p - startAt); -- cgit v1.2.3