summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-04-14 15:32:05 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-04-14 15:32:05 -0700
commit347e98dcd2d29772d5b9cf23c307b0a6ce0d8858 (patch)
tree7c03cc6541b5b9d65ab3903a47d971d660f871dd /node
parent29a2175b7a7055ab851f5b921e26c51ffa547d07 (diff)
downloadinfinitytier-347e98dcd2d29772d5b9cf23c307b0a6ce0d8858.tar.gz
infinitytier-347e98dcd2d29772d5b9cf23c307b0a6ce0d8858.zip
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
Diffstat (limited to 'node')
-rw-r--r--node/Network.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/node/Network.cpp b/node/Network.cpp
index 2a071f6f..0575f48c 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -67,6 +67,7 @@ Network::Network(const RuntimeEnvironment *renv,uint64_t nwid) :
std::string conf(RR->node->dataStoreGet(confn));
if (conf.length()) {
setConfiguration(Dictionary(conf),false);
+ _lastConfigUpdate = 0; // we still want to re-request a new config from the network
gotConf = true;
}
} catch ( ... ) {} // ignore invalids, we'll re-request