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 /service | |
| parent | 8ebcd44405841dc0b7529336cdc5207bda876633 (diff) | |
| parent | ccdd4ffda70a35219fae1cdce1306f3d4ebd8dc9 (diff) | |
| download | infinitytier-1be55d61820344f08f06e2ba79cee2d876601267.tar.gz infinitytier-1be55d61820344f08f06e2ba79cee2d876601267.zip | |
Merge branch 'dev' into systemtray
Diffstat (limited to 'service')
| -rw-r--r-- | service/ControlPlane.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 150bba1b..07304fc9 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -266,7 +266,7 @@ unsigned int ControlPlane::handleRequest( { char json[8194]; unsigned int scode = 404; - std::vector<std::string> ps(Utils::split(path.c_str(),"/","","")); + std::vector<std::string> ps(OSUtils::split(path.c_str(),"/","","")); std::map<std::string,std::string> urlArgs; Mutex::Lock _l(_lock); @@ -279,7 +279,7 @@ unsigned int ControlPlane::handleRequest( if (qpos != std::string::npos) { std::string args(ps[ps.size() - 1].substr(qpos + 1)); ps[ps.size() - 1] = ps[ps.size() - 1].substr(0,qpos); - std::vector<std::string> asplit(Utils::split(args.c_str(),"&","","")); + std::vector<std::string> asplit(OSUtils::split(args.c_str(),"&","","")); for(std::vector<std::string>::iterator a(asplit.begin());a!=asplit.end();++a) { std::size_t eqpos = a->find('='); if (eqpos == std::string::npos) |