Created tunnel/

Daemon.cpp

@@ -8,7 +8,7 @@
 #include "transport/NTCPSession.h"
 #include "RouterInfo.h"
 #include "RouterContext.h"
-#include "Tunnel.h"
+#include "tunnel/Tunnel.h"
 #include "NetDb.h"
 #include "Garlic.h"
 #include "util/util.h"

Datagram.cpp

@@ -3,7 +3,7 @@
 #include <cryptopp/sha.h>
 #include <cryptopp/gzip.h>
 #include "util/Log.h"
-#include "TunnelBase.h"
+#include "tunnel/TunnelBase.h"
 #include "RouterContext.h"
 #include "Destination.h"
 #include "Datagram.h"

Destination.h

@@ -10,7 +10,7 @@
 #include <functional>
 #include <boost/asio.hpp>
 #include "Identity.h"
-#include "TunnelPool.h"
+#include "tunnel/TunnelPool.h"
 #include "crypto/CryptoConst.h"
 #include "LeaseSet.h"
 #include "Garlic.h"

Garlic.cpp

@@ -4,8 +4,8 @@
 #include <string>
 #include "RouterContext.h"
 #include "I2NPProtocol.h"
-#include "Tunnel.h"
+#include "tunnel/Tunnel.h"
-#include "TunnelPool.h"
+#include "tunnel/TunnelPool.h"
 #include "util/Timestamp.h"
 #include "Destination.h"
 #include "Garlic.h"

HTTPServer.cpp

@@ -3,8 +3,8 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include "util/base64.h"
 #include "util/Log.h"
-#include "Tunnel.h"
+#include "tunnel/Tunnel.h"
-#include "TransitTunnel.h"
+#include "tunnel/TransitTunnel.h"
 #include "transport/Transports.h"
 #include "NetDb.h"
 #include "util/I2PEndian.h"

I2NPProtocol.cpp

@@ -6,7 +6,7 @@
 #include "util/Timestamp.h"
 #include "RouterContext.h"
 #include "NetDb.h"
-#include "Tunnel.h"
+#include "tunnel/Tunnel.h"
 #include "transport/Transports.h"
 #include "Garlic.h"
 #include "I2NPProtocol.h"

I2PControl.cpp

@@ -13,7 +13,7 @@
 #include "NetDb.h"
 #include "RouterContext.h"
 #include "Daemon.h"
-#include "Tunnel.h"
+#include "tunnel/Tunnel.h"
 #include "util/Timestamp.h"
 #include "transport/Transports.h"
 #include "version.h"

LeaseSet.cpp

@@ -6,7 +6,7 @@
 #include "util/Log.h"
 #include "util/Timestamp.h"
 #include "NetDb.h"
-#include "TunnelPool.h"
+#include "tunnel/TunnelPool.h"
 #include "LeaseSet.h"
 
 namespace i2p

Makefile

@@ -31,6 +31,7 @@ mk_build_dir:
 	mkdir -p obj/transport
 	mkdir -p obj/util
 	mkdir -p obj/crypto
+	mkdir -p obj/tunnel
 mk_build_test_dir:
 	mkdir -p obj/tests
 
@@ -49,6 +50,7 @@ deps:
 	@mkdir -p obj/tests
 	@mkdir -p obj/util
 	@mkdir -p obj/crypto
+	@mkdir -p obj/tunnel
 	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS)
 	@sed -i -e '/\.o:/ s/^/obj\//' $(DEPS)
 
@@ -58,6 +60,7 @@ obj/%.o : %.cpp
 	@mkdir -p obj/tests
 	@mkdir -p obj/util
 	@mkdir -p obj/crypto
+	@mkdir -p obj/tunnel
 	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $<
 
 # '-' is 'ignore if missing' on first run

NetDb.cpp

@@ -8,7 +8,7 @@
 #include "util/Log.h"
 #include "util/Timestamp.h"
 #include "I2NPProtocol.h"
-#include "Tunnel.h"
+#include "tunnel/Tunnel.h"
 #include "transport/Transports.h"
 #include "RouterContext.h"
 #include "Garlic.h"

NetDb.h

@@ -13,8 +13,8 @@
 #include "I2NPProtocol.h"
 #include "RouterInfo.h"
 #include "LeaseSet.h"
