pick compatible tunnels

libi2pd/Destination.cpp

@@ -562,7 +562,6 @@ namespace client
 			m_ExcludedFloodfills.clear ();
 			return;
 		}
-		m_ExcludedFloodfills.insert (floodfill->GetIdentHash ());
 		auto outbound = m_Pool->GetNextOutboundTunnel (nullptr, floodfill->GetCompatibleTransports (false));
 		if (!outbound)
 		{
@@ -575,6 +574,7 @@ namespace client
 			LogPrint (eLogError, "Destination: Can't publish LeaseSet. No inbound tunnels");
 			return;
 		}
+		m_ExcludedFloodfills.insert (floodfill->GetIdentHash ());
 		LogPrint (eLogDebug, "Destination: Publish LeaseSet of ", GetIdentHash ().ToBase32 ());
 		RAND_bytes ((uint8_t *)&m_PublishReplyToken, 4);
 		auto msg = WrapMessageForRouter (floodfill, i2p::CreateDatabaseStoreMsg (leaseSet, m_PublishReplyToken, inbound));

libi2pd/NetDb.cpp

@@ -681,8 +681,8 @@ namespace data
 			else
 			{
 				auto pool = i2p::tunnel::tunnels.GetExploratoryPool ();
-				auto outbound = pool ? pool->GetNextOutboundTunnel () : nullptr;
+				auto outbound = pool ? pool->GetNextOutboundTunnel (nullptr, floodfill->GetCompatibleTransports (false)) : nullptr;
-				auto inbound = pool ? pool->GetNextInboundTunnel () : nullptr;
+				auto inbound = pool ? pool->GetNextInboundTunnel (nullptr, floodfill->GetCompatibleTransports (true)) : nullptr;
 				if (outbound &&	inbound)
 					outbound->SendTunnelDataMsg (floodfill->GetIdentHash (), 0, dest->CreateRequestMessage (floodfill, inbound));
 				else
@@ -1129,8 +1129,8 @@ namespace data
 			{
 				// otherwise through exploratory	
 				auto exploratoryPool = i2p::tunnel::tunnels.GetExploratoryPool ();
-				auto outbound = exploratoryPool ? exploratoryPool->GetNextOutboundTunnel () : nullptr;
+				auto outbound = exploratoryPool ? exploratoryPool->GetNextOutboundTunnel (nullptr, floodfill->GetCompatibleTransports (false)) : nullptr;
-				auto inbound = exploratoryPool ? exploratoryPool->GetNextInboundTunnel () : nullptr;	
+				auto inbound = exploratoryPool ? exploratoryPool->GetNextInboundTunnel (nullptr, floodfill->GetCompatibleTransports (true)) : nullptr;	
 				if (inbound && outbound)
 					outbound->SendTunnelDataMsg (floodfill->GetIdentHash (), 0, 
 						CreateDatabaseStoreMsg (i2p::context.GetSharedRouterInfo (), replyToken, inbound));	

libi2pd/TunnelPool.cpp

@@ -498,9 +498,8 @@ namespace tunnel
 			}	
 			prevHop = hop;
 			path.Add (hop);
-			if (i == numHops - 1)
-				path.farEndTransports = hop->GetCompatibleTransports (inbound);
 		}
+		path.farEndTransports = prevHop->GetCompatibleTransports (inbound); // last hop
 		return true;
 	}
 
