From e0090e56f4b9ed70687c16ef3629a1ec6f8d2bbb Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Sat, 16 May 2015 18:59:11 -0700 Subject: [PATCH] Build fix on OSX -- cannot call SqliteNetworkController if not compiled in. --- service/ControlPlane.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 1d9f9b4a4..1047067ea 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -445,10 +445,14 @@ unsigned int ControlPlane::handleRequest( responseContentType = "text/plain"; scode = 200; } else { +#ifdef ZT_ENABLE_NETWORK_CONTROLLER std::map::const_iterator ss(_subsystems.find(ps[0])); if (ss != _subsystems.end()) scode = ss->second->handleControlPlaneHttpGET(std::vector(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); else scode = 404; +#else + scode = 404; +#endif } } else scode = 401; // isAuth == false @@ -478,10 +482,14 @@ unsigned int ControlPlane::handleRequest( } else scode = 500; } } else { +#ifdef ZT_ENABLE_NETWORK_CONTROLLER std::map::const_iterator ss(_subsystems.find(ps[0])); if (ss != _subsystems.end()) scode = ss->second->handleControlPlaneHttpPOST(std::vector(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); else scode = 404; +#else + scode = 404; +#endif } } else scode = 401; // isAuth == false @@ -510,10 +518,14 @@ unsigned int ControlPlane::handleRequest( _node->freeQueryResult((void *)nws); } else scode = 500; } else { +#ifdef ZT_ENABLE_NETWORK_CONTROLLER std::map::const_iterator ss(_subsystems.find(ps[0])); if (ss != _subsystems.end()) scode = ss->second->handleControlPlaneHttpDELETE(std::vector(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType); else scode = 404; +#else + scode = 404; +#endif } } else {