correct encryption and path for follow on lookup request

libi2pd/NetDb.cpp

@@ -721,7 +721,7 @@ namespace data
 
 	void NetDb::RequestDestination (const IdentHash& destination, RequestedDestination::RequestComplete requestComplete, bool direct)
 	{
-		auto dest = m_Requests.CreateRequest (destination, false, requestComplete); // non-exploratory
+		auto dest = m_Requests.CreateRequest (destination, false, direct, requestComplete); // non-exploratory
 		if (!dest)
 		{
 			LogPrint (eLogWarning, "NetDb: Destination ", destination.ToBase64(), " is requested already");
@@ -761,10 +761,10 @@ namespace data
 		}
 	}
 
-	void NetDb::RequestDestinationFrom (const IdentHash& destination, const IdentHash & from, bool exploritory, RequestedDestination::RequestComplete requestComplete)
+	void NetDb::RequestDestinationFrom (const IdentHash& destination, const IdentHash & from, bool exploratory, RequestedDestination::RequestComplete requestComplete)
 	{
 
-		auto dest = m_Requests.CreateRequest (destination, exploritory, requestComplete); // non-exploratory
+		auto dest = m_Requests.CreateRequest (destination, exploratory, true, requestComplete); // non-exploratory
 		if (!dest)
 		{
 			LogPrint (eLogWarning, "NetDb: Destination ", destination.ToBase64(), " is requested already");
@@ -919,39 +919,9 @@ namespace data
 		auto dest = m_Requests.FindRequest (ident);
 		if (dest)
 		{
-			bool deleteDest = true;
 			if (num > 0)
-			{
+				// try to send next requests
-				auto pool = i2p::tunnel::tunnels.GetExploratoryPool ();
+				m_Requests.SendNextRequest (dest);
-				auto outbound = pool ? pool->GetNextOutboundTunnel () : nullptr;
-				auto inbound = pool ? pool->GetNextInboundTunnel () : nullptr;
-				if (!dest->IsExploratory ())
-				{
-					// reply to our destination. Try other floodfills
-					if (outbound && inbound)
-					{
-						auto count = dest->GetExcludedPeers ().size ();
-						if (count < 7)
-						{
-							auto nextFloodfill = GetClosestFloodfill (dest->GetDestination (), dest->GetExcludedPeers ());
-							if (nextFloodfill)
-							{
-								// request destination
-								LogPrint (eLogDebug, "NetDb: Try ", key, " at ", count, " floodfill ", nextFloodfill->GetIdentHash ().ToBase64 ());
-								outbound->SendTunnelDataMsgTo (nextFloodfill->GetIdentHash (), 0,
-									dest->CreateRequestMessage (nextFloodfill, inbound));
-								deleteDest = false;
-							}
-						}
-						else
-							LogPrint (eLogWarning, "NetDb: ", key, " was not found on ", count, " floodfills");
-					}
-				}
-
-				if (deleteDest)
-					// no more requests for the destinationation. delete it
-					m_Requests.RequestComplete (ident, nullptr);
-			}
 			else
 				// no more requests for destination possible. delete it
 				m_Requests.RequestComplete (ident, nullptr);
@@ -1156,7 +1126,7 @@ namespace data
 		for (int i = 0; i < numDestinations; i++)
 		{
 			RAND_bytes (randomHash, 32);
-			auto dest = m_Requests.CreateRequest (randomHash, true); // exploratory
+			auto dest = m_Requests.CreateRequest (randomHash, true, !throughTunnels); // exploratory
 			if (!dest)
 			{
 				LogPrint (eLogWarning, "NetDb: Exploratory destination is requested already");

libi2pd/NetDbRequests.cpp

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2023, The PurpleI2P Project
+* Copyright (c) 2013-2024, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -11,6 +11,7 @@
 #include "Transports.h"
 #include "NetDb.hpp"
 #include "NetDbRequests.h"
+#include "ECIESX25519AEADRatchetSession.h"
 
 namespace i2p
 {
@@ -74,14 +75,15 @@ namespace data
 	}
 
 
-	std::shared_ptr<RequestedDestination> NetDbRequests::CreateRequest (const IdentHash& destination, bool isExploratory, RequestedDestination::RequestComplete requestComplete)
+	std::shared_ptr<RequestedDestination> NetDbRequests::CreateRequest (const IdentHash& destination, 
+		bool isExploratory, bool direct, RequestedDestination::RequestComplete requestComplete)
 	{
 		// request RouterInfo directly
-		auto dest = std::make_shared<RequestedDestination> (destination, isExploratory);
+		auto dest = std::make_shared<RequestedDestination> (destination, isExploratory, direct);
 		dest->SetRequestComplete (requestComplete);
 		{
-			std::unique_lock<std::mutex> l(m_RequestedDestinationsMutex);
+			std::unique_lock<std::mutex> l(m_RequestedDestinationsMutex); 
-			if (!m_RequestedDestinations.insert (std::make_pair (destination, dest)).second) // not inserted
+			if (!m_RequestedDestinations.emplace (destination, dest).second) // not inserted
 				return nullptr;
 		}
 		return dest;
@@ -125,35 +127,10 @@ namespace data
 		{
 			auto& dest = it->second;
 			bool done = false;
-			if (ts < dest->GetCreationTime () + 60) // request is worthless after 1 minute
+			if (ts < dest->GetCreationTime () + MAX_REQUEST_TIME) // request becomes worthless
 			{
-				if (ts > dest->GetCreationTime () + 5) // no response for 5 seconds
+				if (ts > dest->GetCreationTime () + MIN_REQUEST_TIME) // retry in no response after min interval
-				{
+					done = !SendNextRequest (dest);
-					auto count = dest->GetExcludedPeers ().size ();
-					if (!dest->IsExploratory () && count < 7)
-					{
-						auto pool = i2p::tunnel::tunnels.GetExploratoryPool ();
-						auto outbound = pool->GetNextOutboundTunnel ();
-						auto inbound = pool->GetNextInboundTunnel ();
-						auto nextFloodfill = netdb.GetClosestFloodfill (dest->GetDestination (), dest->GetExcludedPeers ());
-						if (nextFloodfill && outbound && inbound)
-							outbound->SendTunnelDataMsgTo (nextFloodfill->GetIdentHash (), 0,
-								dest->CreateRequestMessage (nextFloodfill, inbound));
-						else
-						{
-							done = true;
-							if (!inbound) LogPrint (eLogWarning, "NetDbReq: No inbound tunnels");
-							if (!outbound) LogPrint (eLogWarning, "NetDbReq: No outbound tunnels");
-							if (!nextFloodfill) LogPrint (eLogWarning, "NetDbReq: No more floodfills");
-						}
-					}
-					else
-					{
-						if (!dest->IsExploratory ())
-							LogPrint (eLogWarning, "NetDbReq: ", dest->GetDestination ().ToBase64 (), " not found after 7 attempts");
-						done = true;
-					}
-				}
 			}
 			else // delete obsolete request
 				done = true;
@@ -164,5 +141,56 @@ namespace data
 				++it;
 		}
 	}
+
+	bool NetDbRequests::SendNextRequest (std::shared_ptr<RequestedDestination> dest)
+	{
+		if (!dest) return false;
+		bool ret = true;
+		auto count = dest->GetExcludedPeers ().size ();
+		if (!dest->IsExploratory () && count < MAX_NUM_REQUEST_ATTEMPTS)
+		{
+			auto nextFloodfill = netdb.GetClosestFloodfill (dest->GetDestination (), dest->GetExcludedPeers ());
+			if (nextFloodfill)
+			{	
+				bool direct = dest->IsDirect ();
+				if (direct && !nextFloodfill->IsReachableFrom (i2p::context.GetRouterInfo ()) &&
+					!i2p::transport::transports.IsConnected (nextFloodfill->GetIdentHash ()))
+					direct = false; // floodfill can't be reached directly
+				if (direct)
+					i2p::transport::transports.SendMessage (nextFloodfill->GetIdentHash (), dest->CreateRequestMessage (nextFloodfill->GetIdentHash ()));
+				else
+				{	
+					auto pool = i2p::tunnel::tunnels.GetExploratoryPool ();
+					auto outbound = pool->GetNextOutboundTunnel ();
+					auto inbound = pool->GetNextInboundTunnel ();
+					if (nextFloodfill && outbound && inbound)
+					{
+						LogPrint (eLogDebug, "NetDbReq: Try ", dest->GetDestination (), " at ", count, " floodfill ", nextFloodfill->GetIdentHash ().ToBase64 ());
+						auto msg = dest->CreateRequestMessage (nextFloodfill, inbound); 
+						outbound->SendTunnelDataMsgTo (nextFloodfill->GetIdentHash (), 0,
+							i2p::garlic::WrapECIESX25519MessageForRouter (msg, nextFloodfill->GetIdentity ()->GetEncryptionPublicKey ()));
+					}	
+					else
+					{
+						ret = false;
+						if (!inbound) LogPrint (eLogWarning, "NetDbReq: No inbound tunnels");
+						if (!outbound) LogPrint (eLogWarning, "NetDbReq: No outbound tunnels");
+					}
+				}		
+			}
+			else
+			{
+				ret = false;
+				if (!nextFloodfill) LogPrint (eLogWarning, "NetDbReq: No more floodfills");
+			}	
+		}
+		else
+		{
+			if (!dest->IsExploratory ())
+				LogPrint (eLogWarning, "NetDbReq: ", dest->GetDestination ().ToBase64 (), " not found after 7 attempts");
+			ret = false;
+		}
+		return ret;
+	}	
 }
 }

libi2pd/NetDbRequests.h

@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2020, The PurpleI2P Project
+* Copyright (c) 2013-2024, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -9,9 +9,10 @@
 #ifndef NETDB_REQUESTS_H__
 #define NETDB_REQUESTS_H__
 
+#include <inttypes.h>
 #include <memory>
 #include <set>
-#include <map>
+#include <unordered_map>
 #include "Identity.h"
 #include "RouterInfo.h"
 
@@ -19,14 +20,18 @@ namespace i2p
 {
 namespace data
 {
+	const size_t MAX_NUM_REQUEST_ATTEMPTS = 7;
+	const uint64_t MIN_REQUEST_TIME = 5; // in seconds
+	const uint64_t MAX_REQUEST_TIME = 60; // in seconds
+	
 	class RequestedDestination
 	{
 		public:
 
 			typedef std::function<void (std::shared_ptr<RouterInfo>)> RequestComplete;
 
-			RequestedDestination (const IdentHash& destination, bool isExploratory = false):
+			RequestedDestination (const IdentHash& destination, bool isExploratory = false, bool direct = true):
-				m_Destination (destination), m_IsExploratory (isExploratory), m_CreationTime (0) {};
+				m_Destination (destination), m_IsExploratory (isExploratory), m_IsDirect (direct), m_CreationTime (0) {};
 			~RequestedDestination () { if (m_RequestComplete) m_RequestComplete (nullptr); };
 
 			const IdentHash& GetDestination () const { return m_Destination; };
@@ -34,6 +39,7 @@ namespace data
 			const std::set<IdentHash>& GetExcludedPeers () { return m_ExcludedPeers; };
 			void ClearExcludedPeers ();
 			bool IsExploratory () const { return m_IsExploratory; };
+			bool IsDirect () const { return m_IsDirect; };
 			bool IsExcluded (const IdentHash& ident) const { return m_ExcludedPeers.count (ident); };
 			uint64_t GetCreationTime () const { return m_CreationTime; };
 			std::shared_ptr<I2NPMessage> CreateRequestMessage (std::shared_ptr<const RouterInfo>, std::shared_ptr<const i2p::tunnel::InboundTunnel> replyTunnel);
@@ -47,7 +53,7 @@ namespace data
 		private:
 
 			IdentHash m_Destination;
-			bool m_IsExploratory;
+			bool m_IsExploratory, m_IsDirect;
 			std::set<IdentHash> m_ExcludedPeers;
 			uint64_t m_CreationTime;
 			RequestComplete m_RequestComplete;
@@ -60,15 +66,17 @@ namespace data
 			void Start ();
 			void Stop ();
 
-			std::shared_ptr<RequestedDestination> CreateRequest (const IdentHash& destination, bool isExploratory, RequestedDestination::RequestComplete requestComplete = nullptr);
+			std::shared_ptr<RequestedDestination> CreateRequest (const IdentHash& destination, bool isExploratory, 
+				bool direct = false, RequestedDestination::RequestComplete requestComplete = nullptr);
 			void RequestComplete (const IdentHash& ident, std::shared_ptr<RouterInfo> r);
 			std::shared_ptr<RequestedDestination> FindRequest (const IdentHash& ident) const;
 			void ManageRequests ();
-
+			bool SendNextRequest (std::shared_ptr<RequestedDestination> dest);
+			
 		private:
 
 			mutable std::mutex m_RequestedDestinationsMutex;
-			std::map<IdentHash, std::shared_ptr<RequestedDestination> > m_RequestedDestinations;
+			std::unordered_map<IdentHash, std::shared_ptr<RequestedDestination> > m_RequestedDestinations;
 	};
 }
 }