From 59eb09d06318c8378193dfd40fc37bc308ee9044 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Tue, 26 Apr 2016 17:20:31 -0700
Subject: Deserialize new style netconf.

---
 node/Network.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'node/Network.cpp')

diff --git a/node/Network.cpp b/node/Network.cpp
index f2c14db3..e7b99661 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -186,8 +186,8 @@ int Network::setConfiguration(const void *confBytes,unsigned int confLen,bool sa
 
 		NetworkConfig newConfig;
 		if (reinterpret_cast<const uint8_t *>(confBytes)[0] == ZT_NETWORKCONFIG_V2_MARKER_BYTE) {
-			// TODO: deserialize new binary format netconf
-			return 0;
+			Buffer<8194> tmp(confBytes,confLen);
+			newConfig.deserialize(tmp,0);
 		} else {
 #ifdef ZT_SUPPORT_OLD_STYLE_NETCONF
 			newConfig.fromDictionary(reinterpret_cast<const char *>(confBytes),confLen); // throws if invalid
-- 
cgit v1.2.3