oxen-io/lokinet
1
1
Fork 0
mirror of https://github.com/oxen-io/lokinet synced 2023-12-14 06:53:00 +01:00
Code Issues Projects Releases Wiki Activity

initial wack at lokimq

Browse source
This commit is contained in:
Jeff Becker 2020-05-19 14:53:03 -04:00
parent fd4b03f896
commit 9bfff61d08
No known key found for this signature in database
GPG key ID: F357B3B42F6F9B05
6 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitmodules vendored
View file

@ -31,4 +31,3 @@
path = external/loki-mq path = external/loki-mq
url = https://github.com/loki-project/loki-mq url = https://github.com/loki-project/loki-mq
branch = dev branch = dev

3
CMakeLists.txt
View file

@ -276,9 +276,6 @@ if(SUBMODULE_CHECK)
endif() endif()
endif() endif()
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 # 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. # down loads a broken PythonInterp that loads Python2, but Python2 headers are not C++17 compatible.

1
llarp/CMakeLists.txt
View file

@ -225,6 +225,7 @@ endif()
target_link_libraries(liblokinet PUBLIC cxxopts lokinet-platform lokinet-util lokinet-cryptography lokimq) target_link_libraries(liblokinet PUBLIC cxxopts lokinet-platform lokinet-util lokinet-cryptography lokimq)
target_link_libraries(liblokinet PRIVATE libunbound) target_link_libraries(liblokinet PRIVATE libunbound)
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
install(TARGETS lokinet-util lokinet-platform liblokinet LIBRARY DESTINATION lib) install(TARGETS lokinet-util lokinet-platform liblokinet LIBRARY DESTINATION lib)
if(WIN32) if(WIN32)

1
llarp/router/router.hpp
View file

@ -265,6 +265,7 @@ namespace llarp
const llarp_time_t _randomStartDelay; const llarp_time_t _randomStartDelay;
std::shared_ptr<rpc::LokidRpcClient> m_lokidRpcClient; std::shared_ptr<rpc::LokidRpcClient> m_lokidRpcClient;
std::string lokidRPCAddr = "ipc://loki.sock"; std::string lokidRPCAddr = "ipc://loki.sock";
std::string lokidRPCUser; std::string lokidRPCUser;
std::string lokidRPCPassword; std::string lokidRPCPassword;

1
llarp/rpc/lokid_rpc_client.cpp
View file

@ -32,6 +32,7 @@ namespace llarp
return lokimq::LogLevel::trace; return lokimq::LogLevel::trace;
} }
} }
LokidRpcClient::LokidRpcClient(LMQ_ptr lmq, AbstractRouter* r) LokidRpcClient::LokidRpcClient(LMQ_ptr lmq, AbstractRouter* r)
: m_lokiMQ(std::move(lmq)), m_Router(r) : m_lokiMQ(std::move(lmq)), m_Router(r)
{ {

4
llarp/rpc/lokid_rpc_client.hpp
View file

@ -23,10 +23,6 @@ namespace llarp
void void
ConnectAsync(std::string_view url); ConnectAsync(std::string_view url);
/// blocking request identity key from lokid
std::optional<SecretKey>
ObtainIdentityKey();
private: private:
/// called when we have connected to lokid via lokimq /// called when we have connected to lokid via lokimq
void void