Move SSU and NTCP to transport/.

Daemon.cpp

@@ -5,8 +5,8 @@
 #include "Log.h"
 #include "base64.h"
 #include "version.h"
-#include "Transports.h"
+#include "transport/Transports.h"
-#include "NTCPSession.h"
+#include "transport/NTCPSession.h"
 #include "RouterInfo.h"
 #include "RouterContext.h"
 #include "Tunnel.h"

HTTPServer.cpp

@@ -5,7 +5,7 @@
 #include "Log.h"
 #include "Tunnel.h"
 #include "TransitTunnel.h"
-#include "Transports.h"
+#include "transport/Transports.h"
 #include "NetDb.h"
 #include "I2PEndian.h"
 #include "Streaming.h"

I2NPProtocol.cpp

@@ -8,7 +8,7 @@
 #include "NetDb.h"
 #include "Tunnel.h"
 #include "base64.h"
-#include "Transports.h"
+#include "transport/Transports.h"
 #include "Garlic.h"
 #include "I2NPProtocol.h"
 

I2PControl.cpp

@@ -15,7 +15,7 @@
 #include "Daemon.h"
 #include "Tunnel.h"
 #include "Timestamp.h"
-#include "Transports.h"
+#include "transport/Transports.h"
 #include "version.h"
 
 namespace i2p

Makefile

@@ -28,6 +28,7 @@ tests: mk_build_test_dir $(TESTS)
 
 mk_build_dir:
 	mkdir -p obj
+	mkdir -p obj/transport
 mk_build_test_dir:
 	mkdir -p obj/tests
 
@@ -42,12 +43,14 @@ api: $(SHLIB)
 
 deps:
 	@mkdir -p obj
+	@mkdir -p obj/transport
 	@mkdir -p obj/tests
 	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS)
 	@sed -i -e '/\.o:/ s/^/obj\//' $(DEPS)
 
 obj/%.o : %.cpp
 	@mkdir -p obj
+	@mkdir -p obj/transport
 	@mkdir -p obj/tests
 	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $<
 

Makefile.bsd

@@ -7,7 +7,7 @@ CXXFLAGS = -O2
 ## -std=c++11. If you want to remove this variable please do so in a way that allows setting
 ## custom FLAGS to work at build-time.
 NEEDED_CXXFLAGS = -std=c++11
-INCFLAGS = -I/usr/include/ -I/usr/local/include/
+INCFLAGS = -I/usr/include/ -I/usr/local/include/ -I.
 LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib
 LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
 LDTESTLIBS = -lboost_unit_test_framework

Makefile.linux

@@ -1,5 +1,5 @@
 CXXFLAGS = -g -Wall
-INCFLAGS =
+INCFLAGS = -I.
 
 ## NOTE: The NEEDED_CXXFLAGS are here so that custom CXXFLAGS can be specified at build time
 ## **without** overwriting the CXXFLAGS which we need in order to build.

Makefile.osx

@@ -1,7 +1,7 @@
 CXX = clang++
 CXXFLAGS = -g -Wall -std=c++11 -DCRYPTOPP_DISABLE_ASM -DMAC_OSX
 #CXXFLAGS = -g -O2 -Wall -std=c++11 -DCRYPTOPP_DISABLE_ASM
-INCFLAGS = -I/usr/local/include
+INCFLAGS = -I/usr/local/include -I.
 LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib
 LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
 LDTESTLIBS = -lboost_unit_test_framework

NetDb.cpp

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

NetDbRequests.cpp

@@ -1,6 +1,6 @@
 #include "Log.h"
 #include "I2NPProtocol.h"
-#include "Transports.h"
+#include "transport/Transports.h"
 #include "NetDb.h"
 #include "NetDbRequests.h"
 

TransitTunnel.cpp

@@ -4,7 +4,7 @@
 #include "RouterContext.h"
 #include "I2NPProtocol.h"
 #include "Tunnel.h"
-#include "Transports.h"
+#include "transport/Transports.h"
 #include "TransitTunnel.h"
 
 namespace i2p

Tunnel.cpp

@@ -8,7 +8,7 @@
 #include "Log.h"
 #include "Timestamp.h"
 #include "I2NPProtocol.h"
-#include "Transports.h"
+#include "transport/Transports.h"
 #include "NetDb.h"
 #include "Tunnel.h"
 

TunnelEndpoint.cpp

@@ -3,7 +3,7 @@
 #include "Log.h"
 #include "NetDb.h"
 #include "I2NPProtocol.h"
-#include "Transports.h"
+#include "transport/Transports.h"
 #include "RouterContext.h"
 #include "TunnelEndpoint.h"
 

TunnelGateway.cpp

@@ -3,7 +3,7 @@
 #include <cryptopp/sha.h>
 #include "Log.h"
 #include "RouterContext.h"
-#include "Transports.h"
+#include "transport/Transports.h"
 #include "TunnelGateway.h"
 
 namespace i2p

TunnelPool.cpp

@@ -5,7 +5,7 @@
 #include "NetDb.h"
 #include "Timestamp.h"
 #include "Garlic.h"
-#include "Transports.h"
+#include "transport/Transports.h"
 #include "TunnelPool.h"
 
 namespace i2p

api.cpp

@@ -2,7 +2,7 @@
 #include <map>
 #include "Log.h"
 #include "NetDb.h"
-#include "Transports.h"
+#include "transport/Transports.h"
 #include "Tunnel.h"
 #include "RouterContext.h"
 #include "Identity.h"

filelist.mk

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