summaryrefslogtreecommitdiff
path: root/node/Node.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2013-10-07 15:00:38 -0400
committerAdam Ierymenko <adam.ierymenko@gmail.com>2013-10-07 15:00:38 -0400
commit430882327e477d419f8b6485361c22e1e2844d32 (patch)
tree69d10f06c96a6c5d5938c9c9a53bff66bec095a4 /node/Node.cpp
parent2fa2796f2abbf48e1f8c6b10a7a0fd99e6985862 (diff)
downloadinfinitytier-430882327e477d419f8b6485361c22e1e2844d32.tar.gz
infinitytier-430882327e477d419f8b6485361c22e1e2844d32.zip
Couple of small fixes, works again with new ID code.
Diffstat (limited to 'node/Node.cpp')
-rw-r--r--node/Node.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/node/Node.cpp b/node/Node.cpp
index 740bc89e..1efbf7b5 100644
--- a/node/Node.cpp
+++ b/node/Node.cpp
@@ -323,6 +323,8 @@ Node::ReasonForTermination Node::run()
std::string idser;
if (Utils::readFile(identitySecretPath.c_str(),idser))
gotId = _r->identity.fromString(idser);
+ if ((gotId)&&(!_r->identity.locallyValidate()))
+ gotId = false;
if (gotId) {
// Make sure identity.public matches identity.secret
idser = std::string();
@@ -419,7 +421,7 @@ Node::ReasonForTermination Node::run()
// Core I/O loop
try {
- uint64_t lastNetworkAutoconfCheck = 0;
+ uint64_t lastNetworkAutoconfCheck = Utils::now() - 5000; // check autoconf again after 5s for startup
uint64_t lastPingCheck = 0;
uint64_t lastClean = Utils::now(); // don't need to do this immediately
uint64_t lastNetworkFingerprintCheck = 0;