diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-12-05 14:51:06 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-12-05 14:51:06 -0800 |
| commit | 520b0601db9e6a45b9f4301303515a17815a5635 (patch) | |
| tree | dc760225e9e566b4f0e510f9efa6e69a8505df79 /controller/EmbeddedNetworkController.hpp | |
| parent | 926ecf964047f7ab23ee2c086d826688c5228c96 (diff) | |
| parent | c57198decd63564cceee677c21b49dccdf2df56e (diff) | |
| download | infinitytier-520b0601db9e6a45b9f4301303515a17815a5635.tar.gz infinitytier-520b0601db9e6a45b9f4301303515a17815a5635.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'controller/EmbeddedNetworkController.hpp')
| -rw-r--r-- | controller/EmbeddedNetworkController.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/controller/EmbeddedNetworkController.hpp b/controller/EmbeddedNetworkController.hpp index b04a44c9..31b5b2b5 100644 --- a/controller/EmbeddedNetworkController.hpp +++ b/controller/EmbeddedNetworkController.hpp @@ -125,6 +125,7 @@ private: if (!member.count("vRev")) member["vRev"] = -1; if (!member.count("vProto")) member["vProto"] = -1; if (!member.count("remoteTraceTarget")) member["remoteTraceTarget"] = nlohmann::json(); + if (!member.count("removeTraceLevel")) member["remoteTraceLevel"] = 0; member["objtype"] = "member"; } inline void _initNetwork(nlohmann::json &network) @@ -143,6 +144,7 @@ private: if (!network.count("ipAssignmentPools")) network["ipAssignmentPools"] = nlohmann::json::array(); if (!network.count("mtu")) network["mtu"] = ZT_DEFAULT_MTU; if (!network.count("remoteTraceTarget")) network["remoteTraceTarget"] = nlohmann::json(); + if (!network.count("removeTraceLevel")) network["remoteTraceLevel"] = 0; if (!network.count("rules")) { // If unspecified, rules are set to allow anything and behave like a flat L2 segment network["rules"] = {{ |