WIP: LokidRpcClient

4 years ago · fd4b03f896
parent 17026a0b21
commit fd4b03f896
4 changed files with 4 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -276,7 +276,9 @@ if(SUBMODULE_CHECK)
  endif()
 endif()

-add_subdirectory(external/loki-mq EXCLUDE_FROM_ALL)
+add_subdirectory(external/loki-mq)
+include_directories(external/loki-mq)
+include_directories(external/loki-mq/mapbox-variant/include)

 # We only actually need pybind11 with WITH_HIVE, but if we don't load it here then something further
 # down loads a broken PythonInterp that loads Python2, but Python2 headers are not C++17 compatible.
--- a/llarp/router/router.hpp
+++ b/llarp/router/router.hpp
@ -265,7 +265,6 @@ namespace llarp
    const llarp_time_t _randomStartDelay;

    std::shared_ptr<rpc::LokidRpcClient> m_lokidRpcClient;
-
    std::string lokidRPCAddr = "ipc://loki.sock";
    std::string lokidRPCUser;
    std::string lokidRPCPassword;
--- a/llarp/rpc/lokid_rpc_client.cpp
+++ b/llarp/rpc/lokid_rpc_client.cpp
@ -32,7 +32,6 @@ namespace llarp
          return lokimq::LogLevel::trace;
      }
    }
-
    LokidRpcClient::LokidRpcClient(LMQ_ptr lmq, AbstractRouter* r)
        : m_lokiMQ(std::move(lmq)), m_Router(r)
    {
--- a/llarp/rpc/lokid_rpc_client.hpp
+++ b/llarp/rpc/lokid_rpc_client.hpp
@ -3,6 +3,7 @@
 #include <router_id.hpp>

 #include <lokimq/lokimq.h>
+
 #include <crypto/types.hpp>

 namespace llarp