From ecfdc377ec8b1ad2ff5bf7f5a3c6989ad3af2c09 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Wed, 2 Mar 2016 19:46:32 -0500
Subject: [PATCH] send close floodfills only in DatabaseSearchReply

---
 NetDb.cpp | 11 +++++++----
 NetDb.h   |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/NetDb.cpp b/NetDb.cpp
index 501852bb..eb1380de 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -677,7 +677,7 @@ namespace data
 					excludedRouters.insert (excluded);
 					excluded += 32;
 				}
-				replyMsg = CreateDatabaseSearchReply (ident, GetClosestFloodfills (ident, 3, excludedRouters));
+				replyMsg = CreateDatabaseSearchReply (ident, GetClosestFloodfills (ident, 3, excludedRouters, true));
 			}
 		}
 		
@@ -884,7 +884,7 @@ namespace data
 	}	
 
 	std::vector<IdentHash> NetDb::GetClosestFloodfills (const IdentHash& destination, size_t num,
-		std::set<IdentHash>& excluded) const
+		std::set<IdentHash>& excluded, bool closeThanUsOnly) const
 	{
 		struct Sorted
 		{
@@ -895,6 +895,8 @@ namespace data
 
 		std::set<Sorted> sorted;
 		IdentHash destKey = CreateRoutingKey (destination);
+		XORMetric ourMetric;
+		if (closeThanUsOnly) ourMetric = destKey ^ i2p::context.GetIdentHash ();
 		{
 			std::unique_lock<std::mutex> l(m_FloodfillsMutex);
 			for (auto it: m_Floodfills)
@@ -902,6 +904,7 @@ namespace data
 				if (!it->IsUnreachable ())
 				{	
 					XORMetric m = destKey ^ it->GetIdentHash ();
+					if (closeThanUsOnly && ourMetric < m) continue;
 					if (sorted.size () < num)
 						sorted.insert ({it, m});
 					else if (m < sorted.rbegin ()->metric)
@@ -960,9 +963,9 @@ namespace data
 		auto ts = i2p::util::GetMillisecondsSinceEpoch ();
 		for (auto it = m_LeaseSets.begin (); it != m_LeaseSets.end ();)
 		{
-			if (ts > it->second->GetExpirationTime ()) 
+			if (ts > it->second->GetExpirationTime () - LEASE_ENDDATE_THRESHOLD) 
 			{
-				LogPrint (eLogWarning, "NetDb: LeaseSet ", it->second->GetIdentHash ().ToBase64 (), " expired");
+				LogPrint (eLogInfo, "NetDb: LeaseSet ", it->second->GetIdentHash ().ToBase64 (), " expired");
 				it = m_LeaseSets.erase (it);
 			}	
 			else 
diff --git a/NetDb.h b/NetDb.h
index 7b196330..536ff644 100644
--- a/NetDb.h
+++ b/NetDb.h
@@ -60,7 +60,7 @@ namespace data
 			std::shared_ptr<const RouterInfo> GetRandomIntroducer () const;
 			std::shared_ptr<const RouterInfo> GetClosestFloodfill (const IdentHash& destination, const std::set<IdentHash>& excluded, bool closeThanUsOnly = false) const;
 			std::vector<IdentHash> GetClosestFloodfills (const IdentHash& destination, size_t num,
-				std::set<IdentHash>& excluded) const;
+				std::set<IdentHash>& excluded, bool closeThanUsOnly = false) const;
 			std::shared_ptr<const RouterInfo> GetClosestNonFloodfill (const IdentHash& destination, const std::set<IdentHash>& excluded) const;
 			void SetUnreachable (const IdentHash& ident, bool unreachable);