diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-06 17:37:11 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-06 17:37:11 -0700 |
| commit | 20b76d266d0a0b425259fa57027e97121fd06c81 (patch) | |
| tree | 6fbce656785553065271173f56f438d06002219c /service/OneService.cpp | |
| parent | bdc5b3d3a509306b2da3548b4d4ac573eb393c61 (diff) | |
| parent | b2b32e5969c91e05b0d54feaf64045321f70517b (diff) | |
| download | infinitytier-20b76d266d0a0b425259fa57027e97121fd06c81.tar.gz infinitytier-20b76d266d0a0b425259fa57027e97121fd06c81.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 421b47dd..56b1d979 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -226,7 +226,7 @@ public: if (_master) _node->setNetconfMaster((void *)_master); - _controlPlane = new ControlPlane(this,_node); + _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)); |
