From c8190d00209e6c835a96fac80cbdf2b8e875136c Mon Sep 17 00:00:00 2001
From: EinMByte <einmbyte@mail.i2p>
Date: Thu, 30 Jul 2015 15:34:56 +0200
Subject: [PATCH] Move Log.h/cpp to util/

---
 AddressBook.cpp           | 2 +-
 AddressBook.h             | 2 +-
 BOB.cpp                   | 2 +-
 ClientContext.cpp         | 2 +-
 Daemon.cpp                | 2 +-
 DaemonLinux.cpp           | 2 +-
 DaemonWin32.cpp           | 2 +-
 Datagram.cpp              | 2 +-
 Destination.cpp           | 2 +-
 HTTPServer.cpp            | 2 +-
 I2PControl.cpp            | 2 +-
 I2PTunnel.cpp             | 2 +-
 LeaseSet.cpp              | 2 +-
 NetDb.cpp                 | 2 +-
 NetDbRequests.cpp         | 2 +-
 Reseed.cpp                | 2 +-
 RouterInfo.cpp            | 2 +-
 SAM.cpp                   | 2 +-
 Streaming.cpp             | 2 +-
 TransitTunnel.cpp         | 2 +-
 Tunnel.cpp                | 2 +-
 TunnelEndpoint.cpp        | 2 +-
 TunnelGateway.cpp         | 2 +-
 UPnP.cpp                  | 2 +-
 api.cpp                   | 2 +-
 build/CMakeLists.txt      | 2 +-
 crypto/ElGamal.h          | 2 +-
 crypto/Signature.cpp      | 2 +-
 filelist.mk               | 4 ++--
 transport/NTCPSession.cpp | 2 +-
 transport/SSU.cpp         | 2 +-
 transport/SSUData.cpp     | 2 +-
 transport/SSUSession.cpp  | 2 +-
 transport/Transports.cpp  | 2 +-
 Log.cpp => util/Log.cpp   | 0
 Log.h => util/Log.h       | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)
 rename Log.cpp => util/Log.cpp (100%)
 rename Log.h => util/Log.h (98%)

