diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-13 14:39:45 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-13 14:39:45 -0700 |
| commit | c59c74dddab862ade65938e630dc0f561fcb0c2f (patch) | |
| tree | b5843f27b60d898be02fd2f2cb5607b95718b96a /service/ControlPlane.cpp | |
| parent | abbcb0a12cbab782c1d9879391efb65e9cd92acf (diff) | |
| parent | 845955dea53035e8472059ff03feca9f47c0d5fa (diff) | |
| download | infinitytier-c59c74dddab862ade65938e630dc0f561fcb0c2f.tar.gz infinitytier-c59c74dddab862ade65938e630dc0f561fcb0c2f.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'service/ControlPlane.cpp')
| -rw-r--r-- | service/ControlPlane.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 71b3fd3f..4158ed43 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -454,7 +454,7 @@ unsigned int ControlPlane::handleRequest( } else { #ifdef ZT_ENABLE_NETWORK_CONTROLLER if (_controller) - _controller->handleControlPlaneHttpGET(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); + scode = _controller->handleControlPlaneHttpGET(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); else scode = 404; #else scode = 404; @@ -490,7 +490,7 @@ unsigned int ControlPlane::handleRequest( } else { #ifdef ZT_ENABLE_NETWORK_CONTROLLER if (_controller) - _controller->handleControlPlaneHttpPOST(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); + scode = _controller->handleControlPlaneHttpPOST(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); else scode = 404; #else scode = 404; @@ -525,7 +525,7 @@ unsigned int ControlPlane::handleRequest( } else { #ifdef ZT_ENABLE_NETWORK_CONTROLLER if (_controller) - _controller->handleControlPlaneHttpDELETE(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); + scode = _controller->handleControlPlaneHttpDELETE(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); else scode = 404; #else scode = 404; |