From 3668c27db6d8c97a033c954a60ab7000c7f53782 Mon Sep 17 00:00:00 2001 From: EinMByte Date: Tue, 28 Jul 2015 18:37:06 +0200 Subject: [PATCH] Moved some files to util/ --- AddressBook.cpp | 2 +- AddressBook.h | 2 +- ClientContext.cpp | 2 +- Daemon.cpp | 2 +- DaemonLinux.cpp | 2 +- DaemonWin32.cpp | 4 ++-- Destination.cpp | 4 ++-- Garlic.cpp | 2 +- Garlic.h | 2 +- HTTPProxy.cpp | 2 +- I2NPProtocol.cpp | 2 +- I2PControl.cpp | 2 +- LeaseSet.cpp | 2 +- Log.h | 2 +- Makefile | 3 +++ NetDb.cpp | 4 ++-- NetDb.h | 2 +- Profiling.cpp | 2 +- Reseed.cpp | 2 +- RouterContext.cpp | 4 ++-- RouterInfo.cpp | 2 +- Streaming.cpp | 2 +- Tunnel.cpp | 2 +- Tunnel.h | 2 +- TunnelBase.h | 2 +- TunnelConfig.h | 2 +- TunnelPool.cpp | 2 +- UPnP.cpp | 2 +- UPnP.h | 2 +- api.cpp | 2 +- filelist.mk | 14 ++++++++------ LittleBigEndian.h => util/LittleBigEndian.h | 0 Queue.h => util/Queue.h | 0 Timestamp.h => util/Timestamp.h | 0 util.cpp => util/util.cpp | 0 util.h => util/util.h | 0 36 files changed, 44 insertions(+), 39 deletions(-) rename LittleBigEndian.h => util/LittleBigEndian.h (100%) rename Queue.h => util/Queue.h (100%) rename Timestamp.h => util/Timestamp.h (100%) rename util.cpp => util/util.cpp (100%) rename util.h => util/util.h (100%) diff --git a/AddressBook.cpp b/AddressBook.cpp index 6d2893d4..938c7d31 100644 --- a/AddressBook.cpp +++ b/AddressBook.cpp @@ -9,7 +9,7 @@ #include #include #include "base64.h" -#include "util.h" +#include "util/util.h" #include "Identity.h" #include "Log.h" #include "NetDb.h" diff --git a/AddressBook.h b/AddressBook.h index 0de1bbfd..64c4cc3a 100644 --- a/AddressBook.h +++ b/AddressBook.h @@ -9,7 +9,7 @@ #include #include #include "base64.h" -#include "util.h" +#include "util/util.h" #include "Identity.h" #include "Log.h" diff --git a/ClientContext.cpp b/ClientContext.cpp index 34e195e0..0c14e4df 100644 --- a/ClientContext.cpp +++ b/ClientContext.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "util.h" +#include "util/util.h" #include "Log.h" #include "Identity.h" #include "ClientContext.h" diff --git a/Daemon.cpp b/Daemon.cpp index 81f597e1..2de1033d 100644 --- a/Daemon.cpp +++ b/Daemon.cpp @@ -12,7 +12,7 @@ #include "Tunnel.h" #include "NetDb.h" #include "Garlic.h" -#include "util.h" +#include "util/util.h" #include "Streaming.h" #include "Destination.h" #include "HTTPServer.h" diff --git a/DaemonLinux.cpp b/DaemonLinux.cpp index 15e30e2f..c4107d94 100644 --- a/DaemonLinux.cpp +++ b/DaemonLinux.cpp @@ -9,7 +9,7 @@ #include #include "Log.h" -#include "util.h" +#include "util/util.h" void handle_signal(int sig) diff --git a/DaemonWin32.cpp b/DaemonWin32.cpp index 6d8139de..e3220384 100644 --- a/DaemonWin32.cpp +++ b/DaemonWin32.cpp @@ -1,5 +1,5 @@ #include "Daemon.h" -#include "util.h" +#include "util/util.h" #include "Log.h" #ifdef _WIN32 @@ -80,4 +80,4 @@ namespace i2p } } -#endif \ No newline at end of file +#endif diff --git a/Destination.cpp b/Destination.cpp index 5f214ab6..f19dbe72 100644 --- a/Destination.cpp +++ b/Destination.cpp @@ -2,9 +2,9 @@ #include #include #include "Log.h" -#include "util.h" +#include "util/util.h" #include "ElGamal.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "NetDb.h" #include "AddressBook.h" #include "Destination.h" diff --git a/Garlic.cpp b/Garlic.cpp index 0fdc6473..96ea89d2 100644 --- a/Garlic.cpp +++ b/Garlic.cpp @@ -6,7 +6,7 @@ #include "I2NPProtocol.h" #include "Tunnel.h" #include "TunnelPool.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "Destination.h" #include "Garlic.h" diff --git a/Garlic.h b/Garlic.h index 7d02c21a..da90250f 100644 --- a/Garlic.h +++ b/Garlic.h @@ -12,7 +12,7 @@ #include "aes.h" #include "I2NPProtocol.h" #include "LeaseSet.h" -#include "Queue.h" +#include "util/Queue.h" #include "Identity.h" namespace i2p diff --git a/HTTPProxy.cpp b/HTTPProxy.cpp index 3902348e..03e322e9 100644 --- a/HTTPProxy.cpp +++ b/HTTPProxy.cpp @@ -5,7 +5,7 @@ #include #include #include "HTTPProxy.h" -#include "util.h" +#include "util/util.h" #include "Identity.h" #include "Streaming.h" #include "Destination.h" diff --git a/I2NPProtocol.cpp b/I2NPProtocol.cpp index 28821240..9e209f47 100644 --- a/I2NPProtocol.cpp +++ b/I2NPProtocol.cpp @@ -3,7 +3,7 @@ #include "I2PEndian.h" #include #include "ElGamal.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "RouterContext.h" #include "NetDb.h" #include "Tunnel.h" diff --git a/I2PControl.cpp b/I2PControl.cpp index d94c28fe..5b38ac51 100644 --- a/I2PControl.cpp +++ b/I2PControl.cpp @@ -14,7 +14,7 @@ #include "RouterContext.h" #include "Daemon.h" #include "Tunnel.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "transport/Transports.h" #include "version.h" diff --git a/LeaseSet.cpp b/LeaseSet.cpp index f648a44c..22bc4267 100644 --- a/LeaseSet.cpp +++ b/LeaseSet.cpp @@ -4,7 +4,7 @@ #include #include "CryptoConst.h" #include "Log.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "NetDb.h" #include "TunnelPool.h" #include "LeaseSet.h" diff --git a/Log.h b/Log.h index 4aa4ef57..9dc72637 100644 --- a/Log.h +++ b/Log.h @@ -7,7 +7,7 @@ #include #include #include -#include "Queue.h" +#include "util/Queue.h" enum LogLevel { diff --git a/Makefile b/Makefile index 10670bbe..f48357f2 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ tests: mk_build_test_dir $(TESTS) mk_build_dir: mkdir -p obj mkdir -p obj/transport + mkdir -p obj/util mk_build_test_dir: mkdir -p obj/tests @@ -45,6 +46,7 @@ deps: @mkdir -p obj @mkdir -p obj/transport @mkdir -p obj/tests + @mkdir -p obj/util $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) -MM *.cpp > $(DEPS) @sed -i -e '/\.o:/ s/^/obj\//' $(DEPS) @@ -52,6 +54,7 @@ obj/%.o : %.cpp @mkdir -p obj @mkdir -p obj/transport @mkdir -p obj/tests + @mkdir -p obj/util $(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) $(CPU_FLAGS) -c -o $@ $< # '-' is 'ignore if missing' on first run diff --git a/NetDb.cpp b/NetDb.cpp index 97d813ba..cbaebd0c 100644 --- a/NetDb.cpp +++ b/NetDb.cpp @@ -6,14 +6,14 @@ #include #include "base64.h" #include "Log.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "I2NPProtocol.h" #include "Tunnel.h" #include "transport/Transports.h" #include "RouterContext.h" #include "Garlic.h" #include "NetDb.h" -#include "util.h" +#include "util/util.h" using namespace i2p::transport; diff --git a/NetDb.h b/NetDb.h index d63fdc7c..31983919 100644 --- a/NetDb.h +++ b/NetDb.h @@ -9,7 +9,7 @@ #include #include #include -#include "Queue.h" +#include "util/Queue.h" #include "I2NPProtocol.h" #include "RouterInfo.h" #include "LeaseSet.h" diff --git a/Profiling.cpp b/Profiling.cpp index 5d3ad943..87ba687d 100644 --- a/Profiling.cpp +++ b/Profiling.cpp @@ -2,7 +2,7 @@ #include #include #include "base64.h" -#include "util.h" +#include "util/util.h" #include "Profiling.h" namespace i2p diff --git a/Reseed.cpp b/Reseed.cpp index 89fbde7c..4e3b4563 100644 --- a/Reseed.cpp +++ b/Reseed.cpp @@ -17,7 +17,7 @@ #include "Identity.h" #include "CryptoConst.h" #include "NetDb.h" -#include "util.h" +#include "util/util.h" namespace i2p diff --git a/RouterContext.cpp b/RouterContext.cpp index 0f6d4954..ac2358b1 100644 --- a/RouterContext.cpp +++ b/RouterContext.cpp @@ -4,10 +4,10 @@ #include #include "CryptoConst.h" #include "RouterContext.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "I2NPProtocol.h" #include "NetDb.h" -#include "util.h" +#include "util/util.h" #include "version.h" namespace i2p diff --git a/RouterInfo.cpp b/RouterInfo.cpp index f4dadeb7..2954139c 100644 --- a/RouterInfo.cpp +++ b/RouterInfo.cpp @@ -7,7 +7,7 @@ #include #include "CryptoConst.h" #include "base64.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "Log.h" #include "RouterInfo.h" #include "RouterContext.h" diff --git a/Streaming.cpp b/Streaming.cpp index 7e2d3bef..239bd661 100644 --- a/Streaming.cpp +++ b/Streaming.cpp @@ -3,7 +3,7 @@ #include "RouterInfo.h" #include "RouterContext.h" #include "Tunnel.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "Destination.h" #include "Streaming.h" diff --git a/Tunnel.cpp b/Tunnel.cpp index 0eeab5b6..9b13926f 100644 --- a/Tunnel.cpp +++ b/Tunnel.cpp @@ -6,7 +6,7 @@ #include #include "RouterContext.h" #include "Log.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "I2NPProtocol.h" #include "transport/Transports.h" #include "NetDb.h" diff --git a/Tunnel.h b/Tunnel.h index cc029b76..f724a023 100644 --- a/Tunnel.h +++ b/Tunnel.h @@ -9,7 +9,7 @@ #include #include #include -#include "Queue.h" +#include "util/Queue.h" #include "TunnelConfig.h" #include "TunnelPool.h" #include "TransitTunnel.h" diff --git a/TunnelBase.h b/TunnelBase.h index c7d6b536..ea57ea0a 100644 --- a/TunnelBase.h +++ b/TunnelBase.h @@ -3,7 +3,7 @@ #include #include -#include "Timestamp.h" +#include "util/Timestamp.h" #include "I2NPProtocol.h" #include "Identity.h" diff --git a/TunnelConfig.h b/TunnelConfig.h index d3ab5ed2..a77b560f 100644 --- a/TunnelConfig.h +++ b/TunnelConfig.h @@ -8,7 +8,7 @@ #include "aes.h" #include "RouterInfo.h" #include "RouterContext.h" -#include "Timestamp.h" +#include "util/Timestamp.h" namespace i2p { diff --git a/TunnelPool.cpp b/TunnelPool.cpp index 4cdc94d5..18ffd8ae 100644 --- a/TunnelPool.cpp +++ b/TunnelPool.cpp @@ -3,7 +3,7 @@ #include "CryptoConst.h" #include "Tunnel.h" #include "NetDb.h" -#include "Timestamp.h" +#include "util/Timestamp.h" #include "Garlic.h" #include "transport/Transports.h" #include "TunnelPool.h" diff --git a/UPnP.cpp b/UPnP.cpp index 6773b514..e6601f77 100644 --- a/UPnP.cpp +++ b/UPnP.cpp @@ -18,7 +18,7 @@ #include "RouterContext.h" #include "UPnP.h" #include "NetDb.h" -#include "util.h" +#include "util/util.h" #include #include diff --git a/UPnP.h b/UPnP.h index e1211a29..468b5c0c 100644 --- a/UPnP.h +++ b/UPnP.h @@ -12,7 +12,7 @@ #include -#include "util.h" +#include "util/util.h" #define I2P_UPNP_TCP 1 #define I2P_UPNP_UDP 2 diff --git a/api.cpp b/api.cpp index 0df091f0..1d381ac7 100644 --- a/api.cpp +++ b/api.cpp @@ -7,7 +7,7 @@ #include "RouterContext.h" #include "Identity.h" #include "Destination.h" -#include "util.h" +#include "util/util.h" #include "api.h" namespace i2p diff --git a/filelist.mk b/filelist.mk index bbf10ba2..cac86830 100644 --- a/filelist.mk +++ b/filelist.mk @@ -1,29 +1,31 @@ COMMON_SRC = \ transport/NTCPSession.cpp transport/SSU.cpp transport/SSUSession.cpp \ transport/SSUData.cpp transport/Transports.cpp \ + util/util.cpp \ CryptoConst.cpp Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \ Log.cpp NetDb.cpp NetDbRequests.cpp Profiling.cpp Reseed.cpp \ RouterContext.cpp RouterInfo.cpp Signature.cpp Streaming.cpp Identity.cpp \ TransitTunnel.cpp Tunnel.cpp TunnelEndpoint.cpp TunnelPool.cpp \ - TunnelGateway.cpp Destination.cpp UPnP.cpp util.cpp aes.cpp base64.cpp + TunnelGateway.cpp Destination.cpp UPnP.cpp aes.cpp base64.cpp ifeq ($(UNAME),Darwin) # This is needed on OS X for some reason I don't understand (yet). # Else will get linker error about unknown symbols. - torkel COMMON_SRC += \ - AddressBook.cpp BOB.cpp ClientContext.cpp Daemon.cpp I2PTunnel.cpp I2PService.cpp SAM.cpp SOCKS.cpp \ - UPnP.cpp HTTPServer.cpp HTTPProxy.cpp i2p.cpp DaemonLinux.cpp I2PControl.cpp + AddressBook.cpp BOB.cpp ClientContext.cpp Daemon.cpp I2PTunnel.cpp I2PService.cpp \ + SAM.cpp SOCKS.cpp UPnP.cpp HTTPProxy.cpp i2p.cpp DaemonLinux.cpp I2PControl.cpp \ + HTTPServer.cpp endif # also: Daemon{Linux,Win32}.cpp will be added later DAEMON_SRC = $(COMMON_SRC) \ - AddressBook.cpp BOB.cpp ClientContext.cpp Daemon.cpp I2PTunnel.cpp I2PService.cpp \ - SAM.cpp SOCKS.cpp HTTPServer.cpp HTTPProxy.cpp I2PControl.cpp i2p.cpp + AddressBook.cpp BOB.cpp ClientContext.cpp Daemon.cpp I2PTunnel.cpp I2PService.cpp \ + SAM.cpp SOCKS.cpp HTTPServer.cpp HTTPProxy.cpp I2PControl.cpp i2p.cpp LIB_SRC := $(COMMON_SRC) \ api.cpp TESTS_SRC := $(COMMON_SRC) \ - tests/Utility.cpp tests/Identity.cpp tests/Data.cpp + tests/Utility.cpp tests/Identity.cpp tests/Data.cpp diff --git a/LittleBigEndian.h b/util/LittleBigEndian.h similarity index 100% rename from LittleBigEndian.h rename to util/LittleBigEndian.h diff --git a/Queue.h b/util/Queue.h similarity index 100% rename from Queue.h rename to util/Queue.h diff --git a/Timestamp.h b/util/Timestamp.h similarity index 100% rename from Timestamp.h rename to util/Timestamp.h diff --git a/util.cpp b/util/util.cpp similarity index 100% rename from util.cpp rename to util/util.cpp diff --git a/util.h b/util/util.h similarity index 100% rename from util.h rename to util/util.h