Merge pull request #83

ab6fae4 Cherry-pick remaining doc/crypto commits from #81 (anonimal)
47223f8 Cherry-pick commits from #81. (anonimal)
661b002 Revert #81 before cherry-picking. (anonimal)

CMakeLists.txt

@@ -14,7 +14,6 @@ option(WITH_OPTIMIZE   "Optimization flags" OFF)
 option(WITH_STATIC     "Static build" OFF)
 option(WITH_TESTS      "Build unit tests" OFF)
 option(WITH_UPNP       "Include support for UPnP client" OFF)
-option(WITH_LUA        "Build lua interpreter" OFF)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
@@ -204,7 +203,6 @@ message(STATUS "  OPTIMIZATION     : ${WITH_OPTIMIZE}")
 message(STATUS "  STATIC BUILD     : ${WITH_STATIC}")
 message(STATUS "  TESTS            : ${WITH_TESTS}")
 message(STATUS "  UPnP             : ${WITH_UPNP}")
-message(STATUS "  Lua Interpreter  : ${WITH_LUA}")
 message(STATUS "---------------------------------------")
 
 # Handle paths nicely

src/client/Daemon.cpp

@@ -43,7 +43,6 @@
 #include "transport/NTCPSession.h"
 #include "transport/Transports.h"
 #include "tunnel/Tunnel.h"
-#include "util/Filesystem.h"
 
 namespace i2p {
 namespace util {
@@ -63,14 +62,9 @@ bool Daemon_Singleton::IsService() const {
 
 // TODO(anonimal): find a better way to initialize
 bool Daemon_Singleton::Init() {
-  i2p::context.InitFrom(i2p::util::filesystem::GetFullPath(i2p::ROUTER_KEYS),
-    i2p::util::filesystem::GetFullPath(i2p::ROUTER_INFO));
+  i2p::context.Init();
   m_IsDaemon = i2p::util::config::varMap["daemon"].as<bool>();
   m_IsLogging = i2p::util::config::varMap["log"].as<bool>();
-  // stop logging if we specifiy no logging
-  if (!m_IsLogging) {
-    m_log->Stop();
-  }
   int port = i2p::util::config::varMap["port"].as<int>();
   i2p::context.UpdatePort(port);
   i2p::context.UpdateAddress(
@@ -107,29 +101,29 @@ bool Daemon_Singleton::Start() {
     } else {
       StartLog("");  // write to stdout
     }
-  }
-  try {
-    LogPrint("Starting NetDB...");
-    if (i2p::data::netdb.Start()) {
-      LogPrint("NetDB started");
-    } else {
-      LogPrint("NetDB failed to start");
+    try {
+      LogPrint("Starting NetDB...");
+      if (i2p::data::netdb.Start()) {
+        LogPrint("NetDB started");
+      } else {
+        LogPrint("NetDB failed to start");
+        return false;
+      }
+      LogPrint("Starting transports...");
+      i2p::transport::transports.Start();
+      LogPrint("Transports started");
+
+      LogPrint("Starting tunnels...");
+      i2p::tunnel::tunnels.Start();
+      LogPrint("Tunnels started");
+
+      LogPrint("Starting client...");
+      i2p::client::context.Start();
+      LogPrint("Client started");
+    } catch (std::runtime_error& e) {
+      LogPrint(eLogError, e.what());
       return false;
     }
-    LogPrint("Starting transports...");
-    i2p::transport::transports.Start();
-    LogPrint("Transports started");
-
-    LogPrint("Starting tunnels...");
-    i2p::tunnel::tunnels.Start();
-    LogPrint("Tunnels started");
-
-    LogPrint("Starting client...");
-    i2p::client::context.Start();
-    LogPrint("Client started");
-  } catch (std::runtime_error& e) {
-    LogPrint(eLogError, e.what());
-    return false;
   }
   return true;
 }

src/core/CMakeLists.txt

@@ -108,19 +108,6 @@ if(WITH_LIBRARY)
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-  if(WITH_LUA)
-    find_package("LuaJIT")
-    set(LUA_NAME "i2lua")
-    set(LUA_SRC
-      "lua/Main.cpp"
-      "lua/NetDB.cpp"
-    )
-    include_directories(${LUAJIT_INCLUDE_DIR})
-    add_executable(${LUA_NAME} ${LUA_SRC})
-    target_link_libraries(${LUA_NAME} ${LUAJIT_LIBRARIES} ${CORE_NAME})
-  endif()
-
 endif()
 
 # vim: noai:ts=2:sw=2

src/core/NetworkDatabase.cpp

@@ -370,19 +370,6 @@ void NetDb::Load() {
   LogPrint(m_Floodfills.size(), " floodfills loaded");
 }
 
-std::shared_ptr<const RouterInfo> NetDb::GetRouterByHash(IdentHash & ih) const {
-  std::shared_ptr<const RouterInfo> ri = nullptr;
-  {
-    std::lock_guard<std::mutex> lock(m_RouterInfosMutex);
-    auto itr = m_RouterInfos.find(ih);
-    if (itr != m_RouterInfos.end()) {
-      // exists
-      ri = itr->second;
-    }
-  }
-  return ri;
-}
-
 void NetDb::SaveUpdated() {
   auto GetFilePath = [](
       const boost::filesystem::path& directory,

src/core/NetworkDatabase.h

@@ -99,8 +99,6 @@ class NetDb {
   void HandleDatabaseLookupMsg(
       std::shared_ptr<const I2NPMessage> msg);
 
-
-  std::shared_ptr<const RouterInfo> GetRouterByHash(IdentHash & ih) const;
   std::shared_ptr<const RouterInfo> GetRandomRouter() const;
   std::shared_ptr<const RouterInfo> GetRandomRouter(
       std::shared_ptr<const RouterInfo> compatibleWith) const;