TransitTunnelParticipant

TransitTunnel.cpp

@@ -15,7 +15,7 @@ namespace tunnel
 	    const uint8_t * nextIdent, uint32_t nextTunnelID, 
 		const uint8_t * layerKey,const uint8_t * ivKey): 
 			m_TunnelID (receiveTunnelID),  m_NextTunnelID (nextTunnelID), 
-			m_NextIdent (nextIdent), m_NumTransmittedBytes (0)
+			m_NextIdent (nextIdent)
 	{	
 		m_Encryption.SetKeys (layerKey, ivKey);
 	}	
@@ -24,25 +24,46 @@ namespace tunnel
 	{		
 		m_Encryption.Encrypt (tunnelMsg->GetPayload () + 4); 
 	}	
-	
-	void TransitTunnel::HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg)
+
+	TransitTunnelParticipant::~TransitTunnelParticipant ()
+	{
+		for (auto it: m_TunnelDataMsgs)
+			i2p::DeleteI2NPMessage (it);
+	}	
+		
+	void TransitTunnelParticipant::HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg)
 	{
 		EncryptTunnelMsg (tunnelMsg);
 		
-		LogPrint ("TransitTunnel: ",m_TunnelID,"->", m_NextTunnelID);
+		LogPrint (eLogDebug, "TransitTunnel: ",GetTunnelID (),"->", GetNextTunnelID ());
 		m_NumTransmittedBytes += tunnelMsg->GetLength ();
-		htobe32buf (tunnelMsg->GetPayload (), m_NextTunnelID);
+		htobe32buf (tunnelMsg->GetPayload (), GetNextTunnelID ());
 		FillI2NPMessageHeader (tunnelMsg, eI2NPTunnelData);
-		
-		i2p::transport::transports.SendMessage (m_NextIdent, tunnelMsg);	
+		m_TunnelDataMsgs.push_back (tunnelMsg);
 	}
 
+	void TransitTunnelParticipant::FlushTunnelDataMsgs ()
+	{
+		LogPrint (eLogDebug, "TransitTunnel: flush");
+		if (!m_TunnelDataMsgs.empty ())
+		{	
+			i2p::transport::transports.SendMessages (GetNextIdentHash (), m_TunnelDataMsgs);
+			m_TunnelDataMsgs.clear ();
+		}	
+	}	
+		
 	void TransitTunnel::SendTunnelDataMsg (i2p::I2NPMessage * msg)
 	{	
-		LogPrint ("We are not a gateway for transit tunnel ", m_TunnelID);
+		LogPrint (eLogError, "We are not a gateway for transit tunnel ", m_TunnelID);
 		i2p::DeleteI2NPMessage (msg);	
 	}		
 
+	void TransitTunnel::HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg)
+	{
+		LogPrint (eLogError, "Incoming tunnel message is not supported  ", m_TunnelID);
+		DeleteI2NPMessage (tunnelMsg);	
+	}	
+		
 	void TransitTunnelGateway::SendTunnelDataMsg (i2p::I2NPMessage * msg)
 	{
 		TunnelMessageBlock block;
@@ -56,7 +77,7 @@ namespace tunnel
 	{
 		EncryptTunnelMsg (tunnelMsg);
 		
-		LogPrint ("TransitTunnel endpoint for ", GetTunnelID ());
+		LogPrint (eLogDebug, "TransitTunnel endpoint for ", GetTunnelID ());
 		m_Endpoint.HandleDecryptedTunnelDataMsg (tunnelMsg); 
 	}
 		
@@ -67,18 +88,18 @@ namespace tunnel
 	{
 		if (isEndpoint)
 		{	
-			LogPrint ("TransitTunnel endpoint: ", receiveTunnelID, " created");
+			LogPrint (eLogInfo, "TransitTunnel endpoint: ", receiveTunnelID, " created");
 			return new TransitTunnelEndpoint (receiveTunnelID, nextIdent, nextTunnelID, layerKey, ivKey);
 		}	
 		else if (isGateway)
 		{	
-			LogPrint ("TransitTunnel gateway: ", receiveTunnelID, " created");
+			LogPrint (eLogInfo, "TransitTunnel gateway: ", receiveTunnelID, " created");
 			return new TransitTunnelGateway (receiveTunnelID, nextIdent, nextTunnelID, layerKey, ivKey);
 		}	
 		else	
 		{	
-			LogPrint ("TransitTunnel: ", receiveTunnelID, "->", nextTunnelID, " created");
-			return new TransitTunnel (receiveTunnelID, nextIdent, nextTunnelID, layerKey, ivKey);
+			LogPrint (eLogInfo, "TransitTunnel: ", receiveTunnelID, "->", nextTunnelID, " created");
+			return new TransitTunnelParticipant (receiveTunnelID, nextIdent, nextTunnelID, layerKey, ivKey);
 		}	
 	}		
 }

TransitTunnel.h

@@ -2,6 +2,7 @@
 #define TRANSIT_TUNNEL_H__
 
 #include <inttypes.h>
