From 0e5bbfa21c6e63b7a842ac91471049f132ef8459 Mon Sep 17 00:00:00 2001
From: orignal <romakoshelkin@yandex.ru>
Date: Fri, 31 Jan 2014 13:08:33 -0500
Subject: [PATCH] avoid unnececssary recusion

---
 NetDb.cpp | 30 +++++++++++++++---------------
 NetDb.h   |  1 -
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/NetDb.cpp b/NetDb.cpp
index 5f76a8c1..49c37562 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -63,6 +63,13 @@ namespace data
 	void NetDb::Start ()
 	{
 		Load ("netDb");
+		while (m_RouterInfos.size () < 100 && m_ReseedRetries < 10)
+		{
+			Reseeder reseeder;
+			reseeder.reseedNow();
+			m_ReseedRetries++;
+			Load ("netDb");
+		}	
 		m_Thread = new std::thread (std::bind (&NetDb::Run, this));
 	}
 	
@@ -205,26 +212,21 @@ namespace data
 		}
 		return true;
 	}
-	
+
 	void NetDb::Load (const char * directory)
 	{
-		Load(directory, false);
-	}
-
-	void NetDb::Load (const char * directory, bool reseed)
-	{
-		i2p::data::Reseeder *reseeder = new i2p::data::Reseeder();
 		boost::filesystem::path p (directory);
 		if (!boost::filesystem::exists (p))
 		{
+			// seems netDb doesn't exist yet
 			if (!CreateNetDb(directory)) return;
-			reseeder->reseedNow();
-		}
-		if (reseed)
-		{
-			reseeder->reseedNow();
-			m_ReseedRetries++;
 		}
+		// make sure we cleanup netDb from previous attempts
+		for (auto r: m_RouterInfos)
+			delete r.second;
+		m_RouterInfos.clear ();	
+
+		// load routers now
 		int numRouters = 0;
 		boost::filesystem::directory_iterator end;
 		for (boost::filesystem::directory_iterator it (p); it != end; ++it)
@@ -244,8 +246,6 @@ namespace data
 			}	
 		}
 		LogPrint (numRouters, " routers loaded");
-		if (numRouters < 100 && m_ReseedRetries < 10)
-			Load(directory, true); // Reseed
 	}	
 
 	void NetDb::SaveUpdated (const char * directory)
diff --git a/NetDb.h b/NetDb.h
index 432036dc..3fb6ad10 100644
--- a/NetDb.h
+++ b/NetDb.h
@@ -78,7 +78,6 @@ namespace data
 
 			bool CreateNetDb(const char * directory);
 			void Load (const char * directory);
-			void Load (const char * directory, bool reseed);
 			void SaveUpdated (const char * directory);
 			void Run (); // exploratory thread
 			void Explore ();