From 430882327e477d419f8b6485361c22e1e2844d32 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Mon, 7 Oct 2013 15:00:38 -0400
Subject: Couple of small fixes, works again with new ID code.

---
 node/Node.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'node/Node.cpp')

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;
-- 
cgit v1.2.3