diff --git a/AddressBook.cpp b/AddressBook.cpp
index ab39c952..af10cdea 100644
--- a/AddressBook.cpp
+++ b/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"
diff --git a/AddressBook.h b/AddressBook.h
index 6521953d..e00283a2 100644
--- a/AddressBook.h
+++ b/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
 {
diff --git a/BOB.cpp b/BOB.cpp
index cbe8f142..9247edbd 100644
--- a/BOB.cpp
+++ b/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"
 
diff --git a/ClientContext.cpp b/ClientContext.cpp
index 0c14e4df..9ffd2303 100644
--- a/ClientContext.cpp
+++ b/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"
 
diff --git a/Daemon.cpp b/Daemon.cpp
index 124f60cc..2c52cfc1 100644
--- a/Daemon.cpp
+++ b/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"
diff --git a/DaemonLinux.cpp b/DaemonLinux.cpp
index c4107d94..bbd5962e 100644
--- a/DaemonLinux.cpp
+++ b/DaemonLinux.cpp
@@ -8,7 +8,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-#include "Log.h"
+#include "util/Log.h"
 #include "util/util.h"
 
 
diff --git a/DaemonWin32.cpp b/DaemonWin32.cpp
index e3220384..3f5d5b00 100644
--- a/DaemonWin32.cpp
+++ b/DaemonWin32.cpp
@@ -1,6 +1,6 @@
 #include "Daemon.h"
 #include "util/util.h"
-#include "Log.h"
+#include "util/Log.h"
 
 #ifdef _WIN32
 
diff --git a/Datagram.cpp b/Datagram.cpp
index 4b08e25c..a4ad5086 100644
--- a/Datagram.cpp
+++ b/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"
diff --git a/Destination.cpp b/Destination.cpp
index 0196e6b9..c680313c 100644
--- a/Destination.cpp
+++ b/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"
diff --git a/HTTPServer.cpp b/HTTPServer.cpp
index f55fab8d..b45160ca 100644
--- a/HTTPServer.cpp
+++ b/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"
diff --git a/I2PControl.cpp b/I2PControl.cpp
index 5b38ac51..feeacb6d 100644
--- a/I2PControl.cpp
+++ b/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"
diff --git a/I2PTunnel.cpp b/I2PTunnel.cpp
index a7e6a29b..ef968d11 100644
--- a/I2PTunnel.cpp
+++ b/I2PTunnel.cpp
@@ -1,5 +1,5 @@
 #include <cassert>
-#include "Log.h"
+#include "util/Log.h"
 #include "Destination.h"
 #include "ClientContext.h"
 #include "I2PTunnel.h"
diff --git a/LeaseSet.cpp b/LeaseSet.cpp
index f98291c1..98acec26 100644
--- a/LeaseSet.cpp
+++ b/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"
diff --git a/NetDb.cpp b/NetDb.cpp
index e544d780..248b956e 100644
--- a/NetDb.cpp
+++ b/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"
diff --git a/NetDbRequests.cpp b/NetDbRequests.cpp
index 1dcbbf6a..382d0e3b 100644
--- a/NetDbRequests.cpp
+++ b/NetDbRequests.cpp
@@ -1,4 +1,4 @@
-#include "Log.h"
+#include "util/Log.h"
 #include "I2NPProtocol.h"
 #include "transport/Transports.h"
 #include "NetDb.h"
diff --git a/Reseed.cpp b/Reseed.cpp
index 5b294675..3e16f48b 100644
--- a/Reseed.cpp
+++ b/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"
diff --git a/RouterInfo.cpp b/RouterInfo.cpp
index e819e419..b3b11d73 100644
--- a/RouterInfo.cpp
+++ b/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"
 
diff --git a/SAM.cpp b/SAM.cpp
index e74ca25a..695e8d4a 100644
--- a/SAM.cpp
+++ b/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"
diff --git a/Streaming.cpp b/Streaming.cpp
index 239bd661..9c891994 100644
--- a/Streaming.cpp
+++ b/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"
diff --git a/TransitTunnel.cpp b/TransitTunnel.cpp
index 23427d05..79d19564 100644
--- a/TransitTunnel.cpp
+++ b/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"
diff --git a/Tunnel.cpp b/Tunnel.cpp
index 4f95a4c5..a209d3b8 100644
--- a/Tunnel.cpp
+++ b/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"
diff --git a/TunnelEndpoint.cpp b/TunnelEndpoint.cpp
index 7697e4c1..bd982358 100644
--- a/TunnelEndpoint.cpp
+++ b/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"
diff --git a/TunnelGateway.cpp b/TunnelGateway.cpp
index 3fd405ee..6b55f543 100644
--- a/TunnelGateway.cpp
+++ b/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"
diff --git a/UPnP.cpp b/UPnP.cpp
index e6601f77..175528b4 100644
--- a/UPnP.cpp
+++ b/UPnP.cpp
@@ -13,7 +13,7 @@
 #include <dlfcn.h>
 #endif
 
-#include "Log.h"
+#include "util/Log.h"
 
 #include "RouterContext.h"
 #include "UPnP.h"
diff --git a/api.cpp b/api.cpp
index 1d381ac7..17d6fdac 100644
--- a/api.cpp
+++ b/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"
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index 2ea64a32..bbcfa01a 100644
--- a/build/CMakeLists.txt
+++ b/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"
diff --git a/crypto/ElGamal.h b/crypto/ElGamal.h
index 9f90da53..8a0d04df 100644
--- a/crypto/ElGamal.h
+++ b/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
 {
diff --git a/crypto/Signature.cpp b/crypto/Signature.cpp
index d56efddd..bf2809a0 100644
--- a/crypto/Signature.cpp
+++ b/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
diff --git a/filelist.mk b/filelist.mk
index d9150a58..e0a66f04 100644
--- a/filelist.mk
+++ b/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
diff --git a/transport/NTCPSession.cpp b/transport/NTCPSession.cpp
index 6a79956d..d323041b 100644
--- a/transport/NTCPSession.cpp
+++ b/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"
diff --git a/transport/SSU.cpp b/transport/SSU.cpp
index 651ff93e..9c1337ec 100644
--- a/transport/SSU.cpp
+++ b/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"
diff --git a/transport/SSUData.cpp b/transport/SSUData.cpp
index 2f661e68..a1d49ba9 100644
--- a/transport/SSUData.cpp
+++ b/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"
diff --git a/transport/SSUSession.cpp b/transport/SSUSession.cpp
index 69a99125..f76592e7 100644
--- a/transport/SSUSession.cpp
+++ b/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"
diff --git a/transport/Transports.cpp b/transport/Transports.cpp
index 623892ac..45e2346c 100644
--- a/transport/Transports.cpp
+++ b/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"
diff --git a/Log.cpp b/util/Log.cpp
similarity index 100%
rename from Log.cpp
rename to util/Log.cpp
diff --git a/Log.h b/util/Log.h
similarity index 98%
rename from Log.h
rename to util/Log.h
index 9dc72637..4aa4ef57 100644
--- a/Log.h
+++ b/util/Log.h
@@ -7,7 +7,7 @@
 #include <fstream>
 #include <functional>
 #include <chrono>
-#include "util/Queue.h"
+#include "Queue.h"
 
 enum LogLevel
 {