Parcourir la source

Build fix on OSX -- cannot call SqliteNetworkController if not compiled in.

Adam Ierymenko il y a 10 ans
Parent
commit
e0090e56f4
1 fichiers modifiés avec 12 ajouts et 0 suppressions
  1. 12 0
      service/ControlPlane.cpp

+ 12 - 0
service/ControlPlane.cpp

@@ -445,10 +445,14 @@ unsigned int ControlPlane::handleRequest(
 				responseContentType = "text/plain";
 				responseContentType = "text/plain";
 				scode = 200;
 				scode = 200;
 			} else {
 			} else {
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
 				std::map<std::string,SqliteNetworkController *>::const_iterator ss(_subsystems.find(ps[0]));
 				std::map<std::string,SqliteNetworkController *>::const_iterator ss(_subsystems.find(ps[0]));
 				if (ss != _subsystems.end())
 				if (ss != _subsystems.end())
 					scode = ss->second->handleControlPlaneHttpGET(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType);
 					scode = ss->second->handleControlPlaneHttpGET(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType);
 				else scode = 404;
 				else scode = 404;
+#else
+				scode = 404;
+#endif
 			}
 			}
 
 
 		} else scode = 401; // isAuth == false
 		} else scode = 401; // isAuth == false
@@ -478,10 +482,14 @@ unsigned int ControlPlane::handleRequest(
 					} else scode = 500;
 					} else scode = 500;
 				}
 				}
 			} else {
 			} else {
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
 				std::map<std::string,SqliteNetworkController *>::const_iterator ss(_subsystems.find(ps[0]));
 				std::map<std::string,SqliteNetworkController *>::const_iterator ss(_subsystems.find(ps[0]));
 				if (ss != _subsystems.end())
 				if (ss != _subsystems.end())
 					scode = ss->second->handleControlPlaneHttpPOST(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType);
 					scode = ss->second->handleControlPlaneHttpPOST(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType);
 				else scode = 404;
 				else scode = 404;
+#else
+				scode = 404;
+#endif
 			}
 			}
 
 
 		} else scode = 401; // isAuth == false
 		} else scode = 401; // isAuth == false
@@ -510,10 +518,14 @@ unsigned int ControlPlane::handleRequest(
 					_node->freeQueryResult((void *)nws);
 					_node->freeQueryResult((void *)nws);
 				} else scode = 500;
 				} else scode = 500;
 			} else {
 			} else {
+#ifdef ZT_ENABLE_NETWORK_CONTROLLER
 				std::map<std::string,SqliteNetworkController *>::const_iterator ss(_subsystems.find(ps[0]));
 				std::map<std::string,SqliteNetworkController *>::const_iterator ss(_subsystems.find(ps[0]));
 				if (ss != _subsystems.end())
 				if (ss != _subsystems.end())
 					scode = ss->second->handleControlPlaneHttpDELETE(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType);
 					scode = ss->second->handleControlPlaneHttpDELETE(std::vector<std::string>(ps.begin()+1,ps.end()),urlArgs,headers,body,responseBody,responseContentType);
 				else scode = 404;
 				else scode = 404;
+#else
+				scode = 404;
+#endif
 			}
 			}
 
 
 		} else {
 		} else {