summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-04-24 12:29:31 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-04-24 12:29:31 -0700
commit883a216d2a5f3d3cbddd230796d15da0af9bfab7 (patch)
tree302c8e5bacb9d3c9a37f4869b40657ccb6248002 /service
parent5202fbdaf313096a7205e7bb9c14c11fc628b8f2 (diff)
downloadinfinitytier-883a216d2a5f3d3cbddd230796d15da0af9bfab7.tar.gz
infinitytier-883a216d2a5f3d3cbddd230796d15da0af9bfab7.zip
Build fixes.
Diffstat (limited to 'service')
-rw-r--r--service/ControlPlane.cpp6
-rw-r--r--service/ControlPlane.hpp1
-rw-r--r--service/OneService.cpp2
3 files changed, 5 insertions, 4 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp
index b075e706..e40aad9b 100644
--- a/service/ControlPlane.cpp
+++ b/service/ControlPlane.cpp
@@ -26,6 +26,7 @@
*/
#include "ControlPlane.hpp"
+#include "ControlPlaneSubsystem.hpp"
#include "OneService.hpp"
#include "../version.h"
@@ -241,10 +242,9 @@ static void _jsonAppend(unsigned int depth,std::string &buf,const ZT1_Peer *peer
buf.append(json);
}
-ControlPlane::ControlPlane(OneService *svc,Node *n,SqliteNetworkController *nc) :
+ControlPlane::ControlPlane(OneService *svc,Node *n) :
_svc(svc),
- _node(n),
- _controller(nc)
+ _node(n)
{
}
diff --git a/service/ControlPlane.hpp b/service/ControlPlane.hpp
index 7e0d7dc3..3db1ddd0 100644
--- a/service/ControlPlane.hpp
+++ b/service/ControlPlane.hpp
@@ -40,6 +40,7 @@ namespace ZeroTier {
class OneService;
class Node;
+class ControlPlaneSubsystem;
struct InetAddress;
/**
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 551dc486..2c67dbf1 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -214,7 +214,7 @@ public:
_controlPlane = new ControlPlane(this,_node);
_controlPlane->addAuthToken(authToken.c_str());
if (_master)
- _controlPlane->mount("controller",_master);
+ _controlPlane->mount("controller",reinterpret_cast<ControlPlaneSubsystem *>(_master));
{ // Remember networks from previous session
std::vector<std::string> networksDotD(OSUtils::listDirectory((_homePath + ZT_PATH_SEPARATOR_S + "networks.d").c_str()));