From b500374f745a9a6382650aeb8c51287d79c1fb29 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Fri, 7 Mar 2025 13:33:17 -0500
Subject: [PATCH] recognize keys=shareddest

---
 libi2pd_client/ClientContext.cpp | 63 +++++++++++++++++++++-----------
 libi2pd_client/ClientContext.h   |  4 +-
 2 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/libi2pd_client/ClientContext.cpp b/libi2pd_client/ClientContext.cpp
index f103636e..aa322296 100644
--- a/libi2pd_client/ClientContext.cpp
+++ b/libi2pd_client/ClientContext.cpp
@@ -265,11 +265,15 @@ namespace client
 		}
 	}
 
-	bool ClientContext::LoadPrivateKeys (i2p::data::PrivateKeys& keys, const std::string& filename,
+	bool ClientContext::LoadPrivateKeys (i2p::data::PrivateKeys& keys, std::string_view filename,
 		i2p::data::SigningKeyType sigType, i2p::data::CryptoKeyType cryptoType)
 	{
-		static const std::string transient("transient");
+#if __cplusplus >= 202002L // C++20
+		if (filename.starts_with ("transient"))
+#else		
+		std::string_view transient("transient");
 		if (!filename.compare (0, transient.length (), transient)) // starts with transient
+#endif			
 		{
 			keys = i2p::data::PrivateKeys::CreateRandomKeys (sigType, cryptoType, true);
 			LogPrint (eLogInfo, "Clients: New transient keys address ", m_AddressBook.ToAddress(keys.GetPublic ()->GetIdentHash ()), " created");
@@ -599,7 +603,9 @@ namespace client
 						options[I2CP_PARAM_OUTBOUND_NICKNAME] = name;
 
 					std::shared_ptr<ClientDestination> localDestination = nullptr;
-					if (keys.length () > 0)
+					if (keys == "shareddest")
+						localDestination = m_SharedLocalDestination;
+					else if (keys.length () > 0)
 					{
 						auto it = destinations.find (keys);
 						if (it != destinations.end ())
@@ -758,26 +764,31 @@ namespace client
 						options[I2CP_PARAM_INBOUND_NICKNAME] = name;
 
 					std::shared_ptr<ClientDestination> localDestination = nullptr;
-					auto it = destinations.find (keys);
-					if (it != destinations.end ())
-					{
-						localDestination = it->second;
-						localDestination->SetPublic (true);
-					}
+					if (keys == "shareddest")
+						localDestination = m_SharedLocalDestination;
 					else
-					{
-						i2p::data::PrivateKeys k;
-						if(!LoadPrivateKeys (k, keys, sigType, cryptoType))
-							continue;
-						localDestination = FindLocalDestination (k.GetPublic ()->GetIdentHash ());
-						if (!localDestination)
+					{	
+						auto it = destinations.find (keys);
+						if (it != destinations.end ())
 						{
-							localDestination = CreateNewLocalDestination (k, true, &options);
-							destinations[keys] = localDestination;
+							localDestination = it->second;
+							localDestination->SetPublic (true);
 						}
 						else
-							localDestination->SetPublic (true);
-					}
+						{
+							i2p::data::PrivateKeys k;
+							if(!LoadPrivateKeys (k, keys, sigType, cryptoType))
+								continue;
+							localDestination = FindLocalDestination (k.GetPublic ()->GetIdentHash ());
+							if (!localDestination)
+							{
+								localDestination = CreateNewLocalDestination (k, true, &options);
+								destinations[keys] = localDestination;
+							}
+							else
+								localDestination->SetPublic (true);
+						}
+					}	
 					if (type == I2P_TUNNELS_SECTION_TYPE_UDPSERVER)
 					{
 						// udp server tunnel
@@ -897,7 +908,12 @@ namespace client
 				i2p::config::GetOption("addressbook.enabled", httpAddresshelper); // addresshelper is not supported without address book
 			i2p::data::SigningKeyType sigType; i2p::config::GetOption("httpproxy.signaturetype", sigType);
 			LogPrint(eLogInfo, "Clients: Starting HTTP Proxy at ", httpProxyAddr, ":", httpProxyPort);
-			if (httpProxyKeys.length () > 0)
+			if (httpProxyKeys == "shareddest")
+			{
+				localDestination = m_SharedLocalDestination;
+				localDestination->Acquire ();
+			}
+			else if (httpProxyKeys.length () > 0)
 			{
 				i2p::data::PrivateKeys keys;
 				if(LoadPrivateKeys (keys, httpProxyKeys, sigType))
@@ -941,7 +957,12 @@ namespace client
 			uint16_t    socksOutProxyPort;     i2p::config::GetOption("socksproxy.outproxyport",     socksOutProxyPort);
 			i2p::data::SigningKeyType sigType; i2p::config::GetOption("socksproxy.signaturetype",    sigType);
 			LogPrint(eLogInfo, "Clients: Starting SOCKS Proxy at ", socksProxyAddr, ":", socksProxyPort);
-			if (httpProxyKeys == socksProxyKeys && m_HttpProxy)
+			if (socksProxyKeys == "shareddest")
+			{
+				localDestination = m_SharedLocalDestination;
+				localDestination->Acquire ();
+			}
+			else if (httpProxyKeys == socksProxyKeys && m_HttpProxy)
 			{
 				localDestination = m_HttpProxy->GetLocalDestination ();
 				localDestination->Acquire ();
diff --git a/libi2pd_client/ClientContext.h b/libi2pd_client/ClientContext.h
index febd5f16..3f7eaf9a 100644
--- a/libi2pd_client/ClientContext.h
+++ b/libi2pd_client/ClientContext.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013-2024, The PurpleI2P Project
+* Copyright (c) 2013-2025, The PurpleI2P Project
 *
 * This file is part of Purple i2pd project and licensed under BSD3
 *
@@ -92,7 +92,7 @@ namespace client
 				const std::string & name, const std::map<std::string, std::string> * params = nullptr);
 			void DeleteLocalDestination (std::shared_ptr<ClientDestination> destination);
 			std::shared_ptr<ClientDestination> FindLocalDestination (const i2p::data::IdentHash& destination) const;
-			bool LoadPrivateKeys (i2p::data::PrivateKeys& keys, const std::string& filename,
+			bool LoadPrivateKeys (i2p::data::PrivateKeys& keys, std::string_view filename,
 				i2p::data::SigningKeyType sigType = i2p::data::SIGNING_KEY_TYPE_EDDSA_SHA512_ED25519,
 				i2p::data::CryptoKeyType cryptoType = i2p::data::CRYPTO_KEY_TYPE_ELGAMAL);