From a0e545a6f1ed29b9f077371857a587349059416a Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Fri, 28 May 2021 12:11:24 -0400
Subject: [PATCH] always create new tunnel from exploratory pool

---
 libi2pd/TunnelPool.cpp | 18 ++++++++++++++++--
 libi2pd/TunnelPool.h   |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/libi2pd/TunnelPool.cpp b/libi2pd/TunnelPool.cpp
index ed9a1a82..f2f0b4c8 100644
--- a/libi2pd/TunnelPool.cpp
+++ b/libi2pd/TunnelPool.cpp
@@ -393,10 +393,14 @@ namespace tunnel
 		}
 	}
 
+	bool TunnelPool::IsExploratory () const
+	{
+		return i2p::tunnel::tunnels.GetExploratoryPool () == shared_from_this ();
+	}	
+		
 	std::shared_ptr<const i2p::data::RouterInfo> TunnelPool::SelectNextHop (std::shared_ptr<const i2p::data::RouterInfo> prevHop, bool reverse) const
 	{
-		bool isExploratory = (i2p::tunnel::tunnels.GetExploratoryPool () == shared_from_this ());
-		auto hop = isExploratory ? i2p::data::netdb.GetRandomRouter (prevHop, reverse):
+		auto hop = IsExploratory () ? i2p::data::netdb.GetRandomRouter (prevHop, reverse):
 			i2p::data::netdb.GetHighBandwidthRandomRouter (prevHop, reverse);
 
 		if (!hop || hop->GetProfile ()->IsBad ())
@@ -521,6 +525,11 @@ namespace tunnel
 
 	void TunnelPool::RecreateInboundTunnel (std::shared_ptr<InboundTunnel> tunnel)
 	{
+		if (IsExploratory ()) // always create new exploratory tunnel
+		{
+			CreateInboundTunnel ();
+			return;
+		}
 		auto outboundTunnel = GetNextOutboundTunnel ();
 		if (!outboundTunnel)
 			outboundTunnel = tunnels.GetNextOutboundTunnel ();
@@ -567,6 +576,11 @@ namespace tunnel
 
 	void TunnelPool::RecreateOutboundTunnel (std::shared_ptr<OutboundTunnel> tunnel)
 	{
+		if (IsExploratory ()) // always create new exploratory tunnel
+		{
+			CreateOutboundTunnel ();
+			return;
+		}
 		auto inboundTunnel = GetNextInboundTunnel ();
 		if (!inboundTunnel)
 			inboundTunnel = tunnels.GetNextInboundTunnel ();
diff --git a/libi2pd/TunnelPool.h b/libi2pd/TunnelPool.h
index 5fd1d83c..164ca7a1 100644
--- a/libi2pd/TunnelPool.h
+++ b/libi2pd/TunnelPool.h
@@ -77,6 +77,7 @@ namespace tunnel
 			void ProcessGarlicMessage (std::shared_ptr<I2NPMessage> msg);
 			void ProcessDeliveryStatus (std::shared_ptr<I2NPMessage> msg);
 
+			bool IsExploratory () const;
 			bool IsActive () const { return m_IsActive; };
 			void SetActive (bool isActive) { m_IsActive = isActive; };
 			void DetachTunnels ();