use shared_ptr for I2NP messages through tunnels

kytvi2p · Jun 19, 2015 · 4ed7e29 · 4ed7e29
1 parent 122b8c2
commit 4ed7e29
Show file tree

Hide file tree

Showing 16 changed files with 75 additions and 127 deletions.
diff --git a/Datagram.cpp b/Datagram.cpp
@@ -65,7 +65,7 @@ namespace datagram
 				{ 
 					i2p::tunnel::eDeliveryTypeTunnel,
 					leases[i].tunnelGateway, leases[i].tunnelID,
-					garlic
+					ToSharedI2NPMessage (garlic)
 				});
 			outboundTunnel->SendTunnelDataMsg (msgs);
 		}

diff --git a/Destination.cpp b/Destination.cpp
@@ -240,7 +240,7 @@ namespace client
 				HandleDatabaseSearchReplyMessage (buf + I2NP_HEADER_SIZE, bufbe16toh (buf + I2NP_HEADER_SIZE_OFFSET));
 			break;	
 			default:
-				i2p::HandleI2NPMessage (CreateI2NPMessage (buf, GetI2NPMessageLength (buf), from));
+				i2p::HandleI2NPMessage (ToSharedI2NPMessage (CreateI2NPMessage (buf, GetI2NPMessageLength (buf), from)));
 		}		
 	}	
 
@@ -589,7 +589,7 @@ namespace client
 					i2p::tunnel::TunnelMessageBlock 
 					{ 
 						i2p::tunnel::eDeliveryTypeRouter,
-						nextFloodfill->GetIdentHash (), 0, msg
+						nextFloodfill->GetIdentHash (), 0, ToSharedI2NPMessage (msg)
 					}
 				});	
 			request->requestTimeoutTimer.expires_from_now (boost::posix_time::seconds(LEASESET_REQUEST_TIMEOUT));

diff --git a/I2NPProtocol.cpp b/I2NPProtocol.cpp
@@ -445,7 +445,7 @@ namespace i2p
 		return msg;
 	}	
 
-	I2NPMessage * CreateTunnelGatewayMsg (uint32_t tunnelID, I2NPMessage * msg)
+	std::shared_ptr<I2NPMessage> CreateTunnelGatewayMsg (uint32_t tunnelID, std::shared_ptr<I2NPMessage> msg)
 	{
 		if (msg->offset >= I2NP_HEADER_SIZE + TUNNEL_GATEWAY_HEADER_SIZE)
 		{
@@ -456,14 +456,13 @@ namespace i2p
 			htobe16buf (payload + TUNNEL_GATEWAY_HEADER_LENGTH_OFFSET, len);
 			msg->offset -= (I2NP_HEADER_SIZE + TUNNEL_GATEWAY_HEADER_SIZE);
 			msg->len = msg->offset + I2NP_HEADER_SIZE + TUNNEL_GATEWAY_HEADER_SIZE +len;
-			FillI2NPMessageHeader (msg, eI2NPTunnelGateway);
+			FillI2NPMessageHeader (msg.get(), eI2NPTunnelGateway); // TODO
 			return msg;
 		}
 		else
 		{	
 			I2NPMessage * msg1 = CreateTunnelGatewayMsg (tunnelID, msg->GetBuffer (), msg->GetLength ());
-			DeleteI2NPMessage (msg);
-			return msg1;
+			return ToSharedI2NPMessage (msg1);
 		}	                               
 	}
 
@@ -522,7 +521,7 @@ namespace i2p
 		}	
 	}
 