@@ -555,13 +554,13 @@ namespace tunnel
 
 	void TunnelPool::CreateInboundTunnel ()
 	{
-		auto outboundTunnel = GetNextOutboundTunnel ();
-		if (!outboundTunnel)
-			outboundTunnel = tunnels.GetNextOutboundTunnel ();
 		LogPrint (eLogDebug, "Tunnels: Creating destination inbound tunnel...");
 		Path path;
 		if (SelectPeers (path, true))
 		{
+			auto outboundTunnel = GetNextOutboundTunnel (nullptr, path.farEndTransports);
+			if (!outboundTunnel)
+				outboundTunnel = tunnels.GetNextOutboundTunnel ();
 			std::shared_ptr<TunnelConfig> config;
 			if (m_NumInboundHops > 0)
 			{
@@ -583,7 +582,7 @@ namespace tunnel
 			CreateInboundTunnel ();
 			return;
 		}
-		auto outboundTunnel = GetNextOutboundTunnel ();
+		auto outboundTunnel = GetNextOutboundTunnel (nullptr, tunnel->GetFarEndTransports ());
 		if (!outboundTunnel)
 			outboundTunnel = tunnels.GetNextOutboundTunnel ();
 		LogPrint (eLogDebug, "Tunnels: Re-creating destination inbound tunnel...");
@@ -604,40 +603,41 @@ namespace tunnel
 
 	void TunnelPool::CreateOutboundTunnel ()
 	{
-		auto inboundTunnel = GetNextInboundTunnel ();
+		LogPrint (eLogDebug, "Tunnels: Creating destination outbound tunnel...");
-		if (!inboundTunnel)
+		Path path;
-			inboundTunnel = tunnels.GetNextInboundTunnel ();
+		if (SelectPeers (path, false))
-		if (inboundTunnel)
 		{
-			LogPrint (eLogDebug, "Tunnels: Creating destination outbound tunnel...");
+			auto inboundTunnel = GetNextInboundTunnel (nullptr, path.farEndTransports);
-			Path path;
+			if (!inboundTunnel)
-			if (SelectPeers (path, false))
+				inboundTunnel = tunnels.GetNextInboundTunnel ();
+			if (!inboundTunnel)
 			{
-				if (m_LocalDestination && !m_LocalDestination->SupportsEncryptionType (i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD))
+				LogPrint (eLogError, "Tunnels: Can't create outbound tunnel, no inbound tunnels found");
-					path.isShort = false; // because can't handle ECIES encrypted reply
+				return;
+			}	
 			
-				std::shared_ptr<TunnelConfig> config;
+			if (m_LocalDestination && !m_LocalDestination->SupportsEncryptionType (i2p::data::CRYPTO_KEY_TYPE_ECIES_X25519_AEAD))
-				if (m_NumOutboundHops > 0)
+				path.isShort = false; // because can't handle ECIES encrypted reply
-					config = std::make_shared<TunnelConfig>(path.peers, inboundTunnel->GetNextTunnelID (), 
-						inboundTunnel->GetNextIdentHash (), path.isShort, path.farEndTransports);
 			
-				std::shared_ptr<OutboundTunnel> tunnel;
+			std::shared_ptr<TunnelConfig> config;
-				if (path.isShort)
+			if (m_NumOutboundHops > 0)
-				{
+				config = std::make_shared<TunnelConfig>(path.peers, inboundTunnel->GetNextTunnelID (), 
-					// TODO: implement it better
+					inboundTunnel->GetNextIdentHash (), path.isShort, path.farEndTransports);
-					tunnel = tunnels.CreateOutboundTunnel (config, inboundTunnel->GetTunnelPool ());
+
-					tunnel->SetTunnelPool (shared_from_this ());
+			std::shared_ptr<OutboundTunnel> tunnel;
-				}	
+			if (path.isShort)
-				else	
+			{
-					tunnel = tunnels.CreateOutboundTunnel (config, shared_from_this ());
+				// TODO: implement it better
-				if (tunnel && tunnel->IsEstablished ()) // zero hops
+				tunnel = tunnels.CreateOutboundTunnel (config, inboundTunnel->GetTunnelPool ());
-					TunnelCreated (tunnel);
+				tunnel->SetTunnelPool (shared_from_this ());
 			}	
 			else	
-				LogPrint (eLogError, "Tunnels: Can't create outbound tunnel, no peers available");
+				tunnel = tunnels.CreateOutboundTunnel (config, shared_from_this ());
+			if (tunnel && tunnel->IsEstablished ()) // zero hops
+				TunnelCreated (tunnel);
 		}
 		else
-			LogPrint (eLogError, "Tunnels: Can't create outbound tunnel, no inbound tunnels found");
+			LogPrint (eLogError, "Tunnels: Can't create outbound tunnel, no peers available");
 	}
 
 	void TunnelPool::RecreateOutboundTunnel (std::shared_ptr<OutboundTunnel> tunnel)
@@ -647,7 +647,7 @@ namespace tunnel
 			CreateOutboundTunnel ();
 			return;
 		}
-		auto inboundTunnel = GetNextInboundTunnel ();
+		auto inboundTunnel = GetNextInboundTunnel (nullptr, tunnel->GetFarEndTransports ());
 		if (!inboundTunnel)
 			inboundTunnel = tunnels.GetNextInboundTunnel ();
 		if (inboundTunnel)