summaryrefslogtreecommitdiff
path: root/node/NetworkConfig.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2019-03-25 22:19:52 +0000
committerAdam Ierymenko <adam.ierymenko@gmail.com>2019-03-25 22:19:52 +0000
commitd81549a7b1553f399e6effdf17746242b89d9222 (patch)
tree2f86ce9081d037ced0dd44b00b12179c24cba5d8 /node/NetworkConfig.cpp
parentd5ac8512e31af5ec9d02a7047dde50c9907c3c61 (diff)
downloadinfinitytier-d81549a7b1553f399e6effdf17746242b89d9222.tar.gz
infinitytier-d81549a7b1553f399e6effdf17746242b89d9222.zip
Various other fixes including removal of more mem*() issues and netlink fixes for AARCH64.
Diffstat (limited to 'node/NetworkConfig.cpp')
-rw-r--r--node/NetworkConfig.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/node/NetworkConfig.cpp b/node/NetworkConfig.cpp
index 8be72008..20ad2e25 100644
--- a/node/NetworkConfig.cpp
+++ b/node/NetworkConfig.cpp
@@ -200,10 +200,11 @@ bool NetworkConfig::toDictionary(Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d,b
bool NetworkConfig::fromDictionary(const Dictionary<ZT_NETWORKCONFIG_DICT_CAPACITY> &d)
{
+ static const NetworkConfig NIL_NC;
Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY> *tmp = new Buffer<ZT_NETWORKCONFIG_DICT_CAPACITY>();
try {
- *this = NetworkConfig();
+ *this = NIL_NC;
// Fields that are always present, new or old
this->networkId = d.getUI(ZT_NETWORKCONFIG_DICT_KEY_NETWORK_ID,0);