-	void HandleI2NPMessage (I2NPMessage * msg)
+	void HandleI2NPMessage (std::shared_ptr<I2NPMessage> msg)
 	{
 		if (msg)
 		{	
@@ -539,32 +538,30 @@ namespace i2p
 				case eI2NPGarlic:
 				{
 					LogPrint ("Garlic");
-					auto sharedMsg = ToSharedI2NPMessage (msg);
 					if (msg->from)
 					{
 						if (msg->from->GetTunnelPool ())
-							msg->from->GetTunnelPool ()->ProcessGarlicMessage (sharedMsg);
+							msg->from->GetTunnelPool ()->ProcessGarlicMessage (msg);
 						else
 							LogPrint (eLogInfo, "Local destination for garlic doesn't exist anymore");
 					}
 					else
-						i2p::context.ProcessGarlicMessage (sharedMsg); 
+						i2p::context.ProcessGarlicMessage (msg); 
 					break;
 				}
 				case eI2NPDatabaseStore:
 				case eI2NPDatabaseSearchReply:
 				case eI2NPDatabaseLookup:
 					// forward to netDb
-					i2p::data::netdb.PostI2NPMsg (ToSharedI2NPMessage (msg));
+					i2p::data::netdb.PostI2NPMsg (msg);
 				break;
 				case eI2NPDeliveryStatus:
 				{
 					LogPrint ("DeliveryStatus");
-					auto sharedMsg = ToSharedI2NPMessage (msg);
 					if (msg->from && msg->from->GetTunnelPool ())
-						msg->from->GetTunnelPool ()->ProcessDeliveryStatus (sharedMsg);
+						msg->from->GetTunnelPool ()->ProcessDeliveryStatus (msg);
 					else
-						i2p::context.ProcessDeliveryStatusMessage (sharedMsg);
+						i2p::context.ProcessDeliveryStatusMessage (msg);
 					break;	
 				}
 				case eI2NPVariableTunnelBuild:		
@@ -576,7 +573,6 @@ namespace i2p
 				break;	
 				default:
 					HandleI2NPMessage (msg->GetBuffer (), msg->GetLength ());
-					DeleteI2NPMessage (msg);
 			}	
 		}	
 	}	
@@ -586,20 +582,20 @@ namespace i2p
 		Flush ();
 	}
 
-	void I2NPMessagesHandler::PutNextMessage (I2NPMessage * msg)
+	void I2NPMessagesHandler::PutNextMessage (I2NPMessage *  msg)
 	{
 		if (msg)
 		{
 			switch (msg->GetTypeID ())
 			{	
 				case eI2NPTunnelData:
-					m_TunnelMsgs.push_back (msg);
+					m_TunnelMsgs.push_back (ToSharedI2NPMessage (msg));
 				break;
 				case eI2NPTunnelGateway:	
-					m_TunnelGatewayMsgs.push_back (msg);
+					m_TunnelGatewayMsgs.push_back (ToSharedI2NPMessage (msg));
 				break;	
 				default:
-					HandleI2NPMessage (msg);
+					HandleI2NPMessage (ToSharedI2NPMessage (msg));
 			}		
 		}	
 	}

diff --git a/I2NPProtocol.h b/I2NPProtocol.h
@@ -225,11 +225,11 @@ namespace tunnel
 	I2NPMessage * CreateTunnelGatewayMsg (uint32_t tunnelID, const uint8_t * buf, size_t len);
 	I2NPMessage * CreateTunnelGatewayMsg (uint32_t tunnelID, I2NPMessageType msgType, 
 		const uint8_t * buf, size_t len, uint32_t replyMsgID = 0);
-	I2NPMessage * CreateTunnelGatewayMsg (uint32_t tunnelID, I2NPMessage * msg);
+	std::shared_ptr<I2NPMessage> CreateTunnelGatewayMsg (uint32_t tunnelID, std::shared_ptr<I2NPMessage> msg);
 
 	size_t GetI2NPMessageLength (const uint8_t * msg);
 	void HandleI2NPMessage (uint8_t * msg, size_t len);
-	void HandleI2NPMessage (I2NPMessage * msg);
+	void HandleI2NPMessage (std::shared_ptr<I2NPMessage> msg);
 
 	class I2NPMessagesHandler
 	{
@@ -241,7 +241,7 @@ namespace tunnel
 
 		private:
 
-			std::vector<I2NPMessage *> m_TunnelMsgs, m_TunnelGatewayMsgs;
+			std::vector<std::shared_ptr<I2NPMessage> > m_TunnelMsgs, m_TunnelGatewayMsgs;
 	};
 }	
 

diff --git a/NetDb.cpp b/NetDb.cpp
@@ -597,7 +597,7 @@ namespace data
 									{ 
 										i2p::tunnel::eDeliveryTypeRouter,
 										nextFloodfill->GetIdentHash (), 0,
-										CreateDatabaseStoreMsg () 
+										ToSharedI2NPMessage (CreateDatabaseStoreMsg ()) 
 									});  
 
 								// request destination
