Moved some files to util/

AddressBook.cpp

@@ -9,7 +9,7 @@
 #include <boost/lexical_cast.hpp>
 #include <cryptopp/osrng.h>
 #include "base64.h"
-#include "util.h"
+#include "util/util.h"
 #include "Identity.h"
 #include "Log.h"
 #include "NetDb.h"

AddressBook.h

@@ -9,7 +9,7 @@
 #include <mutex>
 #include <boost/asio.hpp>
 #include "base64.h"
-#include "util.h"
+#include "util/util.h"
 #include "Identity.h"
 #include "Log.h"
 

ClientContext.cpp

@@ -2,7 +2,7 @@
 #include <iostream>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ini_parser.hpp>
-#include "util.h"
+#include "util/util.h"
 #include "Log.h"
 #include "Identity.h"
 #include "ClientContext.h"

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"

DaemonLinux.cpp

@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 
 #include "Log.h"
-#include "util.h"
+#include "util/util.h"
 
 
 void handle_signal(int sig)

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
+#endif

Destination.cpp

@@ -2,9 +2,9 @@
 #include <cassert>
 #include <boost/lexical_cast.hpp>
 #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"

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"
 

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

HTTPProxy.cpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <atomic>
 #include "HTTPProxy.h"
-#include "util.h"
+#include "util/util.h"
 #include "Identity.h"
 #include "Streaming.h"
 #include "Destination.h"

I2NPProtocol.cpp

@@ -3,7 +3,7 @@
 #include "I2PEndian.h"
 #include <cryptopp/gzip.h>
 #include "ElGamal.h"
-#include "Timestamp.h"
+#include "util/Timestamp.h"
 #include "RouterContext.h"
 #include "NetDb.h"
 #include "Tunnel.h"

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"
 

LeaseSet.cpp

@@ -4,7 +4,7 @@
 #include <cryptopp/osrng.h>
 #include "CryptoConst.h"
 #include "Log.h"
-#include "Timestamp.h"
+#include "util/Timestamp.h"
 #include "NetDb.h"
 #include "TunnelPool.h"
 #include "LeaseSet.h"

Log.h

@@ -7,7 +7,7 @@
 #include <fstream>
 #include <functional>
 #include <chrono>
-#include "Queue.h"
+#include "util/Queue.h"
 
 enum LogLevel
 {

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

NetDb.cpp

@@ -6,14 +6,14 @@
 #include <cryptopp/gzip.h>
 #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;
 

NetDb.h

@@ -9,7 +9,7 @@
 #include <thread>
 #include <mutex>
 #include <boost/filesystem.hpp>
-#include "Queue.h"
+#include "util/Queue.h"
 #include "I2NPProtocol.h"
 #include "RouterInfo.h"
 #include "LeaseSet.h"

Profiling.cpp

@@ -2,7 +2,7 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/ini_parser.hpp>
 #include "base64.h"
-#include "util.h"
+#include "util/util.h"
 #include "Profiling.h"
 
 namespace i2p

Reseed.cpp

@@ -17,7 +17,7 @@
 #include "Identity.h"
 #include "CryptoConst.h"
 #include "NetDb.h"
-#include "util.h"
+#include "util/util.h"
 
 
 namespace i2p

RouterContext.cpp

@@ -4,10 +4,10 @@
 #include <boost/lexical_cast.hpp>
 #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

RouterInfo.cpp

@@ -7,7 +7,7 @@
 #include <cryptopp/dsa.h>
 #include "CryptoConst.h"
 #include "base64.h"
-#include "Timestamp.h"
+#include "util/Timestamp.h"
 #include "Log.h"
 #include "RouterInfo.h"
 #include "RouterContext.h"

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"
 

Tunnel.cpp

@@ -6,7 +6,7 @@
 #include <cryptopp/sha.h>
 #include "RouterContext.h"
 #include "Log.h"
-#include "Timestamp.h"
+#include "util/Timestamp.h"
 #include "I2NPProtocol.h"
 #include "transport/Transports.h"
 #include "NetDb.h"

Tunnel.h

@@ -9,7 +9,7 @@
 #include <thread>
 #include <mutex>
 #include <memory>
-#include "Queue.h"
+#include "util/Queue.h"
 #include "TunnelConfig.h"
 #include "TunnelPool.h"
 #include "TransitTunnel.h"

TunnelBase.h

@@ -3,7 +3,7 @@
 
 #include <inttypes.h>
 #include <memory>
-#include "Timestamp.h"
+#include "util/Timestamp.h"
 #include "I2NPProtocol.h"
 #include "Identity.h"
 

TunnelConfig.h

@@ -8,7 +8,7 @@
 #include "aes.h"
 #include "RouterInfo.h"
 #include "RouterContext.h"
-#include "Timestamp.h"
+#include "util/Timestamp.h"
 
 namespace i2p
 {

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"

UPnP.cpp

@@ -18,7 +18,7 @@
 #include "RouterContext.h"
 #include "UPnP.h"
 #include "NetDb.h"
-#include "util.h"
+#include "util/util.h"
 
 #include <miniupnpc/miniupnpc.h>
 #include <miniupnpc/upnpcommands.h>

UPnP.h

@@ -12,7 +12,7 @@
 
 #include <boost/asio.hpp>
 
-#include "util.h"
+#include "util/util.h"
 
 #define I2P_UPNP_TCP 1
 #define I2P_UPNP_UDP 2

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

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