From 242fb7db14c84e5a8ff960ab3affb8a1a0a6ae81 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sat, 28 Nov 2020 10:09:38 -0500
Subject: [PATCH] terminate I2CP session if destroyed explicitly

---
 libi2pd_client/I2CP.cpp | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/libi2pd_client/I2CP.cpp b/libi2pd_client/I2CP.cpp
index 5b8c09b2..9e9d17ee 100644
--- a/libi2pd_client/I2CP.cpp
+++ b/libi2pd_client/I2CP.cpp
@@ -89,10 +89,16 @@ namespace client
 		m_LeaseSetExpirationTime = ls.GetExpirationTime ();
 		uint8_t * leases = ls.GetLeases ();
 		leases[-1] = tunnels.size ();
-		htobe16buf (leases - 3, m_Owner->GetSessionID ());
-		size_t l = 2/*sessionID*/ + 1/*num leases*/ + i2p::data::LEASE_SIZE*tunnels.size ();
 		if (m_Owner)
-			m_Owner->SendI2CPMessage (I2CP_REQUEST_VARIABLE_LEASESET_MESSAGE, leases - 3, l);
+		{	
+			uint16_t sessionID = m_Owner->GetSessionID ();
+			if (sessionID != 0xFFFF)
+			{	
+				htobe16buf (leases - 3, sessionID);
+				size_t l = 2/*sessionID*/ + 1/*num leases*/ + i2p::data::LEASE_SIZE*tunnels.size ();
+				m_Owner->SendI2CPMessage (I2CP_REQUEST_VARIABLE_LEASESET_MESSAGE, leases - 3, l);
+			}	
+		}	
 	}
 
 	void I2CPDestination::LeaseSetCreated (const uint8_t * buf, size_t len)
@@ -243,11 +249,7 @@ namespace client
 
 	I2CPSession::~I2CPSession ()
 	{
-		if (m_SendQueue)
-		{
-			for (auto& it: *m_SendQueue)
-				delete[] boost::asio::buffer_cast<const uint8_t *>(it);
-		}	
+		Terminate ();
 	}
 
 	void I2CPSession::Start ()
@@ -358,8 +360,18 @@ namespace client
 			m_Socket->close ();
 			m_Socket = nullptr;
 		}
-		m_Owner.RemoveSession (GetSessionID ());
-		LogPrint (eLogDebug, "I2CP: session ", m_SessionID, " terminated");
+		if (m_SendQueue)
+		{
+			for (auto& it: *m_SendQueue)
+				delete[] boost::asio::buffer_cast<const uint8_t *>(it);
+			m_SendQueue = nullptr;
+		}	
+		if (m_SessionID != 0xFFFF)
+		{	
+			m_Owner.RemoveSession (GetSessionID ());
+			LogPrint (eLogDebug, "I2CP: session ", m_SessionID, " terminated");
+			m_SessionID = 0xFFFF;
+		}	
 	}
 
 	void I2CPSession::SendI2CPMessage (uint8_t type, const uint8_t * payload, size_t len)
@@ -555,11 +567,7 @@ namespace client
 	{
 		SendSessionStatusMessage (0); // destroy
 		LogPrint (eLogDebug, "I2CP: session ", m_SessionID, " destroyed");
-		if (m_Destination)
-		{
-			m_Destination->Stop ();
-			m_Destination = 0;
-		}
+		Terminate ();
 	}
 
 	void I2CPSession::ReconfigureSessionMessageHandler (const uint8_t * buf, size_t len)