summaryrefslogtreecommitdiff
path: root/controller/EmbeddedNetworkController.hpp
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2017-02-21 17:55:07 -0800
committerJoseph Henry <josephjah@gmail.com>2017-02-21 17:55:07 -0800
commitf3ca08b0f1dc428de49687f9d0889ecf8ff436c5 (patch)
tree27b28e29bd9dd99ad802366041d26bd229f66738 /controller/EmbeddedNetworkController.hpp
parent946e413997560d1bb714e6f7099429b18f9fecee (diff)
parentb475bf4a2129239a1143efb41d8ee3fa5e9037fa (diff)
downloadinfinitytier-f3ca08b0f1dc428de49687f9d0889ecf8ff436c5.tar.gz
infinitytier-f3ca08b0f1dc428de49687f9d0889ecf8ff436c5.zip
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'controller/EmbeddedNetworkController.hpp')
-rw-r--r--controller/EmbeddedNetworkController.hpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp
index bd3a6666..3e39eaf5 100644
--- a/controller/EmbeddedNetworkController.hpp
+++ b/controller/EmbeddedNetworkController.hpp
@@ -165,6 +165,7 @@ private:
if (!network.count("v6AssignMode")) network["v6AssignMode"] = {{"rfc4193",false},{"zt",false},{"6plane",false}};
if (!network.count("authTokens")) network["authTokens"] = nlohmann::json::array();
if (!network.count("capabilities")) network["capabilities"] = nlohmann::json::array();
+ if (!network.count("tags")) network["tags"] = nlohmann::json::array();
if (!network.count("routes")) network["routes"] = nlohmann::json::array();
if (!network.count("ipAssignmentPools")) network["ipAssignmentPools"] = nlohmann::json::array();
if (!network.count("rules")) {