+#include <vector>
 #include <mutex>
 #include "aes.h"
 #include "I2NPProtocol.h"
@@ -13,7 +14,7 @@ namespace i2p
 {
 namespace tunnel
 {	
-	class TransitTunnel: public TunnelBase // tunnel patricipant
+	class TransitTunnel: public TunnelBase 
 	{
 		public:
 
@@ -22,7 +23,7 @@ namespace tunnel
 	    		const uint8_t * layerKey,const uint8_t * ivKey); 
 			
 			virtual void SendTunnelDataMsg (i2p::I2NPMessage * msg);
-			virtual size_t GetNumTransmittedBytes () const { return m_NumTransmittedBytes; };
+			virtual size_t GetNumTransmittedBytes () const { return 0; };
 			
 			uint32_t GetTunnelID () const { return m_TunnelID; };
 
@@ -36,11 +37,31 @@ namespace tunnel
 
 			uint32_t m_TunnelID, m_NextTunnelID;
 			i2p::data::IdentHash m_NextIdent;
-			size_t m_NumTransmittedBytes;
 			
 			i2p::crypto::TunnelEncryption m_Encryption;
 	};	
 
+	class TransitTunnelParticipant: public TransitTunnel
+	{
+		public:
+
+			TransitTunnelParticipant (uint32_t receiveTunnelID,
+			    const uint8_t * nextIdent, uint32_t nextTunnelID, 
+	    		const uint8_t * layerKey,const uint8_t * ivKey):
+				TransitTunnel (receiveTunnelID, nextIdent, nextTunnelID, 
+				layerKey, ivKey), m_NumTransmittedBytes (0) {};
+			~TransitTunnelParticipant ();
+
+			size_t GetNumTransmittedBytes () const { return m_NumTransmittedBytes; };
+			void HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg);
+			void FlushTunnelDataMsgs ();
+
+		private:
+
+			size_t m_NumTransmittedBytes;
+			std::vector<i2p::I2NPMessage *> m_TunnelDataMsgs;
+	};	
+	
 	class TransitTunnelGateway: public TransitTunnel
 	{
 		public:

Tunnel.cpp

@@ -347,32 +347,41 @@ namespace tunnel
 			try
 			{	
 				I2NPMessage * msg = m_Queue.GetNextWithTimeout (1000); // 1 sec
-				uint32_t prevTunnelID = 0;
-				TunnelBase * prevTunnel = nullptr;
-				while (msg)
-				{
-					uint32_t tunnelID = bufbe32toh (msg->GetPayload ()); 
-					TunnelBase * tunnel = nullptr;
-					if (tunnelID == prevTunnelID)
-						tunnel = prevTunnel;
-					if (!tunnel)
-						tunnel = GetInboundTunnel (tunnelID);
-					if (!tunnel)
-						tunnel = GetTransitTunnel (tunnelID);
-					if (tunnel)
-						tunnel->HandleTunnelDataMsg (msg);
-					else	
-					{	
-						LogPrint ("Tunnel ", tunnelID, " not found");
-						DeleteI2NPMessage (msg);
-					}	
-
-					msg = m_Queue.Get ();
-					if (msg)
+				if (msg)
+				{	
+					uint32_t prevTunnelID = 0;
+					TunnelBase * prevTunnel = nullptr;
+					do
 					{
-						prevTunnelID = tunnelID;
-						prevTunnel = tunnel;
+						uint32_t tunnelID = bufbe32toh (msg->GetPayload ()); 
+						TunnelBase * tunnel = nullptr;
+						if (tunnelID == prevTunnelID)
+							tunnel = prevTunnel;
+						else if (prevTunnel)
+							prevTunnel->FlushTunnelDataMsgs (); 
+						
+						if (!tunnel)
+							tunnel = GetInboundTunnel (tunnelID);
+						if (!tunnel)
+							tunnel = GetTransitTunnel (tunnelID);
+						if (tunnel)
+							tunnel->HandleTunnelDataMsg (msg);
+						else	
+						{	
+							LogPrint ("Tunnel ", tunnelID, " not found");
+							DeleteI2NPMessage (msg);
+						}	
+
+						msg = m_Queue.Get ();
+						if (msg)
+						{
+							prevTunnelID = tunnelID;
+							prevTunnel = tunnel;
+						}
+						else if (tunnel)
+							tunnel->FlushTunnelDataMsgs ();
 					}
+					while (msg);
 				}	
 			
 				uint64_t ts = i2p::util::GetSecondsSinceEpoch ();

TunnelBase.h

@@ -37,6 +37,7 @@ namespace tunnel
 			virtual ~TunnelBase () {};
 			
 			virtual void HandleTunnelDataMsg (i2p::I2NPMessage * tunnelMsg) = 0;
+			virtual void FlushTunnelDataMsgs () {};
 			virtual void EncryptTunnelMsg (I2NPMessage * tunnelMsg) = 0;
 			virtual uint32_t GetNextTunnelID () const = 0;
 			virtual const i2p::data::IdentHash& GetNextIdentHash () const = 0;