Merge pull request #304

30d169d Style: move network_database -> net_db. Refs #280 (anonimal)
deba858 Build: update header guards. Fixes #303 (anonimal)

src/app/daemon.cc

@@ -43,7 +43,7 @@
 #include "client/client_context.h"
 #include "destination.h"
 #include "garlic.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "router_info.h"
 #include "version.h"

src/app/util/file_system.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_APP_UTIL_FILESYSTEM_H_
-#define SRC_APP_UTIL_FILESYSTEM_H_
+#ifndef SRC_APP_UTIL_FILE_SYSTEM_H_
+#define SRC_APP_UTIL_FILE_SYSTEM_H_
 
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>

src/app/win32_service.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_APP_WIN32SERVICE_H_
-#define SRC_APP_WIN32SERVICE_H_
+#ifndef SRC_APP_WIN32_SERVICE_H_
+#define SRC_APP_WIN32_SERVICE_H_
 
 #include <windows.h>
 #define WIN32_LEAN_AND_MEAN

src/client/address_book.cc

@@ -47,7 +47,7 @@
 
 #include "destination.h"
 #include "identity.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "crypto/rand.h"
 #include "util/http.h"
 #include "util/log.h"

src/client/address_book.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CLIENT_ADDRESSBOOK_H_
-#define SRC_CLIENT_ADDRESSBOOK_H_
+#ifndef SRC_CLIENT_ADDRESS_BOOK_H_
+#define SRC_CLIENT_ADDRESS_BOOK_H_
 
 #include <boost/asio.hpp>
 

src/client/client_context.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CLIENT_CLIENTCONTEXT_H_
-#define SRC_CLIENT_CLIENTCONTEXT_H_
+#ifndef SRC_CLIENT_CLIENT_CONTEXT_H_
+#define SRC_CLIENT_CLIENT_CONTEXT_H_
 
 #include <map>
 #include <memory>

src/client/destination.cc

@@ -44,7 +44,7 @@
 #include <vector>
 
 #include "address_book.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "crypto/elgamal.h"
 #include "crypto/rand.h"
 #include "util/log.h"

src/client/destination.h

@@ -46,7 +46,7 @@
 #include "garlic.h"
 #include "identity.h"
 #include "lease_set.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "datagram.h"
 #include "streaming.h"
 #include "tunnel/tunnel_pool.h"

src/client/i2p_control/i2p_control.cc

@@ -42,7 +42,7 @@
 #include <string>
 
 #include "client/client_context.h"
-#include "core/network_database.h"
+#include "core/net_db.h"
 #include "core/router_context.h"
 #include "core/version.h"
 #include "crypto/rand.h"

src/client/i2p_control/i2p_control.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CLIENT_I2PCONTROL_I2PCONTROL_H_
-#define SRC_CLIENT_I2PCONTROL_I2PCONTROL_H_
+#ifndef SRC_CLIENT_I2P_CONTROL_I2P_CONTROL_H_
+#define SRC_CLIENT_I2P_CONTROL_I2P_CONTROL_H_
 
 #include <boost/asio.hpp>
 #include <boost/property_tree/ptree.hpp>

src/client/i2p_control/i2p_control_server.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CLIENT_I2PCONTROL_I2PCONTROLSERVER_H_
-#define SRC_CLIENT_I2PCONTROL_I2PCONTROLSERVER_H_
+#ifndef SRC_CLIENT_I2P_CONTROL_I2P_CONTROL_SERVER_H_
+#define SRC_CLIENT_I2P_CONTROL_I2P_CONTROL_SERVER_H_
 
 #include <inttypes.h>
 

src/client/i2p_service.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CLIENT_I2PSERVICE_H_
-#define SRC_CLIENT_I2PSERVICE_H_
+#ifndef SRC_CLIENT_I2P_SERVICE_H_
+#define SRC_CLIENT_I2P_SERVICE_H_
 
 #include <boost/asio.hpp>
 

