From ff12421d60a75c122fe76e2ef6a852246329549e Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Mon, 22 Jun 2015 15:47:45 -0400
Subject: [PATCH]  shared_ptr for lookup messages

---
 NetDb.cpp         | 4 ++--
 NetDbRequests.cpp | 6 +++---
 NetDbRequests.h   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/NetDb.cpp b/NetDb.cpp
index 90dcfc96..8abb317e 100644
--- a/NetDb.cpp
+++ b/NetDb.cpp
@@ -590,7 +590,7 @@ namespace data
 								msgs.push_back (i2p::tunnel::TunnelMessageBlock 
 									{ 
 										i2p::tunnel::eDeliveryTypeRouter,
-										nextFloodfill->GetIdentHash (), 0, ToSharedI2NPMessage (msg)
+										nextFloodfill->GetIdentHash (), 0, msg
 									});
 								deleteDest = false;
 							}	
@@ -794,7 +794,7 @@ namespace data
 						{ 
 							i2p::tunnel::eDeliveryTypeRouter,
 							floodfill->GetIdentHash (), 0, 
-							ToSharedI2NPMessage (dest->CreateRequestMessage (floodfill, inbound)) // explore
+							dest->CreateRequestMessage (floodfill, inbound) // explore
 						}); 
 				}	
 				else
diff --git a/NetDbRequests.cpp b/NetDbRequests.cpp
index 670070fd..5f4a3e75 100644
--- a/NetDbRequests.cpp
+++ b/NetDbRequests.cpp
@@ -8,7 +8,7 @@ namespace i2p
 {
 namespace data
 {
-	I2NPMessage * RequestedDestination::CreateRequestMessage (std::shared_ptr<const RouterInfo> router,
+	std::shared_ptr<I2NPMessage> RequestedDestination::CreateRequestMessage (std::shared_ptr<const RouterInfo> router,
 		std::shared_ptr<const i2p::tunnel::InboundTunnel> replyTunnel)
 	{
 		I2NPMessage * msg = i2p::CreateRouterInfoDatabaseLookupMsg (m_Destination, 
@@ -16,7 +16,7 @@ namespace data
 		    &m_ExcludedPeers);
 		m_ExcludedPeers.insert (router->GetIdentHash ());
 		m_CreationTime = i2p::util::GetSecondsSinceEpoch ();
-		return msg;
+		return ToSharedI2NPMessage (msg);
 	}	
 
 	std::shared_ptr<I2NPMessage> RequestedDestination::CreateRequestMessage (const IdentHash& floodfill)
@@ -118,7 +118,7 @@ namespace data
 						auto nextFloodfill = netdb.GetClosestFloodfill (dest->GetDestination (), dest->GetExcludedPeers ());
 						if (nextFloodfill && outbound && inbound)
 							outbound->SendTunnelDataMsg (nextFloodfill->GetIdentHash (), 0,
-								ToSharedI2NPMessage (dest->CreateRequestMessage (nextFloodfill, inbound)));
+								dest->CreateRequestMessage (nextFloodfill, inbound));
 						else
 						{
 							done = true;
diff --git a/NetDbRequests.h b/NetDbRequests.h
index 9dc49b26..0bab7080 100644
--- a/NetDbRequests.h
+++ b/NetDbRequests.h
@@ -28,7 +28,7 @@ namespace data
 			bool IsExploratory () const { return m_IsExploratory; };
 			bool IsExcluded (const IdentHash& ident) const { return m_ExcludedPeers.count (ident); };
 			uint64_t GetCreationTime () const { return m_CreationTime; };
-			I2NPMessage * CreateRequestMessage (std::shared_ptr<const RouterInfo>, std::shared_ptr<const i2p::tunnel::InboundTunnel> replyTunnel);
+			std::shared_ptr<I2NPMessage> CreateRequestMessage (std::shared_ptr<const RouterInfo>, std::shared_ptr<const i2p::tunnel::InboundTunnel> replyTunnel);
 			std::shared_ptr<I2NPMessage> CreateRequestMessage (const IdentHash& floodfill);
 			
 			void SetRequestComplete (const RequestComplete& requestComplete) { m_RequestComplete = requestComplete; };