Move Log.h/cpp to util/

AddressBook.cpp

@@ -11,7 +11,7 @@
 #include "util/base64.h"
 #include "util/util.h"
 #include "Identity.h"
-#include "Log.h"
+#include "util/Log.h"
 #include "NetDb.h"
 #include "ClientContext.h"
 #include "AddressBook.h"

AddressBook.h

@@ -11,7 +11,7 @@
 #include "util/base64.h"
 #include "util/util.h"
 #include "Identity.h"
-#include "Log.h"
+#include "util/Log.h"
 
 namespace i2p
 {

BOB.cpp

@@ -1,6 +1,6 @@
 #include <string.h>
 #include <boost/lexical_cast.hpp>
-#include "Log.h"
+#include "util/Log.h"
 #include "ClientContext.h"
 #include "BOB.h"
 

ClientContext.cpp

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

Daemon.cpp

@@ -2,7 +2,7 @@
 
 #include "Daemon.h"
 
-#include "Log.h"
+#include "util/Log.h"
 #include "version.h"
 #include "transport/Transports.h"
 #include "transport/NTCPSession.h"

DaemonLinux.cpp

@@ -8,7 +8,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#include "Log.h"
+#include "util/Log.h"
 #include "util/util.h"
 
 

DaemonWin32.cpp

@@ -1,6 +1,6 @@
 #include "Daemon.h"
 #include "util/util.h"
-#include "Log.h"
+#include "util/Log.h"
 
 #ifdef _WIN32
 

Datagram.cpp

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

Destination.cpp

@@ -1,7 +1,7 @@
 #include <algorithm>
 #include <cassert>
 #include <boost/lexical_cast.hpp>
-#include "Log.h"
+#include "util/Log.h"
 #include "util/util.h"
 #include "crypto/ElGamal.h"
 #include "util/Timestamp.h"

HTTPServer.cpp

@@ -2,7 +2,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include "util/base64.h"
-#include "Log.h"
+#include "util/Log.h"
 #include "Tunnel.h"
 #include "TransitTunnel.h"
 #include "transport/Transports.h"

I2PControl.cpp

@@ -9,7 +9,7 @@
 #if !GCC47_BOOST149
 #include <boost/property_tree/json_parser.hpp>
 #endif
-#include "Log.h"
+#include "util/Log.h"
 #include "NetDb.h"
 #include "RouterContext.h"
 #include "Daemon.h"

I2PTunnel.cpp

@@ -1,5 +1,5 @@
 #include <cassert>
-#include "Log.h"
+#include "util/Log.h"
 #include "Destination.h"
 #include "ClientContext.h"
 #include "I2PTunnel.h"

LeaseSet.cpp

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

NetDb.cpp

@@ -5,7 +5,7 @@
 #include <boost/asio.hpp>
 #include <cryptopp/gzip.h>
 #include "util/base64.h"
-#include "Log.h"
+#include "util/Log.h"
 #include "util/Timestamp.h"
 #include "I2NPProtocol.h"
 #include "Tunnel.h"

NetDbRequests.cpp

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

Reseed.cpp

@@ -13,7 +13,7 @@
 #include <cryptopp/arc4.h>
 #include "util/I2PEndian.h"
 #include "Reseed.h"
-#include "Log.h"
+#include "util/Log.h"
 #include "Identity.h"
 #include "crypto/CryptoConst.h"
 #include "NetDb.h"

RouterInfo.cpp

@@ -8,7 +8,7 @@
 #include "crypto/CryptoConst.h"
 #include "util/base64.h"
 #include "util/Timestamp.h"
-#include "Log.h"
+#include "util/Log.h"
 #include "RouterInfo.h"
 #include "RouterContext.h"
 

SAM.cpp

@@ -6,7 +6,7 @@
 #include <boost/lexical_cast.hpp>
 #include "util/base64.h"
 #include "Identity.h"
-#include "Log.h"
+#include "util/Log.h"
 #include "Destination.h"
 #include "ClientContext.h"
 #include "SAM.h"

Streaming.cpp

@@ -1,5 +1,5 @@
 #include <cryptopp/gzip.h>
-#include "Log.h"
+#include "util/Log.h"
 #include "RouterInfo.h"
 #include "RouterContext.h"
 #include "Tunnel.h"

TransitTunnel.cpp

@@ -1,6 +1,6 @@
 #include <string.h>
 #include "util/I2PEndian.h"
-#include "Log.h"
+#include "util/Log.h"
 #include "RouterContext.h"
 #include "I2NPProtocol.h"
 #include "Tunnel.h"

Tunnel.cpp

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

TunnelEndpoint.cpp

@@ -1,6 +1,6 @@
 #include "util/I2PEndian.h"
 #include <string.h>
-#include "Log.h"
+#include "util/Log.h"
 #include "NetDb.h"
 #include "I2NPProtocol.h"
 #include "transport/Transports.h"

TunnelGateway.cpp

@@ -1,7 +1,7 @@
 #include <string.h>
 #include "util/I2PEndian.h"
 #include <cryptopp/sha.h>
-#include "Log.h"
+#include "util/Log.h"
 #include "RouterContext.h"
 #include "transport/Transports.h"
 #include "TunnelGateway.h"

UPnP.cpp

@@ -13,7 +13,7 @@
 #include <dlfcn.h>
 #endif
 
-#include "Log.h"
+#include "util/Log.h"
 
 #include "RouterContext.h"
 #include "UPnP.h"

api.cpp

@@ -1,6 +1,6 @@
 #include <string>
 #include <map>
-#include "Log.h"
+#include "util/Log.h"
 #include "NetDb.h"
 #include "transport/Transports.h"
 #include "Tunnel.h"

build/CMakeLists.txt

@@ -25,12 +25,12 @@ set (COMMON_SRC
   "${CMAKE_SOURCE_DIR}/crypto/Signature.cpp"
   "${CMAKE_SOURCE_DIR}/util/base64.cpp"
   "${CMAKE_SOURCE_DIR}/util/util.cpp"
+  "${CMAKE_SOURCE_DIR}/util/Log.cpp"
   "${CMAKE_SOURCE_DIR}/AddressBook.cpp"	
   "${CMAKE_SOURCE_DIR}/Garlic.cpp"
   "${CMAKE_SOURCE_DIR}/I2NPProtocol.cpp"
   "${CMAKE_SOURCE_DIR}/Identity.cpp"
   "${CMAKE_SOURCE_DIR}/LeaseSet.cpp"
-  "${CMAKE_SOURCE_DIR}/Log.cpp"
   "${CMAKE_SOURCE_DIR}/NetDbRequests.cpp"	
   "${CMAKE_SOURCE_DIR}/NetDb.cpp"
   "${CMAKE_SOURCE_DIR}/Profiling.cpp"

crypto/ElGamal.h

@@ -7,7 +7,7 @@
 #include <cryptopp/dh.h>
 #include <cryptopp/sha.h>
 #include "CryptoConst.h"
-#include "Log.h"
+#include "util/Log.h"
 
 namespace i2p
 {

crypto/Signature.cpp

@@ -1,7 +1,7 @@
 #include <memory>
 #include <cryptopp/integer.h>
 #include <cryptopp/eccrypto.h>
-#include "Log.h"
+#include "util/Log.h"
 #include "Signature.h"
 
 namespace i2p

filelist.mk

@@ -1,10 +1,10 @@
 COMMON_SRC = \
   transport/NTCPSession.cpp transport/SSU.cpp transport/SSUSession.cpp \
   transport/SSUData.cpp transport/Transports.cpp \
-  util/util.cpp util/base64.cpp\
+  util/util.cpp util/base64.cpp util/Log.cpp \
   crypto/CryptoConst.cpp crypto/aes.cpp crypto/Signature.cpp \
   Datagram.cpp Garlic.cpp I2NPProtocol.cpp LeaseSet.cpp \
-  Log.cpp NetDb.cpp NetDbRequests.cpp Profiling.cpp Reseed.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 \
   TunnelGateway.cpp Destination.cpp UPnP.cpp

transport/NTCPSession.cpp

@@ -4,7 +4,7 @@
 #include <cryptopp/dh.h>
 #include <cryptopp/adler32.h>
 #include "util/base64.h"
-#include "Log.h"
+#include "util/Log.h"
 #include "util/Timestamp.h"
 #include "crypto/CryptoConst.h"
 #include "I2NPProtocol.h"

transport/SSU.cpp

@@ -1,6 +1,6 @@
 #include <string.h>
 #include <boost/bind.hpp>
-#include "Log.h"
+#include "util/Log.h"
 #include "util/Timestamp.h"
 #include "RouterContext.h"
 #include "NetDb.h"

transport/SSUData.cpp

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <boost/bind.hpp>
-#include "Log.h"
+#include "util/Log.h"
 #include "util/Timestamp.h"
 #include "NetDb.h"
 #include "SSU.h"

transport/SSUSession.cpp

@@ -2,7 +2,7 @@
 #include <cryptopp/dh.h>
 #include <cryptopp/sha.h>
 #include "crypto/CryptoConst.h"
-#include "Log.h"
+#include "util/Log.h"
 #include "util/Timestamp.h"
 #include "RouterContext.h"
 #include "Transports.h"

transport/Transports.cpp

@@ -1,5 +1,5 @@
 #include <cryptopp/dh.h>
-#include "Log.h"
+#include "util/Log.h"
 #include "crypto/CryptoConst.h"
 #include "RouterContext.h"
 #include "I2NPProtocol.h"

util/Log.h

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