From 347e98dcd2d29772d5b9cf23c307b0a6ce0d8858 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 14 Apr 2015 15:32:05 -0700 Subject: Just return files from listDirectory() since that is all we need, fix network request on network restore logic, and remember saved networks in service/One --- service/One.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'service') diff --git a/service/One.cpp b/service/One.cpp index 5e81bc61..c4e1b251 100644 --- a/service/One.cpp +++ b/service/One.cpp @@ -191,6 +191,15 @@ public: _controlPlane = new ControlPlane(_node); + { + std::vector networksDotD(OSUtils::listDirectory((_homePath + ZT_PATH_SEPARATOR_S + "networks.d").c_str())); + for(std::vector::iterator f(networksDotD.begin());f!=networksDotD.end();++f) { + std::size_t dot = f->find_last_of('.'); + if ((dot == 16)&&(f->substr(16) == ".conf")) + _node->join(Utils::hexStrToU64(f->substr(0,dot).c_str())); + } + } + _nextBackgroundTaskDeadline = 0; for(;;) { _run_m.lock(); -- cgit v1.2.3