void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bug preventing default from being set to null if already set to an integer.

Browse source
This commit is contained in:
Adam Ierymenko 2017-03-29 12:32:59 -07:00
parent 3f4f7145a3
commit 57b5a33fbb
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
controller/EmbeddedNetworkController.cpp
View file

@ -1018,9 +1018,10 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
json ntag = json::object(); json ntag = json::object();
const uint64_t tagId = OSUtils::jsonInt(tag["id"],0ULL); const uint64_t tagId = OSUtils::jsonInt(tag["id"],0ULL);
ntag["id"] = tagId; ntag["id"] = tagId;
if (tag.find("default") == tag.end()) json &dfl = tag["default"];
ntag["default"] = json(); if (dfl.is_null())
else ntag["default"] = OSUtils::jsonInt(tag["default"],0ULL); ntag["default"] = dfl;
else ntag["default"] = OSUtils::jsonInt(dfl,0ULL);
ntags[tagId] = ntag; ntags[tagId] = ntag;
} }
} }