From b77ae0838859505182f99a80a8a12d575f49cb10 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Tue, 18 Apr 2023 14:35:13 -0400
Subject: [PATCH] exclude previously non-reachable transports

---
 libi2pd/NetDb.cpp      | 20 +++++++++++++++-----
 libi2pd/NetDb.hpp      |  1 +
 libi2pd/RouterInfo.h   |  1 +
 libi2pd/Transports.cpp | 11 +++++++++++
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/libi2pd/NetDb.cpp b/libi2pd/NetDb.cpp
index c9c92b64..1f9797f2 100644
--- a/libi2pd/NetDb.cpp
+++ b/libi2pd/NetDb.cpp
@@ -409,19 +409,29 @@ namespace data
 
 	void NetDb::SetUnreachable (const IdentHash& ident, bool unreachable)
 	{
-		auto it = m_RouterInfos.find (ident);
-		if (it != m_RouterInfos.end ())
+		auto r = FindRouter (ident);
+		if (r)
 		{
-			it->second->SetUnreachable (unreachable);
+			r->SetUnreachable (unreachable);
 			if (unreachable)
 			{
-				auto profile = it->second->GetProfile ();
+				auto profile = r->GetProfile ();
 				if (profile)
 					profile->Unreachable ();
 			}
-		}
+		}	
 	}
 
+	void NetDb::ExcludeReachableTransports (const IdentHash& ident, RouterInfo::CompatibleTransports transports)
+	{
+		auto r = FindRouter (ident);
+		if (r)
+		{
+			std::unique_lock<std::mutex> l(m_RouterInfosMutex);
+			r->ExcludeReachableTransports (transports);
+		}	
+	}	
+	
 	void NetDb::Reseed ()
 	{
 		if (!m_Reseeder)
diff --git a/libi2pd/NetDb.hpp b/libi2pd/NetDb.hpp
index d98d487e..b6dc8ce7 100644
--- a/libi2pd/NetDb.hpp
+++ b/libi2pd/NetDb.hpp
@@ -94,6 +94,7 @@ namespace data
 			std::shared_ptr<const RouterInfo> GetClosestNonFloodfill (const IdentHash& destination, const std::set<IdentHash>& excluded) const;
 			std::shared_ptr<const RouterInfo> GetRandomRouterInFamily (FamilyID fam) const;
 			void SetUnreachable (const IdentHash& ident, bool unreachable);
+			void ExcludeReachableTransports (const IdentHash& ident, RouterInfo::CompatibleTransports transports);
 
 			void PostI2NPMsg (std::shared_ptr<const I2NPMessage> msg);
 
diff --git a/libi2pd/RouterInfo.h b/libi2pd/RouterInfo.h
index 070737e8..35737c9b 100644
--- a/libi2pd/RouterInfo.h
+++ b/libi2pd/RouterInfo.h
@@ -259,6 +259,7 @@ namespace data
 		
 			void SetUnreachable (bool unreachable) { m_IsUnreachable = unreachable; };
 			bool IsUnreachable () const { return m_IsUnreachable; };
+			void ExcludeReachableTransports (CompatibleTransports transports) { m_ReachableTransports &= ~transports; };
 
 			const uint8_t * GetBuffer () const { return m_Buffer ? m_Buffer->data () : nullptr; };
 			const uint8_t * LoadBuffer (const std::string& fullPath); // load if necessary
diff --git a/libi2pd/Transports.cpp b/libi2pd/Transports.cpp
index fcdfc105..258ceca3 100644
--- a/libi2pd/Transports.cpp
+++ b/libi2pd/Transports.cpp
@@ -700,6 +700,17 @@ namespace transport
 			auto it = m_Peers.find (ident);
 			if (it != m_Peers.end ())
 			{
+				if (it->second.numAttempts > 1)
+				{
+					// exclude failed transports
+					i2p::data::RouterInfo::CompatibleTransports transports = 0;
+					int numExcluded = it->second.numAttempts - 1;
+					if (numExcluded > (int)it->second.priority.size ()) numExcluded = it->second.priority.size ();
+					for (int i = 0; i < numExcluded; i++)
+						transports |= it->second.priority[i];
+					i2p::data::netdb.ExcludeReachableTransports (ident, transports);
+				}		
+				it->second.numAttempts = 0;
 				it->second.router = nullptr; // we don't need RouterInfo after successive connect
 				bool sendDatabaseStore = true;
 				if (it->second.delayedMessages.size () > 0)