summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-06-13 09:37:00 +0200
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-06-13 09:37:00 +0200
commit1b122cddbd4dc46083e643a06a9cc258278bf64f (patch)
tree4d3b0522dc56d68dd340887b9f1b7dd6d027cd5b
parent494681a48266f84c2f5518b1df357a89ae51c98a (diff)
parent42390e662bb48813df03868949a45ae26c55790c (diff)
downloadinfinitytier-1b122cddbd4dc46083e643a06a9cc258278bf64f.tar.gz
infinitytier-1b122cddbd4dc46083e643a06a9cc258278bf64f.zip
Merge pull request #179 from keesbos/bugfix
Pickup return code from handleControlPlaneHttpGET and handleControlPlaneHttpPOST
-rw-r--r--service/ControlPlane.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp
index 3ff9b7a2..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;