From a187d290f15ed2191e994852a6778bf4aa0f083b Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Sat, 16 May 2015 16:09:28 -0700 Subject: Fixes to control plane, API, eliminate problematic inheritance pattern, and start on a NodeJS class for talking to the network controller. --- controller/SqliteNetworkController.hpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'controller/SqliteNetworkController.hpp') diff --git a/controller/SqliteNetworkController.hpp b/controller/SqliteNetworkController.hpp index b5c83a49..a58741b5 100644 --- a/controller/SqliteNetworkController.hpp +++ b/controller/SqliteNetworkController.hpp @@ -40,17 +40,14 @@ #include "../node/NetworkController.hpp" #include "../node/Mutex.hpp" -#include "../service/ControlPlaneSubsystem.hpp" - namespace ZeroTier { -class SqliteNetworkController : public NetworkController,public ControlPlaneSubsystem +class SqliteNetworkController : public NetworkController { public: SqliteNetworkController(const char *dbPath); virtual ~SqliteNetworkController(); - // NetworkController virtual NetworkController::ResultCode doNetworkConfigRequest( const InetAddress &fromAddr, const Identity &signingId, @@ -60,22 +57,21 @@ public: uint64_t haveRevision, Dictionary &netconf); - // ControlPlaneSubsystem - virtual unsigned int handleControlPlaneHttpGET( + unsigned int handleControlPlaneHttpGET( const std::vector &path, const std::map &urlArgs, const std::map &headers, const std::string &body, std::string &responseBody, std::string &responseContentType); - virtual unsigned int handleControlPlaneHttpPOST( + unsigned int handleControlPlaneHttpPOST( const std::vector &path, const std::map &urlArgs, const std::map &headers, const std::string &body, std::string &responseBody, std::string &responseContentType); - virtual unsigned int handleControlPlaneHttpDELETE( + unsigned int handleControlPlaneHttpDELETE( const std::vector &path, const std::map &urlArgs, const std::map &headers, -- cgit v1.2.3