moved transports to 'transport' namespace

evmarkov · Oct 21, 2014 · 7b768cc · 7b768cc
1 parent 165af09
commit 7b768cc
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 63 deletions.
diff --git a/Daemon.cpp b/Daemon.cpp
@@ -103,7 +103,7 @@ namespace i2p
 			LogPrint("HTTP Server started");
 			i2p::data::netdb.Start();
 			LogPrint("NetDB started");
-			i2p::transports.Start();
+			i2p::transport::transports.Start();
 			LogPrint("Transports started");
 			i2p::tunnel::tunnels.Start();
 			LogPrint("Tunnels started");
@@ -120,7 +120,7 @@ namespace i2p
 			LogPrint("Client stoped");
 			i2p::tunnel::tunnels.Stop();
 			LogPrint("Tunnels stoped");
-			i2p::transports.Stop();
+			i2p::transport::transports.Stop();
 			LogPrint("Transports stoped");
 			i2p::data::netdb.Stop();
 			LogPrint("NetDB stoped");

diff --git a/HTTPServer.cpp b/HTTPServer.cpp
@@ -699,7 +699,7 @@ namespace util
 	void HTTPConnection::ShowTransports (std::stringstream& s)
 	{
 		s << "NTCP<br>";
-		for (auto it: i2p::transports.GetNTCPSessions ())
+		for (auto it: i2p::transport::transports.GetNTCPSessions ())
 		{
 			// RouterInfo of incoming connection doesn't have address
 			bool outgoing = it.second->GetRemoteRouterInfo ().GetNTCPAddress ();
@@ -714,7 +714,7 @@ namespace util
 			}
 			s << std::endl;
 		}
