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/OneService.cpp | |
| 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/OneService.cpp')
| -rw-r--r-- | service/OneService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 99aaf77d..13108aa1 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -233,7 +233,7 @@ public: _controlPlane = new ControlPlane(this,_node,(_homePath + ZT_PATH_SEPARATOR_S + "ui").c_str()); _controlPlane->addAuthToken(authToken.c_str()); if (_master) - _controlPlane->mount("controller",reinterpret_cast<ControlPlaneSubsystem *>(_master)); + _controlPlane->mount("controller",reinterpret_cast<SqliteNetworkController *>(_master)); { // Remember networks from previous session std::vector<std::string> networksDotD(OSUtils::listDirectory((_homePath + ZT_PATH_SEPARATOR_S + "networks.d").c_str())); |