From 2ad26dd4c9def4cf05e144f65793323187a2b830 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Thu, 11 Jan 2024 14:09:08 -0500
Subject: [PATCH] fixed race condition in ECIESx25519 tags table

---
 libi2pd/RouterContext.cpp | 22 +++++++++++++++++++++-
 libi2pd/RouterContext.h   |  1 +
 libi2pd/Tunnel.cpp        |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/libi2pd/RouterContext.cpp b/libi2pd/RouterContext.cpp
index f21c0592..10d33bf5 100644
--- a/libi2pd/RouterContext.cpp
+++ b/libi2pd/RouterContext.cpp
@@ -1199,7 +1199,27 @@ namespace i2p
 		else	              
 			i2p::garlic::GarlicDestination::ProcessDeliveryStatusMessage (msg);
 	}
-	
+
+	void RouterContext::SubmitECIESx25519Key (const uint8_t * key, uint64_t tag)
+	{
+		if (m_Service)
+		{
+			struct
+			{
+				uint8_t k[32];
+				uint64_t t;
+			} data;
+			memcpy (data.k, key, 32);
+			data.t = tag;
+			m_Service->GetService ().post ([this,data](void)
+				{
+					AddECIESx25519Key (data.k, data.t);
+				});
+		}	
+		else
+			LogPrint (eLogError, "Router: service is NULL");
+	}	
+		
 	void RouterContext::CleanupDestination ()
 	{
 		if (m_Service)
diff --git a/libi2pd/RouterContext.h b/libi2pd/RouterContext.h
index d49b5523..91a553ba 100644
--- a/libi2pd/RouterContext.h
+++ b/libi2pd/RouterContext.h
@@ -136,6 +136,7 @@ namespace garlic
 			void SetNetID (int netID) { m_NetID = netID; };
 			bool DecryptTunnelBuildRecord (const uint8_t * encrypted, uint8_t * data);
 			bool DecryptTunnelShortRequestRecord (const uint8_t * encrypted, uint8_t * data);
+			void SubmitECIESx25519Key (const uint8_t * key, uint64_t tag);
 
 			void UpdatePort (int port); // called from Daemon
 			void UpdateAddress (const boost::asio::ip::address& host); // called from SSU2 or Daemon
diff --git a/libi2pd/Tunnel.cpp b/libi2pd/Tunnel.cpp
index 6234ceb4..b8e17920 100644
--- a/libi2pd/Tunnel.cpp
+++ b/libi2pd/Tunnel.cpp
@@ -116,7 +116,7 @@ namespace tunnel
 				if (m_Pool && m_Pool->GetLocalDestination ())
 					m_Pool->GetLocalDestination ()->SubmitECIESx25519Key (key, tag);
 				else
-					i2p::context.AddECIESx25519Key (key, tag);
+					i2p::context.SubmitECIESx25519Key (key, tag);
 			}
 			i2p::transport::transports.SendMessage (GetNextIdentHash (), msg);
 		}