@@ -606,7 +606,7 @@ namespace data
 								msgs.push_back (i2p::tunnel::TunnelMessageBlock 
 									{ 
 										i2p::tunnel::eDeliveryTypeRouter,
-										nextFloodfill->GetIdentHash (), 0, msg
+										nextFloodfill->GetIdentHash (), 0, ToSharedI2NPMessage (msg)
 									});
 								deleteDest = false;
 							}	
@@ -763,7 +763,7 @@ namespace data
 				if (outbound)
 					outbound->SendTunnelDataMsg (buf+32, replyTunnelID, replyMsg);
 				else
-					transports.SendMessage (buf+32, i2p::CreateTunnelGatewayMsg (replyTunnelID, replyMsg));
+					transports.SendMessage (buf+32, i2p::CreateTunnelGatewayMsg (replyTunnelID, ToSharedI2NPMessage(replyMsg)));
 			}
 			else
 				transports.SendMessage (buf+32, replyMsg);
@@ -804,13 +804,13 @@ namespace data
 						{ 
 							i2p::tunnel::eDeliveryTypeRouter,
 							floodfill->GetIdentHash (), 0,
-							CreateDatabaseStoreMsg () // tell floodfill about us 
+							ToSharedI2NPMessage (CreateDatabaseStoreMsg ()) // tell floodfill about us 
 						});  
 					msgs.push_back (i2p::tunnel::TunnelMessageBlock 
 						{ 
 							i2p::tunnel::eDeliveryTypeRouter,
 							floodfill->GetIdentHash (), 0, 
-							dest->CreateRequestMessage (floodfill, inbound) // explore
+							ToSharedI2NPMessage (dest->CreateRequestMessage (floodfill, inbound)) // explore
 						}); 
 				}	
 				else

diff --git a/RouterContext.cpp b/RouterContext.cpp
@@ -296,7 +296,7 @@ namespace i2p
 
 	void RouterContext::HandleI2NPMessage (const uint8_t * buf, size_t len, std::shared_ptr<i2p::tunnel::InboundTunnel> from)
 	{
-		i2p::HandleI2NPMessage (CreateI2NPMessage (buf, GetI2NPMessageLength (buf), from));
+		i2p::HandleI2NPMessage (ToSharedI2NPMessage(CreateI2NPMessage (buf, GetI2NPMessageLength (buf), from)));
 	}
 
 	void RouterContext::ProcessGarlicMessage (std::shared_ptr<I2NPMessage> msg)

diff --git a/Streaming.cpp b/Streaming.cpp
@@ -617,7 +617,7 @@ namespace stream
 					{ 
 						i2p::tunnel::eDeliveryTypeTunnel,
 						m_CurrentRemoteLease.tunnelGateway, m_CurrentRemoteLease.tunnelID,
-						msg
+						ToSharedI2NPMessage (msg)
 					});	
 				m_NumSentBytes += it->GetLength ();
 			}

diff --git a/TransitTunnel.cpp b/TransitTunnel.cpp
@@ -20,7 +20,7 @@ namespace tunnel
 		m_Encryption.SetKeys (layerKey, ivKey);
 	}	
 
-	void TransitTunnel::EncryptTunnelMsg (I2NPMessage * tunnelMsg)
+	void TransitTunnel::EncryptTunnelMsg (std::shared_ptr<I2NPMessage> tunnelMsg)
 	{		
 		m_Encryption.Encrypt (tunnelMsg->GetPayload () + 4); 
 	}	
@@ -29,14 +29,14 @@ namespace tunnel
 	{
 	}	
 
-	void TransitTunnelParticipant::HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg)
+	void TransitTunnelParticipant::HandleTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> tunnelMsg)
 	{
 		EncryptTunnelMsg (tunnelMsg);
 
 		m_NumTransmittedBytes += tunnelMsg->GetLength ();
 		htobe32buf (tunnelMsg->GetPayload (), GetNextTunnelID ());
-		FillI2NPMessageHeader (tunnelMsg, eI2NPTunnelData);
-		m_TunnelDataMsgs.push_back (ToSharedI2NPMessage (tunnelMsg));
+		FillI2NPMessageHeader (tunnelMsg.get (), eI2NPTunnelData); // TODO
+		m_TunnelDataMsgs.push_back (tunnelMsg);
 	}
 
 	void TransitTunnelParticipant::FlushTunnelDataMsgs ()
