summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-04-15 18:36:32 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-04-15 18:36:32 -0700
commit33c8d3c50b1645cad8f36c4f9116fa6fb00ff329 (patch)
tree45f349850852b2b6540eb6beab589703899de550 /service
parentea1859541c29bc3cafcde5ad9be131c942522c5f (diff)
downloadinfinitytier-33c8d3c50b1645cad8f36c4f9116fa6fb00ff329.tar.gz
infinitytier-33c8d3c50b1645cad8f36c4f9116fa6fb00ff329.zip
Compile fixes.
Diffstat (limited to 'service')
-rw-r--r--service/OneService.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 38f6e116..f84af0ae 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -129,7 +129,7 @@ struct HttpConnection
class OneServiceImpl : public OneService
{
public:
- OneServiceImpl(const char *hp,unsigned int port,NetworkConfigMaster *master,const char *overrideRootTopology) :
+ OneServiceImpl(const char *hp,unsigned int port,NetworkController *master,const char *overrideRootTopology) :
_homePath((hp) ? hp : "."),
_phy(this,true),
_master(master),
@@ -613,7 +613,7 @@ private:
const std::string _homePath;
Phy<OneServiceImpl *> _phy;
- NetworkConfigMaster *_master;
+ NetworkController *_master;
std::string _overrideRootTopology;
Node *_node;
PhySocket *_v4UdpSocket;
@@ -772,7 +772,7 @@ std::string OneService::platformDefaultHomePath()
#endif // __UNIX_LIKE__ or not...
}
-OneService *OneService::newInstance(const char *hp,unsigned int port,NetworkConfigMaster *master,const char *overrideRootTopology) { return new OneServiceImpl(hp,port,master,overrideRootTopology); }
+OneService *OneService::newInstance(const char *hp,unsigned int port,NetworkController *master,const char *overrideRootTopology) { return new OneServiceImpl(hp,port,master,overrideRootTopology); }
OneService::~OneService() {}
} // namespace ZeroTier