diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-07-23 09:29:08 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-07-23 09:29:08 -0700 |
| commit | d4d350a2850aaf78b9abc443e41eaa75e626045d (patch) | |
| tree | d43e6a2f73a3f4c48834cc7d11d23bf7929560df /controller/EmbeddedNetworkController.cpp | |
| parent | 5edd04638d0bea58a619969cbb19bac2abb3f98e (diff) | |
| download | infinitytier-d4d350a2850aaf78b9abc443e41eaa75e626045d.tar.gz infinitytier-d4d350a2850aaf78b9abc443e41eaa75e626045d.zip | |
Work in progress
Diffstat (limited to 'controller/EmbeddedNetworkController.cpp')
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index 007a4112..3ebdccf9 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -501,12 +501,12 @@ void EmbeddedNetworkController::init(const Identity &signingId,Sender *sender) #endif std::string lfJSON; - OSUtils::readFile((_path + ZT_PATH_SEPARATOR_S "local.conf").c_str(),lfJSON); + OSUtils::readFile((_path + ZT_PATH_SEPARATOR_S ".." ZT_PATH_SEPARATOR_S "local.conf").c_str(),lfJSON); if (lfJSON.length() > 0) { nlohmann::json lfConfig(OSUtils::jsonParse(lfJSON)); nlohmann::json &settings = lfConfig["settings"]; if (settings.is_object()) { - nlohmann::json &controllerDb = lfConfig["controllerDb"]; + nlohmann::json &controllerDb = settings["controllerDb"]; if (controllerDb.is_object()) { std::string type = controllerDb["type"]; if (type == "lf") { |