summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2013-09-19 14:40:46 -0400
committerAdam Ierymenko <adam.ierymenko@gmail.com>2013-09-19 14:40:46 -0400
commitd8d71df30164d13cd325b566292683f7da8cca7f (patch)
tree9eecb96a2d11c27e8303e81f3bc619bba01335e4
parentaac40562d39c44295cb2fa6398162f7c91d09289 (diff)
downloadinfinitytier-d8d71df30164d13cd325b566292683f7da8cca7f.tar.gz
infinitytier-d8d71df30164d13cd325b566292683f7da8cca7f.zip
Build fix for network ID remap hack.
-rw-r--r--node/NodeConfig.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/node/NodeConfig.cpp b/node/NodeConfig.cpp
index 4462d0e2..12509e9f 100644
--- a/node/NodeConfig.cpp
+++ b/node/NodeConfig.cpp
@@ -73,7 +73,8 @@ NodeConfig::NodeConfig(const RuntimeEnvironment *renv,const char *authToken,unsi
memcpy(_controlSocketKey,csk,32);
}
- std::map<std::string,bool> networksDotD(Utils::listDirectory((_r->homePath + ZT_PATH_SEPARATOR_S + "networks.d").c_str()));
+ std::string networksFolder(_r->homePath + ZT_PATH_SEPARATOR_S + "networks.d");
+ std::map<std::string,bool> networksDotD(Utils::listDirectory(networksFolder.c_str()));
std::set<uint64_t> nwids;
for(std::map<std::string,bool>::iterator d(networksDotD.begin());d!=networksDotD.end();++d) {
if (!d->second) {
@@ -86,7 +87,7 @@ NodeConfig::NodeConfig(const RuntimeEnvironment *renv,const char *authToken,unsi
// config file. New one will be created.
if (nwid == 0x6c92786fee000001ULL) {
nwid = 0xbc8f9a8ee3000001ULL;
- Utils::rm(networksDotD + ZT_PATH_SEPARATOR_S + d->first);
+ Utils::rm((networksFolder + ZT_PATH_SEPARATOR_S + d->first).c_str());
}
if (nwid > 0)