src/client/i2p_tunnel/http_proxy.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CLIENT_I2PTUNNEL_HTTPPROXY_H_
-#define SRC_CLIENT_I2PTUNNEL_HTTPPROXY_H_
+#ifndef SRC_CLIENT_I2PTUNNEL_HTTP_PROXY_H_
+#define SRC_CLIENT_I2PTUNNEL_HTTP_PROXY_H_
 
 #include <boost/asio.hpp>
 

src/client/i2p_tunnel/i2p_tunnel.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CLIENT_I2PTUNNEL_I2PTUNNEL_H_
-#define SRC_CLIENT_I2PTUNNEL_I2PTUNNEL_H_
+#ifndef SRC_CLIENT_I2P_TUNNEL_I2P_TUNNEL_H_
+#define SRC_CLIENT_I2P_TUNNEL_I2P_TUNNEL_H_
 
 #include <boost/asio.hpp>
 

src/core/CMakeLists.txt

@@ -8,7 +8,7 @@ set(CORE_SRC
   "identity.cc"
   "lease_set.cc"
   "net_db_requests.cc"
-  "network_database.cc"
+  "net_db.cc"
   "profiling.cc"
   "reseed.cc"
   "router_context.cc"

src/core/i2np_protocol.cc

@@ -39,7 +39,7 @@
 #include <set>
 
 #include "garlic.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "crypto/elgamal.h"
 #include "crypto/hash.h"

src/core/i2np_protocol.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CORE_I2NPPROTOCOL_H_
-#define SRC_CORE_I2NPPROTOCOL_H_
+#ifndef SRC_CORE_I2NP_PROTOCOL_H_
+#define SRC_CORE_I2NP_PROTOCOL_H_
 
 #include <inttypes.h>
 #include <string.h>

src/core/lease_set.cc

@@ -37,7 +37,7 @@
 #include <memory>
 #include <vector>
 
-#include "network_database.h"
+#include "net_db.h"
 #include "crypto/rand.h"
 #include "tunnel/tunnel_pool.h"
 #include "util/i2p_endian.h"

src/core/lease_set.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CORE_LEASESET_H_
-#define SRC_CORE_LEASESET_H_
+#ifndef SRC_CORE_LEASE_SET_H_
+#define SRC_CORE_LEASE_SET_H_
 
 #include <array>
 #include <cstdint>

src/core/network_database.cc → src/core/net_db.cc

@@ -30,7 +30,7 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#include "network_database.h"
+#include "net_db.h"
 
 #include <boost/asio.hpp>
 

src/core/network_database.h → src/core/net_db.h

@@ -30,12 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-// Note: this file is named NetworkDatabase.h instead of NetDb.h to avoid
-// a possible nameclash with a file included by boost on case insensitive
-// filesystems.
-
-#ifndef SRC_CORE_NETWORKDATABASE_H_
-#define SRC_CORE_NETWORKDATABASE_H_
+#ifndef SRC_CORE_NET_DB_H_
+#define SRC_CORE_NET_DB_H_
 
 #include <inttypes.h>
 

src/core/net_db_requests.cc

@@ -33,7 +33,7 @@
 #include "net_db_requests.h"
 
 #include "i2np_protocol.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "transport/transports.h"
 #include "util/log.h"
 

src/core/net_db_requests.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CORE_NETDBREQUESTS_H_
-#define SRC_CORE_NETDBREQUESTS_H_
+#ifndef SRC_CORE_NET_DB_REQUESTS_H_
+#define SRC_CORE_NET_DB_REQUESTS_H_
 
 #include <map>
 #include <memory>

src/core/reseed.cc

@@ -43,7 +43,7 @@
 #include <vector>
 
 #include "identity.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "crypto/rand.h"
 #include "crypto/signature.h"
 #include "util/file_system.h"

src/core/router_context.cc

@@ -41,7 +41,7 @@
 #include <string>
 
 #include "i2np_protocol.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "version.h"
 #include "util/mtu.h"
 #include "util/time_stamp.h"

src/core/router_context.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CORE_ROUTERCONTEXT_H_
-#define SRC_CORE_ROUTERCONTEXT_H_
+#ifndef SRC_CORE_ROUTER_CONTEXT_H_
+#define SRC_CORE_ROUTER_CONTEXT_H_
 
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>

src/core/router_info.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CORE_ROUTERINFO_H_
-#define SRC_CORE_ROUTERINFO_H_
+#ifndef SRC_CORE_ROUTER_INFO_H_
+#define SRC_CORE_ROUTER_INFO_H_
 
 #include <boost/asio.hpp>
 

src/core/transport/ntcp.cc

@@ -37,7 +37,7 @@
 #include <string>
 
 #include "ntcp_session.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "transports.h"
 #include "util/log.h"

src/core/transport/ntcp_session.cc

@@ -41,7 +41,7 @@
 
 #include "i2np_protocol.h"
 #include "ntcp.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "transports.h"
 #include "crypto/diffie-hellman.h"

src/core/transport/ntcp_session.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CORE_TRANSPORT_NTCPSESSION_H_
-#define SRC_CORE_TRANSPORT_NTCPSESSION_H_
+#ifndef SRC_CORE_TRANSPORT_NTCP_SESSION_H_
+#define SRC_CORE_TRANSPORT_NTCP_SESSION_H_
 
 #include <boost/asio.hpp>
 

src/core/transport/ssu.cc

@@ -44,7 +44,7 @@
 
 #include "ssu.h"
 #include "crypto/rand.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "util/log.h"
 #include "util/time_stamp.h"

src/core/transport/ssu_data.cc

@@ -39,7 +39,7 @@
 #include <cstdint>
 #include <memory>
 
-#include "network_database.h"
+#include "net_db.h"
 #include "ssu.h"
 #include "util/log.h"
 #include "util/time_stamp.h"

src/core/transport/ssu_data.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CORE_TRANSPORT_SSUDATA_H_
-#define SRC_CORE_TRANSPORT_SSUDATA_H_
+#ifndef SRC_CORE_TRANSPORT_SSU_DATA_H_
+#define SRC_CORE_TRANSPORT_SSU_DATA_H_
 
 #include <boost/asio.hpp>
 

src/core/transport/ssu_session.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CORE_TRANSPORT_SSUSESSION_H_
-#define SRC_CORE_TRANSPORT_SSUSESSION_H_
+#ifndef SRC_CORE_TRANSPORT_SSU_SESSION_H_
+#define SRC_CORE_TRANSPORT_SSU_SESSION_H_
 
 #include <inttypes.h>
 

src/core/transport/transport_session.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CORE_TRANSPORT_TRANSPORTSESSION_H_
-#define SRC_CORE_TRANSPORT_TRANSPORTSESSION_H_
+#ifndef SRC_CORE_TRANSPORT_TRANSPORT_SESSION_H_
+#define SRC_CORE_TRANSPORT_TRANSPORT_SESSION_H_
 
 #include <cstdint>
 #include <iostream>

src/core/transport/transports.cc

@@ -39,7 +39,7 @@
 #include <vector>
 
 #include "i2np_protocol.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "crypto/diffie-hellman.h"
 #include "crypto/rand.h"

src/core/transport/upnp.cc

@@ -50,7 +50,7 @@
 #include <string>
 #include <thread>
 
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "util/log.h"
 

src/core/tunnel/transit_tunnel.h

@@ -30,8 +30,8 @@
  * Parts of the project are originally copyright (c) 2013-2015 The PurpleI2P Project          //
  */
 
-#ifndef SRC_CORE_TUNNEL_TRANSITTUNNEL_H_
-#define SRC_CORE_TUNNEL_TRANSITTUNNEL_H_
+#ifndef SRC_CORE_TUNNEL_TRANSIT_TUNNEL_H_
+#define SRC_CORE_TUNNEL_TRANSIT_TUNNEL_H_
 
 #include <inttypes.h>
 

src/core/tunnel/tunnel.cc

@@ -42,7 +42,7 @@
 
 #include "crypto/rand.h"
 #include "i2np_protocol.h"
-#include "network_database.h"
+#include "net_db.h"
 #include "router_context.h"
 #include "tunnel.h"
 #include "transport/transports.h"