From 4afdca090d33ba2d2bb390e46637ba42aa42fc5d Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Sun, 14 Jan 2024 18:54:21 -0500
Subject: [PATCH] support multiple RouterInfo request callbacks

---
 libi2pd/NetDbRequests.cpp | 20 +++++++++++++++++++-
 libi2pd/NetDbRequests.h   |  1 +
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/libi2pd/NetDbRequests.cpp b/libi2pd/NetDbRequests.cpp
index 2cb578e2..167095d7 100644
--- a/libi2pd/NetDbRequests.cpp
+++ b/libi2pd/NetDbRequests.cpp
@@ -83,8 +83,26 @@ namespace data
 		dest->SetRequestComplete (requestComplete);
 		{
 			std::unique_lock<std::mutex> l(m_RequestedDestinationsMutex); 
-			if (!m_RequestedDestinations.emplace (destination, dest).second) // not inserted
+			auto ret = m_RequestedDestinations.emplace (destination, dest);
+			if (!ret.second) // not inserted
+			{	
+				dest->SetRequestComplete (nullptr); // don't call requestComplete in destructor	
+				if (requestComplete)
+				{	
+					auto prev = ret.first->second->GetRequestComplete ();  
+					if (prev) // if already set 	
+						ret.first->second->SetRequestComplete (
+							[requestComplete, prev](std::shared_ptr<RouterInfo> r)
+							{
+								prev (r); // call previous
+								requestComplete (r); // then new
+							});
+					else
+						ret.first->second->SetRequestComplete (requestComplete);
+				}
+				
 				return nullptr;
+			}	
 		}
 		return dest;
 	}
diff --git a/libi2pd/NetDbRequests.h b/libi2pd/NetDbRequests.h
index a4d1cf21..001b0f07 100644
--- a/libi2pd/NetDbRequests.h
+++ b/libi2pd/NetDbRequests.h
@@ -46,6 +46,7 @@ namespace data
 			std::shared_ptr<I2NPMessage> CreateRequestMessage (const IdentHash& floodfill);
 
 			void SetRequestComplete (const RequestComplete& requestComplete) { m_RequestComplete = requestComplete; };
+			RequestComplete GetRequestComplete () const { return m_RequestComplete; };
 			bool IsRequestComplete () const { return m_RequestComplete != nullptr; };
 			void Success (std::shared_ptr<RouterInfo> r);
 			void Fail ();