-#include "Tunnel.h"
+#include "tunnel/Tunnel.h"
-#include "TunnelPool.h"
+#include "tunnel/TunnelPool.h"
 #include "Reseed.h"
 #include "NetDbRequests.h"
 

Streaming.cpp

@@ -2,7 +2,7 @@
 #include "util/Log.h"
 #include "RouterInfo.h"
 #include "RouterContext.h"
-#include "Tunnel.h"
+#include "tunnel/Tunnel.h"
 #include "util/Timestamp.h"
 #include "Destination.h"
 #include "Streaming.h"

Streaming.h

@@ -16,7 +16,7 @@
 #include "LeaseSet.h"
 #include "I2NPProtocol.h"
 #include "Garlic.h"
-#include "Tunnel.h"
+#include "tunnel/Tunnel.h"
 
 namespace i2p
 {

api.cpp

@@ -3,7 +3,7 @@
 #include "util/Log.h"
 #include "NetDb.h"
 #include "transport/Transports.h"
-#include "Tunnel.h"
+#include "tunnel/Tunnel.h"
 #include "RouterContext.h"
 #include "Identity.h"
 #include "Destination.h"

build/CMakeLists.txt

@@ -26,6 +26,11 @@ set (COMMON_SRC
   "${CMAKE_SOURCE_DIR}/util/base64.cpp"
   "${CMAKE_SOURCE_DIR}/util/util.cpp"
   "${CMAKE_SOURCE_DIR}/util/Log.cpp"
+  "${CMAKE_SOURCE_DIR}/tunnel/TransitTunnel.cpp"
+  "${CMAKE_SOURCE_DIR}/tunnel/Tunnel.cpp"
+  "${CMAKE_SOURCE_DIR}/tunnel/TunnelGateway.cpp"
+  "${CMAKE_SOURCE_DIR}/tunnel/TunnelEndpoint.cpp"
+  "${CMAKE_SOURCE_DIR}/tunnel/TunnelPool.cpp"
   "${CMAKE_SOURCE_DIR}/AddressBook.cpp"	
   "${CMAKE_SOURCE_DIR}/Garlic.cpp"
   "${CMAKE_SOURCE_DIR}/I2NPProtocol.cpp"
@@ -39,11 +44,6 @@ set (COMMON_SRC
   "${CMAKE_SOURCE_DIR}/RouterInfo.cpp"
   "${CMAKE_SOURCE_DIR}/Streaming.cpp"
   "${CMAKE_SOURCE_DIR}/Destination.cpp"	
-  "${CMAKE_SOURCE_DIR}/TransitTunnel.cpp"
-  "${CMAKE_SOURCE_DIR}/Tunnel.cpp"
-  "${CMAKE_SOURCE_DIR}/TunnelGateway.cpp"
-  "${CMAKE_SOURCE_DIR}/TunnelEndpoint.cpp"
-  "${CMAKE_SOURCE_DIR}/TunnelPool.cpp"
   "${CMAKE_SOURCE_DIR}/Datagram.cpp"
   "${CMAKE_SOURCE_DIR}/UPnP.cpp"
 )

crypto/aes.cpp

@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include "TunnelBase.h"
+#include "tunnel/TunnelBase.h"
 #include "aes.h"
 
 namespace i2p

filelist.mk

@@ -3,11 +3,12 @@ COMMON_SRC = \
   transport/SSUData.cpp transport/Transports.cpp \
   util/util.cpp util/base64.cpp util/Log.cpp \
   crypto/CryptoConst.cpp crypto/aes.cpp crypto/Signature.cpp \
+  tunnel/Tunnel.cpp tunnel/TransitTunnel.cpp tunnel/TunnelEndpoint.cpp \
+  tunnel/TunnelEndpoint.cpp tunnel/TunnelPool.cpp tunnel/TunnelGateway.cpp \
   Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
   NetDb.cpp NetDbRequests.cpp Profiling.cpp Reseed.cpp \
   RouterContext.cpp RouterInfo.cpp Streaming.cpp Identity.cpp \
-  TransitTunnel.cpp Tunnel.cpp TunnelEndpoint.cpp TunnelPool.cpp \
+  Destination.cpp UPnP.cpp
-  TunnelGateway.cpp Destination.cpp UPnP.cpp
 
 
 ifeq ($(UNAME),Darwin)