-		auto ssuServer = i2p::transports.GetSSUServer ();
+		auto ssuServer = i2p::transport::transports.GetSSUServer ();
 		if (ssuServer)
 		{
 			s << "<br>SSU<br>";

diff --git a/I2NPProtocol.cpp b/I2NPProtocol.cpp
@@ -13,9 +13,10 @@
 #include "Garlic.h"
 #include "I2NPProtocol.h"
 
+using namespace i2p::transport;
+
 namespace i2p
 {
-
 	I2NPMessage * NewI2NPMessage ()
 	{
 		return new I2NPMessageBuffer<I2NP_MAX_MESSAGE_SIZE>();
@@ -353,13 +354,13 @@ namespace i2p
 				if (clearText.flag & 0x40) // we are endpoint of outboud tunnel
 				{
 					// so we send it to reply tunnel 
-					i2p::transports.SendMessage (clearText.nextIdent, 
+					transports.SendMessage (clearText.nextIdent, 
 						CreateTunnelGatewayMsg (be32toh (clearText.nextTunnel),
 							eI2NPVariableTunnelBuildReply, buf, len, 
 						    be32toh (clearText.nextMessageID)));                         
 				}	
 				else	
-					i2p::transports.SendMessage (clearText.nextIdent, 
+					transports.SendMessage (clearText.nextIdent, 
 						CreateI2NPMessage (eI2NPVariableTunnelBuild, buf, len, be32toh (clearText.nextMessageID)));
 			}	
 		}	
@@ -373,13 +374,13 @@ namespace i2p
 			if (clearText.flag & 0x40) // we are endpoint of outbound tunnel
 			{
 				// so we send it to reply tunnel 
-				i2p::transports.SendMessage (clearText.nextIdent, 
+				transports.SendMessage (clearText.nextIdent, 
 					CreateTunnelGatewayMsg (be32toh (clearText.nextTunnel),
 						eI2NPTunnelBuildReply, buf, len, 
 					    be32toh (clearText.nextMessageID)));                         
 			}	
 			else	
-				i2p::transports.SendMessage (clearText.nextIdent, 
+				transports.SendMessage (clearText.nextIdent, 
 					CreateI2NPMessage (eI2NPTunnelBuild, buf, len, be32toh (clearText.nextMessageID)));
 		} 
 	}

diff --git a/NTCPSession.cpp b/NTCPSession.cpp
@@ -17,14 +17,14 @@ using namespace i2p::crypto;
 
 namespace i2p
 {
-namespace ntcp
+namespace transport
 {
 	NTCPSession::NTCPSession (boost::asio::io_service& service, i2p::data::RouterInfo& in_RemoteRouterInfo): 
 		m_Socket (service), m_TerminationTimer (service), m_IsEstablished (false),  
 		m_RemoteRouterInfo (in_RemoteRouterInfo), m_ReceiveBufferOffset (0), 
 		m_NextMessage (nullptr), m_NumSentBytes (0), m_NumReceivedBytes (0)
 	{		
-		m_DHKeysPair = i2p::transports.GetNextDHKeysPair ();
+		m_DHKeysPair = transports.GetNextDHKeysPair ();
 		m_Establisher = new Establisher;
 	}
 
@@ -77,12 +77,12 @@ namespace ntcp
 	{
 		m_IsEstablished = false;
 		m_Socket.close ();
-		i2p::transports.RemoveNTCPSession (this);
+		transports.RemoveNTCPSession (this);
 		int numDelayed = 0;
 		for (auto it :m_DelayedMessages)
 		{	
 			// try to send them again
-			i2p::transports.SendMessage (m_RemoteRouterInfo.GetIdentHash (), it);
+			transports.SendMessage (m_RemoteRouterInfo.GetIdentHash (), it);
 			numDelayed++;
 		}	
 		m_DelayedMessages.clear ();
@@ -119,7 +119,7 @@ namespace ntcp
 	void NTCPSession::ClientLogin ()
 	{
 		if (!m_DHKeysPair)
-			m_DHKeysPair = i2p::transports.GetNextDHKeysPair ();
+			m_DHKeysPair = transports.GetNextDHKeysPair ();
 		// send Phase1
 		const uint8_t * x = m_DHKeysPair->publicKey;
 		memcpy (m_Establisher->phase1.pubKey, x, 256);
@@ -189,7 +189,7 @@ namespace ntcp
 	void NTCPSession::SendPhase2 ()
 	{
 		if (!m_DHKeysPair)
-			m_DHKeysPair = i2p::transports.GetNextDHKeysPair ();
+			m_DHKeysPair = transports.GetNextDHKeysPair ();
 		const uint8_t * y = m_DHKeysPair->publicKey;
 		memcpy (m_Establisher->phase2.pubKey, y, 256);
 		uint8_t xy[512];
@@ -238,7 +238,7 @@ namespace ntcp
 			if (ecode != boost::asio::error::operation_aborted)
 			{
 				GetRemoteRouterInfo ().SetUnreachable (true); // this RouterInfo is not valid
-				i2p::transports.ReuseDHKeysPair (m_DHKeysPair);
+				transports.ReuseDHKeysPair (m_DHKeysPair);
 				m_DHKeysPair = nullptr;
 				Terminate ();
 			}
@@ -263,7 +263,7 @@ namespace ntcp
 			if (memcmp (hxy, m_Establisher->phase2.encrypted.hxy, 32))
 			{
 				LogPrint ("Incorrect hash");
-				i2p::transports.ReuseDHKeysPair (m_DHKeysPair);
+				transports.ReuseDHKeysPair (m_DHKeysPair);
 				m_DHKeysPair = nullptr;
 				Terminate ();
 				return ;
@@ -635,7 +635,7 @@ namespace ntcp
 	{
 		LogPrint ("NTCP server session connected");
 		SetIsEstablished (true);
-		i2p::transports.AddNTCPSession (this);
+		transports.AddNTCPSession (this);
 
 		SendTimeSyncMessage ();
 		SendI2NPMessage (CreateDatabaseStoreMsg ()); // we tell immediately who we are		

diff --git a/NTCPSession.h b/NTCPSession.h
@@ -15,7 +15,7 @@
 
 namespace i2p
 {
-namespace ntcp
+namespace transport
 {
 
 #pragma pack(1)
@@ -67,7 +67,7 @@ namespace ntcp
 	const size_t NTCP_BUFFER_SIZE = 1040; // fits one tunnel message (1028)
 	const int NTCP_TERMINATION_TIMEOUT = 120; // 2 minutes
 
-	class NTCPSession: public i2p::transport::TransportSession
+	class NTCPSession: public TransportSession
 	{
 		public:
 

diff --git a/NetDb.cpp b/NetDb.cpp
@@ -15,6 +15,8 @@
 #include "Reseed.h"
 #include "util.h"
 
+using namespace i2p::transport;
+
 namespace i2p
 {
 namespace data
@@ -403,7 +405,7 @@ namespace data
 			RequestedDestination * dest = CreateRequestedDestination (destination, false, false, pool);
 			auto floodfill = GetClosestFloodfill (destination, dest->GetExcludedPeers ());
 			if (floodfill)
-				i2p::transports.SendMessage (floodfill->GetIdentHash (), dest->CreateRequestMessage (floodfill->GetIdentHash ()));
+				transports.SendMessage (floodfill->GetIdentHash (), dest->CreateRequestMessage (floodfill->GetIdentHash ()));
 		}	
 	}	
 
@@ -655,10 +657,10 @@ namespace data
 				if (outbound)
 					outbound->SendTunnelDataMsg (buf+32, replyTunnelID, replyMsg);
 				else
-					i2p::transports.SendMessage (buf+32, i2p::CreateTunnelGatewayMsg (replyTunnelID, replyMsg));
+					transports.SendMessage (buf+32, i2p::CreateTunnelGatewayMsg (replyTunnelID, replyMsg));
 			}
 			else
-				i2p::transports.SendMessage (buf+32, replyMsg);
+				transports.SendMessage (buf+32, replyMsg);
 		}
 		i2p::DeleteI2NPMessage (msg);
 	}	
@@ -712,7 +714,7 @@ namespace data
 						}); 
 				}	
 				else
-					i2p::transports.SendMessage (floodfill->GetIdentHash (), dest->CreateRequestMessage (floodfill->GetIdentHash ()));
+					i2p::transport::transports.SendMessage (floodfill->GetIdentHash (), dest->CreateRequestMessage (floodfill->GetIdentHash ()));
 			}	
 			else
 				DeleteRequestedDestination (dest);

diff --git a/SSU.cpp b/SSU.cpp
@@ -12,7 +12,7 @@
 
 namespace i2p
 {
-namespace ssu
+namespace transport
 {
 
 	SSUSession::SSUSession (SSUServer& server, boost::asio::ip::udp::endpoint& remoteEndpoint,
@@ -173,7 +173,7 @@ namespace ssu
 		LogPrint ("Session request received");	
 		m_RemoteEndpoint = senderEndpoint;
 		if (!m_DHKeysPair)
-			m_DHKeysPair = i2p::transports.GetNextDHKeysPair ();
+			m_DHKeysPair = transports.GetNextDHKeysPair ();
 		CreateAESandMacKey (buf + sizeof (SSUHeader));
 		SendSessionCreated (buf + sizeof (SSUHeader));
 	}
@@ -608,7 +608,7 @@ namespace ssu
 		{	
 			// set connect timer
 			ScheduleConnectTimer ();
-			m_DHKeysPair = i2p::transports.GetNextDHKeysPair ();
+			m_DHKeysPair = transports.GetNextDHKeysPair ();
 			SendSessionRequest ();
 		}	
 	}

diff --git a/SSU.h b/SSU.h
@@ -18,7 +18,7 @@
 
 namespace i2p
 {
-namespace ssu
+namespace transport
 {
 #pragma pack(1)
 	struct SSUHeader
@@ -58,7 +58,7 @@ namespace ssu
 	};	
 
 	class SSUServer;
-	class SSUSession: public i2p::transport::TransportSession
+	class SSUSession: public TransportSession
 	{
 		public:
 

diff --git a/SSUData.cpp b/SSUData.cpp
@@ -8,7 +8,7 @@
 
 namespace i2p
 {
-namespace ssu
+namespace transport
 {
 	SSUData::SSUData (SSUSession& session):
 		m_Session (session), m_ResendTimer (session.m_Server.GetService ())

diff --git a/SSUData.h b/SSUData.h
@@ -13,7 +13,7 @@
 
 namespace i2p
 {
-namespace ssu
+namespace transport
 {
 
 	const size_t SSU_MTU = 1484;

diff --git a/TransitTunnel.cpp b/TransitTunnel.cpp
@@ -34,7 +34,7 @@ namespace tunnel
 		*(uint32_t *)(tunnelMsg->GetPayload ()) = htobe32 (m_NextTunnelID);
 		FillI2NPMessageHeader (tunnelMsg, eI2NPTunnelData);
 
-		i2p::transports.SendMessage (m_NextIdent, tunnelMsg);	
+		i2p::transport::transports.SendMessage (m_NextIdent, tunnelMsg);	
 	}
 
 	void TransitTunnel::SendTunnelDataMsg (i2p::I2NPMessage * msg)