From b5bc05ac2b2ed9375d689207190af89b5344c37d Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sat, 14 Mar 2020 16:35:34 -0400
Subject: [PATCH] delete unconfirmed LeaseSet and DeliveryStatus

---
 libi2pd/ECIESX25519AEADRatchetSession.cpp |  6 ++++++
 libi2pd/ECIESX25519AEADRatchetSession.h   |  2 +-
 libi2pd/Garlic.cpp                        | 19 ++++++++++++-------
 libi2pd/Garlic.h                          |  3 ++-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/libi2pd/ECIESX25519AEADRatchetSession.cpp b/libi2pd/ECIESX25519AEADRatchetSession.cpp
index 4705c708..8c293f15 100644
--- a/libi2pd/ECIESX25519AEADRatchetSession.cpp
+++ b/libi2pd/ECIESX25519AEADRatchetSession.cpp
@@ -571,6 +571,12 @@ namespace garlic
 		}	
 		m_NumReceiveTags += numTags;	
 	}	
+
+	bool ECIESX25519AEADRatchetSession::CheckExpired (uint64_t ts)
+	{ 
+		CleanupUnconfirmedLeaseSet (ts);
+		return ts > m_LastActivityTimestamp + ECIESX25519_EXPIRATION_TIMEOUT; 
+	}	
 }
 }
 
diff --git a/libi2pd/ECIESX25519AEADRatchetSession.h b/libi2pd/ECIESX25519AEADRatchetSession.h
index 4d273c13..db9807a5 100644
--- a/libi2pd/ECIESX25519AEADRatchetSession.h
+++ b/libi2pd/ECIESX25519AEADRatchetSession.h
@@ -85,7 +85,7 @@ namespace garlic
 				if (!m_Destination) m_Destination.reset (new i2p::data::IdentHash (dest));
 			}
 			
-			bool IsExpired (uint64_t ts) const { return ts > m_LastActivityTimestamp + ECIESX25519_EXPIRATION_TIMEOUT; }
+			bool CheckExpired (uint64_t ts); // true is expired
 			bool CanBeRestarted (uint64_t ts) const { return ts > m_LastActivityTimestamp + ECIESX25519_RESTART_TIMEOUT; }
 
         private:
diff --git a/libi2pd/Garlic.cpp b/libi2pd/Garlic.cpp
index 99b737b1..97f80b41 100644
--- a/libi2pd/Garlic.cpp
+++ b/libi2pd/Garlic.cpp
@@ -70,6 +70,16 @@ namespace garlic
 		return false;
 	}	
 
+	void GarlicRoutingSession::CleanupUnconfirmedLeaseSet (uint64_t ts)
+	{
+		if (m_LeaseSetUpdateMsgID && ts*1000LL > m_LeaseSetSubmissionTime + LEASET_CONFIRMATION_TIMEOUT)
+		{
+			if (GetOwner ())
+				GetOwner ()->RemoveDeliveryStatusSession (m_LeaseSetUpdateMsgID);
+			m_LeaseSetUpdateMsgID = 0;
+		}
+	}	
+		
 	std::shared_ptr<I2NPMessage> GarlicRoutingSession::CreateEncryptedDeliveryStatusMsg (uint32_t msgID)
 	{
 		auto msg = CreateDeliveryStatusMsg (msgID);
@@ -390,12 +400,7 @@ namespace garlic
 				++it;
 		}
 		CleanupUnconfirmedTags ();
-		if (GetLeaseSetUpdateMsgID () && ts*1000LL > GetLeaseSetSubmissionTime () + LEASET_CONFIRMATION_TIMEOUT)
-		{
-			if (GetOwner ())
-				GetOwner ()->RemoveDeliveryStatusSession (GetLeaseSetUpdateMsgID ());
-			SetLeaseSetUpdateMsgID (0);
-		}
+		CleanupUnconfirmedLeaseSet (ts);
 		return !m_SessionTags.empty () || !m_UnconfirmedTagsMsgs.empty ();
 	}
 
@@ -767,7 +772,7 @@ namespace garlic
 
 		for (auto it = m_ECIESx25519Sessions.begin (); it != m_ECIESx25519Sessions.end ();)
 		{
-			if (it->second->IsExpired (ts))
+			if (it->second->CheckExpired (ts))
 			{
 				it->second->SetOwner (nullptr);
 				it = m_ECIESx25519Sessions.erase (it);
diff --git a/libi2pd/Garlic.h b/libi2pd/Garlic.h
index 396a38fe..06da679d 100644
--- a/libi2pd/Garlic.h
+++ b/libi2pd/Garlic.h
@@ -113,7 +113,8 @@ namespace garlic
 			bool IsLeaseSetNonConfirmed () const { return m_LeaseSetUpdateStatus == eLeaseSetSubmitted; };
 			bool IsLeaseSetUpdated () const { return m_LeaseSetUpdateStatus == eLeaseSetUpdated; };
 			uint64_t GetLeaseSetSubmissionTime () const { return m_LeaseSetSubmissionTime; }
-
+			void CleanupUnconfirmedLeaseSet (uint64_t ts);
+			
 			std::shared_ptr<GarlicRoutingPath> GetSharedRoutingPath ();
 			void SetSharedRoutingPath (std::shared_ptr<GarlicRoutingPath> path);