From 8ad5696e50e4851097235dd08b46a608ed80c115 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Tue, 6 Dec 2022 21:40:33 -0500
Subject: [PATCH] don't send termination again if termination received block
 received

---
 libi2pd/SSU2.cpp        |  3 ++-
 libi2pd/SSU2Session.cpp | 15 +++++++++++----
 libi2pd/SSU2Session.h   |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/libi2pd/SSU2.cpp b/libi2pd/SSU2.cpp
index dba29fff..f4fdfa04 100644
--- a/libi2pd/SSU2.cpp
+++ b/libi2pd/SSU2.cpp
@@ -496,9 +496,10 @@ namespace transport
 				break;
 				case eSSU2SessionStateClosing:
 					m_LastSession->ProcessData (buf, len, senderEndpoint); // we might receive termintaion block
-					if (m_LastSession && m_LastSession->GetState () != eSSU2SessionStateTerminated)
+					if (m_LastSession && m_LastSession->GetState () == eSSU2SessionStateClosing)
 						m_LastSession->RequestTermination (eSSU2TerminationReasonIdleTimeout); // send termination again
 				break;
+				case eSSU2SessionStateClosingConfirmed:	
 				case eSSU2SessionStateTerminated:
 					m_LastSession = nullptr;
 				break;
diff --git a/libi2pd/SSU2Session.cpp b/libi2pd/SSU2Session.cpp
index faf4e08a..ac184506 100644
--- a/libi2pd/SSU2Session.cpp
+++ b/libi2pd/SSU2Session.cpp
@@ -1462,12 +1462,19 @@ namespace transport
 					m_IsDataReceived = true;
 				break;
 				case eSSU2BlkTermination:
-					LogPrint (eLogDebug, "SSU2: Termination reason=", (int)buf[11]);
-					if (IsEstablished () && buf[11] != eSSU2TerminationReasonTerminationReceived)
+				{	
+					uint8_t rsn = buf[11]; // reason		
+					LogPrint (eLogDebug, "SSU2: Termination reason=", (int)rsn);
+					if (IsEstablished () && rsn != eSSU2TerminationReasonTerminationReceived)
 						RequestTermination (eSSU2TerminationReasonTerminationReceived);
-					else
+					else if (m_State != eSSU2SessionStateTerminated)	
+					{
+						if (m_State == eSSU2SessionStateClosing && rsn == eSSU2TerminationReasonTerminationReceived)	
+							m_State = eSSU2SessionStateClosingConfirmed;
 						Done ();
-				break;
+					}		
+					break;
+				}		
 				case eSSU2BlkRelayRequest:
 					LogPrint (eLogDebug, "SSU2: RelayRequest");
 					HandleRelayRequest (buf + offset, size);
diff --git a/libi2pd/SSU2Session.h b/libi2pd/SSU2Session.h
index a8c473a2..d12395d6 100644
--- a/libi2pd/SSU2Session.h
+++ b/libi2pd/SSU2Session.h
@@ -100,6 +100,7 @@ namespace transport
 		eSSU2SessionStateSessionConfirmedSent,
 		eSSU2SessionStateEstablished,
 		eSSU2SessionStateClosing,
+		eSSU2SessionStateClosingConfirmed,
 		eSSU2SessionStateTerminated,
 		eSSU2SessionStateFailed,
 		eSSU2SessionStateIntroduced,