diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-04-26 17:20:31 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-04-26 17:20:31 -0700 |
| commit | 59eb09d06318c8378193dfd40fc37bc308ee9044 (patch) | |
| tree | 5430b57af2b6da25017f9056823a2219086cfadb /node/Network.cpp | |
| parent | b9dba97fdb8644e3c427b079d81ed9db3697bf1b (diff) | |
| download | infinitytier-59eb09d06318c8378193dfd40fc37bc308ee9044.tar.gz infinitytier-59eb09d06318c8378193dfd40fc37bc308ee9044.zip | |
Deserialize new style netconf.
Diffstat (limited to 'node/Network.cpp')
| -rw-r--r-- | node/Network.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |