request RouterInfo if outdated

PurpleI2P · Apr 6, 2014 · 1862896 · 1862896
1 parent 8d3fcff
commit 1862896
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/NetDb.cpp b/NetDb.cpp
@@ -442,9 +442,11 @@ namespace data
 
 					if (dest->IsExploratory ())
 					{	
-						if (!FindRouter (router)) // router with ident not found
+						auto r = FindRouter (router); 
+						if (!r || i2p::util::GetMillisecondsSinceEpoch () > r->GetTimestamp () + 3600*1000LL) 
 						{	
-							LogPrint ("Found new router. Requesting RouterInfo ...");
+							// router with ident not found or too old (1 hour)
+							LogPrint ("Found new/outdated router. Requesting RouterInfo ...");
 							if (outbound && inbound)
 							{
 								RequestedDestination * d1 = CreateRequestedDestination (router, false, false);

diff --git a/Transports.cpp b/Transports.cpp
@@ -239,7 +239,7 @@ namespace i2p
 					// existing session not found. create new 
 					// try NTCP first
 					auto address = r->GetNTCPAddress ();
-					if (address && !r->IsUnreachable ())
+					if (address && !r->UsesIntroducer () && !r->IsUnreachable ())
 					{	
 						auto s = new i2p::ntcp::NTCPClient (m_Service, address->host, address->port, *r);
 						AddNTCPSession (s);