From 262a803d106d41782a4f2fd1429d78102a0b9a92 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Tue, 24 Sep 2024 20:57:04 -0400
Subject: [PATCH] make sure we are done with session before remving it

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

diff --git a/libi2pd/SSU2.cpp b/libi2pd/SSU2.cpp
index 2005294b..cdc127b1 100644
--- a/libi2pd/SSU2.cpp
+++ b/libi2pd/SSU2.cpp
@@ -476,6 +476,11 @@ namespace transport
 		}
 	}
 
+	void SSU2Server::RequestRemoveSession (uint64_t connID)
+	{
+		GetService ().post ([connID, this]() { RemoveSession (connID); });
+	}	
+		
 	void SSU2Server::AddSessionByRouterHash (std::shared_ptr<SSU2Session> session)
 	{
 		if (session)
diff --git a/libi2pd/SSU2.h b/libi2pd/SSU2.h
index 54eca83f..84a13075 100644
--- a/libi2pd/SSU2.h
+++ b/libi2pd/SSU2.h
@@ -82,6 +82,7 @@ namespace transport
 
 			void AddSession (std::shared_ptr<SSU2Session> session);
 			void RemoveSession (uint64_t connID);
+			void RequestRemoveSession (uint64_t connID);
 			void AddSessionByRouterHash (std::shared_ptr<SSU2Session> session);
 			bool AddPendingOutgoingSession (std::shared_ptr<SSU2Session> session);
 			void RemovePendingOutgoingSession (const boost::asio::ip::udp::endpoint& ep);
diff --git a/libi2pd/SSU2Session.cpp b/libi2pd/SSU2Session.cpp
index 7a7154a9..ce3f1637 100644
--- a/libi2pd/SSU2Session.cpp
+++ b/libi2pd/SSU2Session.cpp
@@ -224,7 +224,7 @@ namespace transport
 			// connect
 			m_State = eSSU2SessionStateTokenReceived;
 			m_Server.AddPendingOutgoingSession (shared_from_this ());
-			m_Server.RemoveSession (oldConnID);
+			m_Server.RequestRemoveSession (oldConnID);
 			Connect ();
 		}
 	}
@@ -3140,7 +3140,7 @@ namespace transport
 					SendPeerTest (7, buf + offset, len - offset);
 				else
 					LogPrint (eLogWarning, "SSU2: Unknown address for peer test 6");
-				GetServer ().RemoveSession (GetConnID ());
+				GetServer ().RequestRemoveSession (GetConnID ());
 				break;
 			}			
 			case 7: // Alice from Charlie 2
@@ -3148,7 +3148,7 @@ namespace transport
 				auto addr = GetAddress ();
 				if (addr && addr->IsV6 ())
 					i2p::context.SetStatusV6 (eRouterStatusOK); // set status OK for ipv6 even if from SSU2
-				GetServer ().RemoveSession (GetConnID ());	
+				GetServer ().RequestRemoveSession (GetConnID ());	
 				break;
 			}	
 			default: