diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-16 18:55:19 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-16 18:55:19 -0700 |
| commit | 9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60 (patch) | |
| tree | f870c3c5c4f65fc3d7e22b3b37fb96ad6eb821f9 /service/ControlPlane.hpp | |
| parent | d0935f667fd809a32cb4184a2c422ff79dc6d933 (diff) | |
| parent | 69ceb7e730a1fe4e2d0f82c7d29875bd796468ea (diff) | |
| download | infinitytier-9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60.tar.gz infinitytier-9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'service/ControlPlane.hpp')
| -rw-r--r-- | service/ControlPlane.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/service/ControlPlane.hpp b/service/ControlPlane.hpp index b7b0a857..fc8a0182 100644 --- a/service/ControlPlane.hpp +++ b/service/ControlPlane.hpp @@ -40,7 +40,7 @@ namespace ZeroTier { class OneService; class Node; -class ControlPlaneSubsystem; +class SqliteNetworkController; struct InetAddress; /** @@ -72,7 +72,7 @@ public: * @param prefix First element in URI path * @param subsys Object to call for results of GET and POST/PUT operations */ - inline void mount(const char *prefix,ControlPlaneSubsystem *subsys) + inline void mount(const char *prefix,SqliteNetworkController *subsys) { Mutex::Lock _l(_lock); _subsystems[std::string(prefix)] = subsys; @@ -104,7 +104,7 @@ private: Node *const _node; std::string _uiStaticPath; std::set<std::string> _authTokens; - std::map<std::string,ControlPlaneSubsystem *> _subsystems; + std::map<std::string,SqliteNetworkController *> _subsystems; Mutex _lock; }; |