diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-05-16 16:09:28 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-05-16 16:09:28 -0700 |
| commit | a187d290f15ed2191e994852a6778bf4aa0f083b (patch) | |
| tree | c33f5c43b6b5dec857a5b8670ed570ea56d96b74 /controller/SqliteNetworkController.hpp | |
| parent | 27c5f04d68003774b9a85eb7047c683cbb64f0df (diff) | |
| download | infinitytier-a187d290f15ed2191e994852a6778bf4aa0f083b.tar.gz infinitytier-a187d290f15ed2191e994852a6778bf4aa0f083b.zip | |
Fixes to control plane, API, eliminate problematic inheritance pattern, and start on a NodeJS class for talking to the network controller.
Diffstat (limited to 'controller/SqliteNetworkController.hpp')
| -rw-r--r-- | controller/SqliteNetworkController.hpp | 12 |
1 files changed, 4 insertions, 8 deletions
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<std::string> &path, const std::map<std::string,std::string> &urlArgs, const std::map<std::string,std::string> &headers, const std::string &body, std::string &responseBody, std::string &responseContentType); - virtual unsigned int handleControlPlaneHttpPOST( + unsigned int handleControlPlaneHttpPOST( const std::vector<std::string> &path, const std::map<std::string,std::string> &urlArgs, const std::map<std::string,std::string> &headers, const std::string &body, std::string &responseBody, std::string &responseContentType); - virtual unsigned int handleControlPlaneHttpDELETE( + unsigned int handleControlPlaneHttpDELETE( const std::vector<std::string> &path, const std::map<std::string,std::string> &urlArgs, const std::map<std::string,std::string> &headers, |