dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

We now always build the controller in ZeroTier One, at least for desktop and server targets. Also means that ZeroTier One now requires C++11. (Still keeping C++11 out of the core in node/ though.)

Browse source
This commit is contained in:
Adam Ierymenko 2016-08-17 10:42:32 -07:00
parent cc808cc2dd
commit a13f4d8353
10 changed files with 24 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

10
service/ControlPlane.hpp
View file

@ -31,7 +31,7 @@ namespace ZeroTier {
class OneService;
class Node;
class SqliteNetworkController;
class EmbeddedNetworkController;
struct InetAddress;
/**
@ -43,18 +43,16 @@ public:
ControlPlane(OneService *svc,Node *n,const char *uiStaticPath);
~ControlPlane();
#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,9 +87,7 @@ public:
private:
OneService *const _svc;
Node *const _node;
#ifdef ZT_ENABLE_NETWORK_CONTROLLER
SqliteNetworkController *_controller;
#endif
EmbeddedNetworkController *_controller;
std::string _uiStaticPath;
std::set<std::string> _authTokens;
Mutex _lock;