PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Merge pull request #258 from EinMByte/master 

Fix #253.
pull/265/head
EinMByte 9 years ago
parent
f0aa7b55be ab3b100402
commit
2fcc91a755
24 changed files with 28 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      CMakeLists.txt
  2. 2
      client/Daemon.cpp
  3. 2
      client/HTTPServer.cpp
  4. 2
      client/i2pcontrol/I2PControl.cpp
  5. 2
      core/AddressBook.cpp
  6. 2
      core/CMakeLists.txt
  7. 2
      core/Destination.cpp
  8. 2
      core/Destination.h
  9. 2
      core/I2NPProtocol.cpp
  10. 2
      core/LeaseSet.cpp
  11. 2
      core/NetDbRequests.cpp
  12. 2
      core/NetworkDatabase.cpp
  13. 5
      core/NetworkDatabase.h
  14. 2
      core/Reseed.cpp
  15. 2
      core/RouterContext.cpp
  16. 2
      core/UPnP.cpp
  17. 2
      core/api.cpp
  18. 2
      core/transport/NTCPSession.cpp
  19. 2
      core/transport/SSU.cpp
  20. 2
      core/transport/SSUData.cpp
  21. 2
      core/transport/Transports.cpp
  22. 2
      core/tunnel/Tunnel.cpp
  23. 2
      core/tunnel/TunnelEndpoint.cpp
  24. 2
      core/tunnel/TunnelPool.cpp

2
CMakeLists.txt
Unescape View File

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

2
client/Daemon.cpp
Unescape View File

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

2
client/HTTPServer.cpp
Unescape View File

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

2
client/i2pcontrol/I2PControl.cpp
Unescape View File

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

2
core/AddressBook.cpp
Unescape View File

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

2
core/CMakeLists.txt
Unescape View File

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

2
core/Destination.cpp
Unescape View File

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

2
core/Destination.h
Unescape View File

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

2
core/I2NPProtocol.cpp
Unescape View File

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

2
core/LeaseSet.cpp
Unescape View File

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

2
core/NetDbRequests.cpp
Unescape View File

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

2
core/NetDb.cpp → core/NetworkDatabase.cpp
Unescape View File

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

5
core/NetDb.h → core/NetworkDatabase.h
Unescape View File

@ -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__ #ifndef NETDB_H__
#define NETDB_H__ #define NETDB_H__

2
core/Reseed.cpp
Unescape View File

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

2
core/RouterContext.cpp
Unescape View File

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

2
core/UPnP.cpp
Unescape View File

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

2
core/api.cpp
Unescape View File

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

2
core/transport/NTCPSession.cpp
Unescape View File

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

2
core/transport/SSU.cpp
Unescape View File

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

2
core/transport/SSUData.cpp
Unescape View File

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

2
core/transport/Transports.cpp
Unescape View File

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

2
core/tunnel/Tunnel.cpp
Unescape View File

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

2
core/tunnel/TunnelEndpoint.cpp
Unescape View File

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

2
core/tunnel/TunnelPool.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save