gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated ZTO version

Browse Source
This commit is contained in:
Joseph Henry
2017-03-07 11:08:02 -08:00
parent ce42dd4815
commit 9016bc8385
132 changed files with 11902 additions and 10793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zerotierone/service/ControlPlane.hpp
View File

@@ -31,7 +31,7 @@ namespace ZeroTier {
class OneService;
class Node;
class SqliteNetworkController;
class EmbeddedNetworkController;
struct InetAddress;
/**
@@ -40,21 +40,18 @@ struct InetAddress;
class ControlPlane
{
public:
ControlPlane(OneService *svc,Node *n,const char *uiStaticPath);
~ControlPlane();
ControlPlane(OneService *svc,Node *n);
#ifdef ZT_ENABLE_NETWORK_CONTROLLER
/**
* Set controller, which will be available under /controller
*
* @param c Network controller instance
*/
inline void setController(SqliteNetworkController *c)
inline void setController(EmbeddedNetworkController *c)
{
Mutex::Lock _l(_lock);
_controller = c;
}
#endif
/**
* Add an authentication token for API access
@@ -89,10 +86,7 @@ public:
private:
OneService *const _svc;
Node *const _node;
#ifdef ZT_ENABLE_NETWORK_CONTROLLER
SqliteNetworkController *_controller;
#endif
std::string _uiStaticPath;
EmbeddedNetworkController *_controller;
std::set<std::string> _authTokens;
Mutex _lock;
};