@@ -51,19 +51,17 @@ namespace tunnel
 		}	
 	}	
 
-	void TransitTunnel::SendTunnelDataMsg (i2p::I2NPMessage * msg)
+	void TransitTunnel::SendTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> msg)
 	{	
 		LogPrint (eLogError, "We are not a gateway for transit tunnel ", m_TunnelID);
-		i2p::DeleteI2NPMessage (msg);	
 	}		
 
-	void TransitTunnel::HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg)
+	void TransitTunnel::HandleTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> tunnelMsg)
 	{
 		LogPrint (eLogError, "Incoming tunnel message is not supported  ", m_TunnelID);
-		DeleteI2NPMessage (tunnelMsg);	
 	}	
 
-	void TransitTunnelGateway::SendTunnelDataMsg (i2p::I2NPMessage * msg)
+	void TransitTunnelGateway::SendTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> msg)
 	{
 		TunnelMessageBlock block;
 		block.deliveryType = eDeliveryTypeLocal;
@@ -78,7 +76,7 @@ namespace tunnel
 		m_Gateway.SendBuffer ();
 	}	
 
-	void TransitTunnelEndpoint::HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg)
+	void TransitTunnelEndpoint::HandleTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> tunnelMsg)
 	{
 		EncryptTunnelMsg (tunnelMsg);
 

diff --git a/TransitTunnel.h b/TransitTunnel.h
@@ -28,9 +28,9 @@ namespace tunnel
 			uint32_t GetTunnelID () const { return m_TunnelID; };
 
 			// implements TunnelBase
-			void SendTunnelDataMsg (i2p::I2NPMessage * msg);
-			void HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg);
-			void EncryptTunnelMsg (I2NPMessage * tunnelMsg); 
+			void SendTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> msg);
+			void HandleTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> tunnelMsg);
+			void EncryptTunnelMsg (std::shared_ptr<I2NPMessage> tunnelMsg); 
 			uint32_t GetNextTunnelID () const { return m_NextTunnelID; };
 			const i2p::data::IdentHash& GetNextIdentHash () const { return m_NextIdent; };
 
@@ -54,7 +54,7 @@ namespace tunnel
 			~TransitTunnelParticipant ();
 
 			size_t GetNumTransmittedBytes () const { return m_NumTransmittedBytes; };
-			void HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg);
+			void HandleTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> tunnelMsg);
 			void FlushTunnelDataMsgs ();
 
 		private:
@@ -73,7 +73,7 @@ namespace tunnel
 				TransitTunnel (receiveTunnelID, nextIdent, nextTunnelID, 
 				layerKey, ivKey), m_Gateway(this) {};
 
-			void SendTunnelDataMsg (i2p::I2NPMessage * msg);
+			void SendTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> msg);
 			void FlushTunnelDataMsgs ();
 			size_t GetNumTransmittedBytes () const { return m_Gateway.GetNumSentBytes (); };
 
@@ -93,7 +93,7 @@ namespace tunnel
 				TransitTunnel (receiveTunnelID, nextIdent, nextTunnelID, layerKey, ivKey),
 				m_Endpoint (false) {}; // transit endpoint is always outbound
 
-			void HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg);
+			void HandleTunnelDataMsg (std::shared_ptr<i2p::I2NPMessage> tunnelMsg);
 			size_t GetNumTransmittedBytes () const { return m_Endpoint.GetNumReceivedBytes (); }
 
 		private:

diff --git a/Transports.cpp b/Transports.cpp
@@ -242,12 +242,7 @@ namespace transport
 		{	
 			// we send it to ourself
 			for (auto it: msgs)
-			{
-				// TODO:
-				auto m = NewI2NPMessage ();
-				*m = *(it);
-				i2p::HandleI2NPMessage (m);
-			}
+				i2p::HandleI2NPMessage (it);
 			return;
 		}	
 		auto it = m_Peers.find (ident);