Merge pull request #258 from EinMByte/master

Fix #253.

CMakeLists.txt

@@ -60,7 +60,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         )
     endif()
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    # TODO: more tweaks
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -undefined dynamic_lookup")
 endif()
 
 # Compiler flags customization (by system)

client/Daemon.cpp

@@ -9,7 +9,7 @@
 #include "RouterInfo.h"
 #include "RouterContext.h"
 #include "tunnel/Tunnel.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "Garlic.h"
 #include "util/util.h"
 #include "Streaming.h"

client/HTTPServer.cpp

@@ -7,7 +7,7 @@
 #include "tunnel/Tunnel.h"
 #include "tunnel/TransitTunnel.h"
 #include "transport/Transports.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/I2PEndian.h"
 #include "Streaming.h"
 #include "Destination.h"

client/i2pcontrol/I2PControl.cpp

@@ -15,7 +15,7 @@
 #include "util/Timestamp.h"
 #include "transport/Transports.h"
 #include "tunnel/Tunnel.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "version.h"
 #include "Daemon.h"
 

core/AddressBook.cpp

@@ -12,7 +12,7 @@
 #include "util/util.h"
 #include "Identity.h"
 #include "util/Log.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "AddressBook.h"
 #include "Destination.h"
 

core/CMakeLists.txt

@@ -22,7 +22,7 @@ set(CORE_SRC
   "Identity.cpp"
   "LeaseSet.cpp"
   "NetDbRequests.cpp"	
-  "NetDb.cpp"
+  "NetworkDatabase.cpp"
   "Profiling.cpp"
   "RouterContext.cpp"
   "RouterInfo.cpp"

core/Destination.cpp

@@ -5,7 +5,7 @@
 #include "util/util.h"
 #include "crypto/ElGamal.h"
 #include "util/Timestamp.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "Destination.h"
 #include "AddressBook.h"
 

core/Destination.h

@@ -14,7 +14,7 @@
 #include "crypto/CryptoConst.h"
 #include "LeaseSet.h"
 #include "Garlic.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "Streaming.h"
 #include "Datagram.h"
 

core/I2NPProtocol.cpp

@@ -5,7 +5,7 @@
 #include "crypto/ElGamal.h"
 #include "util/Timestamp.h"
 #include "RouterContext.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "tunnel/Tunnel.h"
 #include "transport/Transports.h"
 #include "Garlic.h"

core/LeaseSet.cpp

@@ -5,7 +5,7 @@
 #include "crypto/CryptoConst.h"
 #include "util/Log.h"
 #include "util/Timestamp.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "tunnel/TunnelPool.h"
 #include "LeaseSet.h"
 

core/NetDbRequests.cpp

@@ -1,7 +1,7 @@
 #include "util/Log.h"
 #include "I2NPProtocol.h"
 #include "transport/Transports.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "NetDbRequests.h"
 
 namespace i2p

core/NetworkDatabase.cpp

@@ -12,7 +12,7 @@
 #include "transport/Transports.h"
 #include "RouterContext.h"
 #include "Garlic.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/util.h"
 
 using namespace i2p::transport;

core/NetworkDatabase.h

@@ -1,3 +1,8 @@
+/**
+ * @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 NETDB_H__
 #define NETDB_H__
 

core/Reseed.cpp

@@ -16,7 +16,7 @@
 #include "util/Log.h"
 #include "Identity.h"
 #include "crypto/CryptoConst.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/util.h"
 
 

core/RouterContext.cpp

@@ -6,7 +6,7 @@
 #include "RouterContext.h"
 #include "util/Timestamp.h"
 #include "I2NPProtocol.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/util.h"
 #include "version.h"
 

core/UPnP.cpp

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

core/api.cpp

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

core/transport/NTCPSession.cpp

@@ -10,7 +10,7 @@
 #include "I2NPProtocol.h"
 #include "RouterContext.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "NTCPSession.h"
 
 using namespace i2p::crypto;

core/transport/SSU.cpp

@@ -3,7 +3,7 @@
 #include "util/Log.h"
 #include "util/Timestamp.h"
 #include "RouterContext.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "SSU.h"
 
 namespace i2p

core/transport/SSUData.cpp

@@ -2,7 +2,7 @@
 #include <boost/bind.hpp>
 #include "util/Log.h"
 #include "util/Timestamp.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "SSU.h"
 #include "SSUData.h"
 

core/transport/Transports.cpp

@@ -3,7 +3,7 @@
 #include "crypto/CryptoConst.h"
 #include "RouterContext.h"
 #include "I2NPProtocol.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "Transports.h"
 
 using namespace i2p::data;

core/tunnel/Tunnel.cpp

@@ -9,7 +9,7 @@
 #include "util/Timestamp.h"
 #include "I2NPProtocol.h"
 #include "transport/Transports.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "Tunnel.h"
 
 namespace i2p

core/tunnel/TunnelEndpoint.cpp

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

core/tunnel/TunnelPool.cpp

@@ -2,7 +2,7 @@
 #include "util/I2PEndian.h"
 #include "crypto/CryptoConst.h"
 #include "Tunnel.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/Timestamp.h"
 #include "Garlic.h"
 #include "transport/Transports.h"