diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2016-11-21 12:59:43 -0800 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2016-11-21 12:59:43 -0800 |
| commit | 1be55d61820344f08f06e2ba79cee2d876601267 (patch) | |
| tree | 96fef6aa92989ba51b133eee65126ff54d2fdd40 /controller/EmbeddedNetworkController.cpp | |
| parent | 8ebcd44405841dc0b7529336cdc5207bda876633 (diff) | |
| parent | ccdd4ffda70a35219fae1cdce1306f3d4ebd8dc9 (diff) | |
| download | infinitytier-1be55d61820344f08f06e2ba79cee2d876601267.tar.gz infinitytier-1be55d61820344f08f06e2ba79cee2d876601267.zip | |
Merge branch 'dev' into systemtray
Diffstat (limited to 'controller/EmbeddedNetworkController.cpp')
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index 74937dd8..974936e4 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -889,7 +889,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST( json &v6m = b["v6AssignMode"]; if (!nv6m.is_object()) nv6m = json::object(); if (v6m.is_string()) { // backward compatibility - std::vector<std::string> v6ms(Utils::split(_jS(v6m,"").c_str(),",","","")); + std::vector<std::string> v6ms(OSUtils::split(_jS(v6m,"").c_str(),",","","")); std::sort(v6ms.begin(),v6ms.end()); v6ms.erase(std::unique(v6ms.begin(),v6ms.end()),v6ms.end()); nv6m["rfc4193"] = false; |