From dc265367dcb33c54480389972ea08b5afb9fdabe Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Thu, 20 Apr 2023 14:23:41 -0400
Subject: [PATCH] drop unexpected I2NP messages

---
 libi2pd/I2NPProtocol.cpp | 24 +++++++++++++++++++-----
 libi2pd/Transports.cpp   |  4 ++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/libi2pd/I2NPProtocol.cpp b/libi2pd/I2NPProtocol.cpp
index 5303edbf..1a5b1cde 100644
--- a/libi2pd/I2NPProtocol.cpp
+++ b/libi2pd/I2NPProtocol.cpp
@@ -785,10 +785,12 @@ namespace i2p
 			switch (typeID)
 			{
 				case eI2NPTunnelData:
-					i2p::tunnel::tunnels.PostTunnelData (msg);
+					if (!msg->from)
+						i2p::tunnel::tunnels.PostTunnelData (msg);
 				break;
 				case eI2NPTunnelGateway:
-					i2p::tunnel::tunnels.PostTunnelData (msg);
+					if (!msg->from)
+						i2p::tunnel::tunnels.PostTunnelData (msg);
 				break;
 				case eI2NPGarlic:
 				{
@@ -799,11 +801,19 @@ namespace i2p
 					break;
 				}
 				case eI2NPDatabaseStore:
+					// forward to netDb if came directly or through exploratory tunnel as response to our request
+					if (!msg->from || !msg->from->GetTunnelPool () || msg->from->GetTunnelPool ()->IsExploratory ())
+						i2p::data::netdb.PostI2NPMsg (msg);
+				break;
 				case eI2NPDatabaseSearchReply:
-				case eI2NPDatabaseLookup:
 					// forward to netDb
 					i2p::data::netdb.PostI2NPMsg (msg);
 				break;
+				case eI2NPDatabaseLookup:
+					// forward to netDb if floodfill and came directly
+					if (!msg->from && i2p::context.IsFloodfill ())
+						i2p::data::netdb.PostI2NPMsg (msg);
+				break;
 				case eI2NPDeliveryStatus:
 				{
 					if (msg->from && msg->from->GetTunnelPool ())
@@ -813,10 +823,14 @@ namespace i2p
 					break;
 				}
 				case eI2NPVariableTunnelBuild:
-				case eI2NPVariableTunnelBuildReply:
 				case eI2NPTunnelBuild:
-				case eI2NPTunnelBuildReply:
 				case eI2NPShortTunnelBuild:
+					// forward to tunnel thread
+					if (!msg->from)
+						i2p::tunnel::tunnels.PostTunnelData (msg);
+				break;
+				case eI2NPVariableTunnelBuildReply:
+				case eI2NPTunnelBuildReply:
 				case eI2NPShortTunnelBuildReply:
 					// forward to tunnel thread
 					i2p::tunnel::tunnels.PostTunnelData (msg);
diff --git a/libi2pd/Transports.cpp b/libi2pd/Transports.cpp
index e66a831c..c6e9f372 100644
--- a/libi2pd/Transports.cpp
+++ b/libi2pd/Transports.cpp
@@ -801,12 +801,12 @@ namespace transport
  				if (it->second.sessions.empty () && ts > it->second.creationTime + SESSION_CREATION_TIMEOUT)
 				{
 					LogPrint (eLogWarning, "Transports: Session to peer ", it->first.ToBase64 (), " has not been created in ", SESSION_CREATION_TIMEOUT, " seconds");
-					if (!it->second.router) 
+				/*	if (!it->second.router) 
 					{	 
 						// if router for ident not found mark it unreachable
 						auto profile = i2p::data::GetRouterProfile (it->first);
 						if (profile) profile->Unreachable ();
-					}	
+					}	*/
 					std::unique_lock<std::mutex> l(m_PeersMutex);
 					it = m_Peers.erase (it);
 				}