diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-04-22 18:14:14 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-04-22 18:14:14 -0700 |
| commit | b33e4af49fb53c7d901e575886feaf6b5c9e7e20 (patch) | |
| tree | 27e9a4150504ec4a4dfddb6e197a738f52c20aa7 /service/OneService.cpp | |
| parent | 0c8051da153b445f756681f9fd7d46bc85d1517f (diff) | |
| parent | 5202fbdaf313096a7205e7bb9c14c11fc628b8f2 (diff) | |
| download | infinitytier-b33e4af49fb53c7d901e575886feaf6b5c9e7e20.tar.gz infinitytier-b33e4af49fb53c7d901e575886feaf6b5c9e7e20.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'service/OneService.cpp')
| -rw-r--r-- | service/OneService.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 5b0199ac..551dc486 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -213,6 +213,8 @@ public: _controlPlane = new ControlPlane(this,_node); _controlPlane->addAuthToken(authToken.c_str()); + if (_master) + _controlPlane->mount("controller",_master); { // Remember networks from previous session std::vector<std::string> networksDotD(OSUtils::listDirectory((_homePath + ZT_PATH_SEPARATOR_S + "networks.d").c_str())); |