mirror of https://github.com/oxen-io/lokinet
Clang format include sorting + CMake
- includes are now sorted in consistent, logical order; first step in an attempt to fix the tomfoolery (no relation to Tom) brought in by include-what-you-use - shuffled around some cmake linking to simplify dependency graph - superfluous files removedpull/2213/head
dr7ana
7 months ago
parent
bda8b211dd
commit
46ad8d4058
@ -1,6 +1,4 @@
|
||||
set(GRAPHVIZ_GRAPH_NAME "graph.dot" CACHE STRING "")
|
||||
# set(GRAPHVIZ_MODULE_LIBS OFF CACHE BOOL "")
|
||||
# set(GRAPHVIZ_EXTERNAL_LIBS OFF CACHE BOOL "")
|
||||
set(GRAPHVIZ_GENERATE_PER_TARGET FALSE CACHE BOOL "")
|
||||
set(GRAPHVIZ_GENERATE_DEPENDERS FALSE CACHE BOOL "")
|
||||
set(GRAPHVIZ_OBJECT_LIBS OFF CACHE BOOL "")
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
|
||||
#include "lokinet/lokinet_addr.h"
|
||||
#include "lokinet/lokinet_context.h"
|
||||
#include "lokinet/lokinet_srv.h"
|
||||
#include "lokinet/lokinet_misc.h"
|
||||
#include "lokinet/lokinet_addr.h"
|
||||
#include "lokinet/lokinet_srv.h"
|
||||
#include "lokinet/lokinet_stream.h"
|
||||
#include "lokinet/lokinet_udp.h"
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
/// default queue length for logic jobs
|
||||
constexpr std::size_t event_loop_queue_size = 1024;
|
||||
} // namespace llarp
|
||||
@ -1,662 +0,0 @@
|
||||
|
||||
#include "explorenetworkjob.hpp"
|
||||
#include "localrouterlookup.hpp"
|
||||
#include "localserviceaddresslookup.hpp"
|
||||
#include "localtaglookup.hpp"
|
||||
#include "node.hpp"
|
||||
#include "publishservicejob.hpp"
|
||||
#include "recursiverouterlookup.hpp"
|
||||
#include "serviceaddresslookup.hpp"
|
||||
#include "taglookup.hpp"
|
||||
#include <llarp/path/path_context.hpp>
|
||||
#include <llarp/router/router.hpp>
|
||||
#include <llarp/nodedb.hpp>
|
||||
#include <llarp/profiling.hpp>
|
||||
#include <llarp/router/rc_lookup_handler.hpp>
|
||||
#include <llarp/util/decaying_hashset.hpp>
|
||||
#include <vector>
|
||||
|
||||
namespace llarp::dht
|
||||
{
|
||||
AbstractDHTMessageHandler::~AbstractDHTMessageHandler() = default;
|
||||
|
||||
struct DHTMessageHandler final : public AbstractDHTMessageHandler
|
||||
{
|
||||
DHTMessageHandler();
|
||||
|
||||
~DHTMessageHandler() override = default;
|
||||
|
||||
util::StatusObject
|
||||
ExtractStatus() const override;
|
||||
|
||||
void
|
||||
StoreRC(const RouterContact rc) const override
|
||||
{
|
||||
GetRouter()->rc_lookup_handler().check_rc(rc);
|
||||
}
|
||||
|
||||
// void
|
||||
// LookupIntroSetRelayed(
|
||||
// const Key_t& target,
|
||||
// const Key_t& whoasked,
|
||||
// uint64_t whoaskedTX,
|
||||
// const Key_t& askpeer,
|
||||
// uint64_t relayOrder,
|
||||
// service::EncryptedIntroSetLookupHandler result = nullptr) override;
|
||||
|
||||
// void
|
||||
// LookupIntroSetDirect(
|
||||
// const Key_t& target,
|
||||
// const Key_t& whoasked,
|
||||
// uint64_t whoaskedTX,
|
||||
// const Key_t& askpeer,
|
||||
// service::EncryptedIntroSetLookupHandler result = nullptr) override;
|
||||
|
||||
/// on behalf of whoasked request router with public key target from dht
|
||||
/// router with key askpeer
|
||||
void
|
||||
LookupRouterRecursive(
|
||||
const RouterID& target,
|
||||
const Key_t& whoasked,
|
||||
uint64_t whoaskedTX,
|
||||
const Key_t& askpeer,
|
||||
RouterLookupHandler result = nullptr) override;
|
||||
|
||||
bool
|
||||
LookupRouter(const RouterID& target, RouterLookupHandler result) override
|
||||
{
|
||||
Key_t askpeer;
|
||||
if (!_nodes->FindClosest(Key_t(target), askpeer))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
LookupRouterRecursive(target, OurKey(), 0, askpeer, result);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
HasRouterLookup(const RouterID& target) const override
|
||||
{
|
||||
return pendingRouterLookups().HasLookupFor(target);
|
||||
}
|
||||
|
||||
/// issue dht lookup for router via askpeer and send reply to local path
|
||||
void
|
||||
LookupRouterForPath(
|
||||
const RouterID& target, uint64_t txid, const PathID_t& path, const Key_t& askpeer) override;
|
||||
|
||||
/// issue dht lookup for introset for addr via askpeer and send reply to
|
||||
/// local path
|
||||
void
|
||||
LookupIntroSetForPath(
|
||||
const Key_t& addr,
|
||||
uint64_t txid,
|
||||
const llarp::PathID_t& path,
|
||||
const Key_t& askpeer,
|
||||
uint64_t relayOrder) override;
|
||||
|
||||
/// send a dht message to peer, if keepalive is true then keep the session
|
||||
/// with that peer alive for 10 seconds
|
||||
void
|
||||
DHTSendTo(const RouterID& peer, AbstractDHTMessage* msg, bool keepalive = true) override;
|
||||
|
||||
/// get routers closest to target excluding requester
|
||||
bool
|
||||
HandleExploritoryRouterLookup(
|
||||
const Key_t& requester,
|
||||
uint64_t txid,
|
||||
const RouterID& target,
|
||||
std::vector<std::unique_ptr<AbstractDHTMessage>>& reply) override;
|
||||
|
||||
/// handle rc lookup from requester for target
|
||||
void
|
||||
LookupRouterRelayed(
|
||||
const Key_t& requester,
|
||||
uint64_t txid,
|
||||
const Key_t& target,
|
||||
bool recursive,
|
||||
std::vector<std::unique_ptr<AbstractDHTMessage>>& replies) override;
|
||||
|
||||
/// relay a dht message from a local path to the main network
|
||||
bool
|
||||
RelayRequestForPath(const llarp::PathID_t& localPath, const AbstractDHTMessage& msg) override;
|
||||
|
||||
/// send introset to peer as R/S
|
||||
void
|
||||
PropagateLocalIntroSet(
|
||||
const PathID_t& from,
|
||||
uint64_t txid,
|
||||
const service::EncryptedIntroSet& introset,
|
||||
const Key_t& tellpeer,
|
||||
uint64_t relayOrder) override;
|
||||
|
||||
/// send introset to peer from source with S counter and excluding peers
|
||||
void
|
||||
PropagateIntroSetTo(
|
||||
const Key_t& from,
|
||||
uint64_t txid,
|
||||
const service::EncryptedIntroSet& introset,
|
||||
const Key_t& tellpeer,
|
||||
uint64_t relayOrder) override;
|
||||
|
||||
/// initialize dht context and explore every exploreInterval milliseconds
|
||||
void
|
||||
Init(const Key_t& us, Router* router) override;
|
||||
|
||||
/// get localally stored introset by service address
|
||||
std::optional<llarp::service::EncryptedIntroSet>
|
||||
GetIntroSetByLocation(const Key_t& location) const override;
|
||||
|
||||
void
|
||||
handle_cleaner_timer();
|
||||
|
||||
/// explore dht for new routers
|
||||
void
|
||||
Explore(size_t N = 3);
|
||||
|
||||
llarp::Router* router{nullptr};
|
||||
// for router contacts
|
||||
std::unique_ptr<Bucket<RCNode>> _nodes;
|
||||
|
||||
// for introduction sets
|
||||
std::unique_ptr<Bucket<ISNode>> _services;
|
||||
|
||||
Bucket<ISNode>*
|
||||
services() override
|
||||
{
|
||||
return _services.get();
|
||||
}
|
||||
|
||||
bool allowTransit{false};
|
||||
|
||||
bool&
|
||||
AllowTransit() override
|
||||
{
|
||||
return allowTransit;
|
||||
}
|
||||
const bool&
|
||||
AllowTransit() const override
|
||||
{
|
||||
return allowTransit;
|
||||
}
|
||||
|
||||
Bucket<RCNode>*
|
||||
Nodes() const override
|
||||
{
|
||||
return _nodes.get();
|
||||
}
|
||||
|
||||
void
|
||||
PutRCNodeAsync(const RCNode& val) override
|
||||
{
|
||||
router->loop()->call([nodes = Nodes(), val] { nodes->PutNode(val); });
|
||||
}
|
||||
|
||||
void
|
||||
DelRCNodeAsync(const Key_t& val) override
|
||||
{
|
||||
router->loop()->call([nodes = Nodes(), val] { nodes->DelNode(val); });
|
||||
}
|
||||
|
||||
const Key_t&
|
||||
OurKey() const override
|
||||
{
|
||||
return ourKey;
|
||||
}
|
||||
|
||||
llarp::Router*
|
||||
GetRouter() const override
|
||||
{
|
||||
return router;
|
||||
}
|
||||
|
||||
bool
|
||||
GetRCFromNodeDB(const Key_t& k, llarp::RouterContact& rc) const override
|
||||
{
|
||||
if (const auto maybe = router->node_db()->Get(k.as_array()); maybe.has_value())
|
||||
{
|
||||
rc = *maybe;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
PendingIntrosetLookups _pendingIntrosetLookups;
|
||||
PendingRouterLookups _pendingRouterLookups;
|
||||
PendingExploreLookups _pendingExploreLookups;
|
||||
|
||||
PendingIntrosetLookups&
|
||||
pendingIntrosetLookups() override
|
||||
{
|
||||
return _pendingIntrosetLookups;
|
||||
}
|
||||
|
||||
const PendingIntrosetLookups&
|
||||
pendingIntrosetLookups() const override
|
||||
{
|
||||
return _pendingIntrosetLookups;
|
||||
}
|
||||
|
||||
PendingRouterLookups&
|
||||
pendingRouterLookups() override
|
||||
{
|
||||
return _pendingRouterLookups;
|
||||
}
|
||||
|
||||
const PendingRouterLookups&
|
||||
pendingRouterLookups() const override
|
||||
{
|
||||
return _pendingRouterLookups;
|
||||
}
|
||||
|
||||
PendingExploreLookups&
|
||||
pendingExploreLookups() override
|
||||
{
|
||||
return _pendingExploreLookups;
|
||||
}
|
||||
|
||||
const PendingExploreLookups&
|
||||
pendingExploreLookups() const override
|
||||
{
|
||||
return _pendingExploreLookups;
|
||||
}
|
||||
|
||||
uint64_t
|
||||
NextID()
|
||||
{
|
||||
return ++ids;
|
||||
}
|
||||
|
||||
llarp_time_t
|
||||
Now() const override;
|
||||
|
||||
void
|
||||
ExploreNetworkVia(const Key_t& peer) override;
|
||||
|
||||
bool
|
||||
handle_message(
|
||||
const AbstractDHTMessage&, std::vector<std::unique_ptr<dht::AbstractDHTMessage>>&) override;
|
||||
|
||||
private:
|
||||
std::shared_ptr<int> _timer_keepalive;
|
||||
|
||||
void
|
||||
CleanupTX();
|
||||
|
||||
uint64_t ids;
|
||||
|
||||
Key_t ourKey;
|
||||
};
|
||||
|
||||
DHTMessageHandler::DHTMessageHandler()
|
||||
{
|
||||
randombytes((byte_t*)&ids, sizeof(uint64_t));
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::Explore(size_t N)
|
||||
{
|
||||
// ask N random peers for new routers
|
||||
llarp::LogDebug("Exploring network via ", N, " peers");
|
||||
std::set<Key_t> peers;
|
||||
|
||||
if (_nodes->GetManyRandom(peers, N))
|
||||
{
|
||||
for (const auto& peer : peers)
|
||||
ExploreNetworkVia(peer);
|
||||
}
|
||||
else
|
||||
llarp::LogError("failed to select ", N, " random nodes for exploration");
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::ExploreNetworkVia(const Key_t& askpeer)
|
||||
{
|
||||
uint64_t txid = ++ids;
|
||||
const TXOwner peer(askpeer, txid);
|
||||
const TXOwner whoasked(OurKey(), txid);
|
||||
const RouterID K(askpeer.as_array());
|
||||
pendingExploreLookups().NewTX(
|
||||
peer, whoasked, K, new ExploreNetworkJob(askpeer.as_array(), this));
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::handle_cleaner_timer()
|
||||
{
|
||||
// clean up transactions
|
||||
CleanupTX();
|
||||
const llarp_time_t now = Now();
|
||||
|
||||
if (_nodes)
|
||||
{
|
||||
// expire router contacts in memory
|
||||
auto& nodes = _nodes->nodes;
|
||||
auto itr = nodes.begin();
|
||||
while (itr != nodes.end())
|
||||
{
|
||||
if (itr->second.rc.IsExpired(now))
|
||||
{
|
||||
itr = nodes.erase(itr);
|
||||
}
|
||||
else
|
||||
++itr;
|
||||
}
|
||||
}
|
||||
|
||||
if (_services)
|
||||
{
|
||||
// expire intro sets
|
||||
auto& nodes = _services->nodes;
|
||||
auto itr = nodes.begin();
|
||||
while (itr != nodes.end())
|
||||
{
|
||||
if (itr->second.introset.IsExpired(now))
|
||||
{
|
||||
itr = nodes.erase(itr);
|
||||
}
|
||||
else
|
||||
++itr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::LookupRouterRelayed(
|
||||
const Key_t& requester,
|
||||
uint64_t txid,
|
||||
const Key_t& target,
|
||||
bool recursive,
|
||||
std::vector<std::unique_ptr<AbstractDHTMessage>>& replies)
|
||||
{
|
||||
if (target == ourKey)
|
||||
{
|
||||
// we are the target, give them our RC
|
||||
replies.emplace_back(new GotRouterMessage(requester, txid, {router->rc()}, false));
|
||||
return;
|
||||
}
|
||||
if (not GetRouter()->SessionToRouterAllowed(target.as_array()))
|
||||
{
|
||||
// explicitly not allowed
|
||||
replies.emplace_back(new GotRouterMessage(requester, txid, {}, false));
|
||||
return;
|
||||
}
|
||||
const auto rc = GetRouter()->node_db()->FindClosestTo(target);
|
||||
const Key_t next(rc.pubkey);
|
||||
{
|
||||
if (next == target)
|
||||
{
|
||||
// we know the target
|
||||
if (rc.ExpiresSoon(llarp::time_now_ms()))
|
||||
{
|
||||
// ask target for their rc to keep it updated
|
||||
LookupRouterRecursive(target.as_array(), requester, txid, next);
|
||||
}
|
||||
else
|
||||
{
|
||||
// send reply with rc we know of
|
||||
replies.emplace_back(new GotRouterMessage(requester, txid, {rc}, false));
|
||||
}
|
||||
}
|
||||
else if (recursive) // are we doing a recursive lookup?
|
||||
{
|
||||
// is the next peer we ask closer to the target than us?
|
||||
if ((next ^ target) < (ourKey ^ target))
|
||||
{
|
||||
// yes it is closer, ask neighbour recursively
|
||||
LookupRouterRecursive(target.as_array(), requester, txid, next);
|
||||
}
|
||||
else
|
||||
{
|
||||
// no we are closer to the target so tell requester it's not there
|
||||
// so they switch to iterative lookup
|
||||
replies.emplace_back(new GotRouterMessage(requester, txid, {}, false));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// iterative lookup and we don't have it tell them who is closer
|
||||
replies.emplace_back(new GotRouterMessage(requester, next, txid, false));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::optional<llarp::service::EncryptedIntroSet>
|
||||
DHTMessageHandler::GetIntroSetByLocation(const Key_t& key) const
|
||||
{
|
||||
auto itr = _services->nodes.find(key);
|
||||
if (itr == _services->nodes.end())
|
||||
return {};
|
||||
return itr->second.introset;
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::CleanupTX()
|
||||
{
|
||||
auto now = Now();
|
||||
llarp::LogTrace("DHT tick");
|
||||
|
||||
pendingRouterLookups().Expire(now);
|
||||
_pendingIntrosetLookups.Expire(now);
|
||||
pendingExploreLookups().Expire(now);
|
||||
}
|
||||
|
||||
util::StatusObject
|
||||
DHTMessageHandler::ExtractStatus() const
|
||||
{
|
||||
util::StatusObject obj{
|
||||
{"pendingRouterLookups", pendingRouterLookups().ExtractStatus()},
|
||||
{"pendingIntrosetLookups", _pendingIntrosetLookups.ExtractStatus()},
|
||||
{"pendingExploreLookups", pendingExploreLookups().ExtractStatus()},
|
||||
{"nodes", _nodes->ExtractStatus()},
|
||||
{"services", _services->ExtractStatus()},
|
||||
{"ourKey", ourKey.ToHex()}};
|
||||
return obj;
|
||||
}
|
||||
|
||||
bool
|
||||
DHTMessageHandler::handle_message(
|
||||
const AbstractDHTMessage& msg, std::vector<std::unique_ptr<dht::AbstractDHTMessage>>& replies)
|
||||
{
|
||||
return msg.handle_message(*this, replies);
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::Init(const Key_t& us, Router* r)
|
||||
{
|
||||
router = r;
|
||||
ourKey = us;
|
||||
_nodes = std::make_unique<Bucket<RCNode>>(ourKey, llarp::randint);
|
||||
_services = std::make_unique<Bucket<ISNode>>(ourKey, llarp::randint);
|
||||
llarp::LogDebug("initialize dht with key ", ourKey);
|
||||
// start cleanup timer
|
||||
_timer_keepalive = std::make_shared<int>(0);
|
||||
router->loop()->call_every(1s, _timer_keepalive, [this] { handle_cleaner_timer(); });
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::DHTSendTo(const RouterID& peer, AbstractDHTMessage* msg, bool)
|
||||
{
|
||||
router->SendToOrQueue(peer, msg);
|
||||
auto now = Now();
|
||||
router->PersistSessionUntil(peer, now + 1min);
|
||||
}
|
||||
|
||||
// this function handles incoming DHT messages sent down a path by a client
|
||||
// note that IMessage here is different than that found in the routing
|
||||
// namespace. by the time this is called, we are inside
|
||||
// llarp::routing::DHTMessage::HandleMessage()
|
||||
bool
|
||||
DHTMessageHandler::RelayRequestForPath(const llarp::PathID_t& id, const AbstractDHTMessage& msg)
|
||||
{
|
||||
routing::PathDHTMessage reply;
|
||||
if (not handle_message(msg, reply.dht_msgs))
|
||||
return false;
|
||||
if (not reply.dht_msgs.empty())
|
||||
{
|
||||
auto path = router->path_context().GetByUpstream(router->pubkey(), id);
|
||||
return path && path->SendRoutingMessage(reply, router);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::LookupIntroSetForPath(
|
||||
const Key_t& addr,
|
||||
uint64_t txid,
|
||||
const llarp::PathID_t& path,
|
||||
const Key_t& askpeer,
|
||||
uint64_t relayOrder)
|
||||
{
|
||||
const TXOwner asker(OurKey(), txid);
|
||||
const TXOwner peer(askpeer, ++ids);
|
||||
_pendingIntrosetLookups.NewTX(
|
||||
peer,
|
||||
asker,
|
||||
asker,
|
||||
new LocalServiceAddressLookup(path, txid, relayOrder, addr, this, askpeer));
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::PropagateIntroSetTo(
|
||||
const Key_t& from,
|
||||
uint64_t txid,
|
||||
const service::EncryptedIntroSet& introset,
|
||||
const Key_t& tellpeer,
|
||||
uint64_t relayOrder)
|
||||
{
|
||||
const TXOwner asker(from, txid);
|
||||
const TXOwner peer(tellpeer, ++ids);
|
||||
_pendingIntrosetLookups.NewTX(
|
||||
peer, asker, asker, new PublishServiceJob(asker, introset, this, relayOrder));
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::PropagateLocalIntroSet(
|
||||
const PathID_t& from,
|
||||
uint64_t txid,
|
||||
const service::EncryptedIntroSet& introset,
|
||||
const Key_t& tellpeer,
|
||||
uint64_t relayOrder)
|
||||
{
|
||||
const TXOwner asker(OurKey(), txid);
|
||||
const TXOwner peer(tellpeer, ++ids);
|
||||
_pendingIntrosetLookups.NewTX(
|
||||
peer,
|
||||
asker,
|
||||
peer,
|
||||
new LocalPublishServiceJob(peer, from, txid, introset, this, relayOrder));
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::LookupIntroSetRelayed(
|
||||
const Key_t& addr,
|
||||
const Key_t& whoasked,
|
||||
uint64_t txid,
|
||||
const Key_t& askpeer,
|
||||
uint64_t relayOrder,
|
||||
service::EncryptedIntroSetLookupHandler handler)
|
||||
{
|
||||
const TXOwner asker(whoasked, txid);
|
||||
const TXOwner peer(askpeer, ++ids);
|
||||
_pendingIntrosetLookups.NewTX(
|
||||
peer, asker, asker, new ServiceAddressLookup(asker, addr, this, relayOrder, handler));
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::LookupIntroSetDirect(
|
||||
const Key_t& addr,
|
||||
const Key_t& whoasked,
|
||||
uint64_t txid,
|
||||
const Key_t& askpeer,
|
||||
service::EncryptedIntroSetLookupHandler handler)
|
||||
{
|
||||
const TXOwner asker(whoasked, txid);
|
||||
const TXOwner peer(askpeer, ++ids);
|
||||
_pendingIntrosetLookups.NewTX(
|
||||
peer, asker, asker, new ServiceAddressLookup(asker, addr, this, 0, handler), 1s);
|
||||
}
|
||||
|
||||
bool
|
||||
DHTMessageHandler::HandleExploritoryRouterLookup(
|
||||
const Key_t& requester,
|
||||
uint64_t txid,
|
||||
const RouterID& target,
|
||||
std::vector<std::unique_ptr<AbstractDHTMessage>>& reply)
|
||||
{
|
||||
std::vector<RouterID> closer;
|
||||
const Key_t t(target.as_array());
|
||||
std::set<Key_t> foundRouters;
|
||||
if (!_nodes)
|
||||
return false;
|
||||
|
||||
const size_t nodeCount = _nodes->size();
|
||||
if (nodeCount == 0)
|
||||
{
|
||||
llarp::LogError("cannot handle exploritory router lookup, no dht peers");
|
||||
return false;
|
||||
}
|
||||
llarp::LogDebug("We have ", _nodes->size(), " connected nodes into the DHT");
|
||||
// ourKey should never be in the connected list
|
||||
// requester is likely in the connected list
|
||||
// 4 or connection nodes (minus a potential requestor), whatever is less
|
||||
if (!_nodes->GetManyNearExcluding(
|
||||
t, foundRouters, std::min(nodeCount, size_t{4}), std::set<Key_t>{ourKey, requester}))
|
||||
{
|
||||
llarp::LogError(
|
||||
"not enough dht nodes to handle exploritory router lookup, "
|
||||
"have ",
|
||||
nodeCount,
|
||||
" dht peers");
|
||||
return false;
|
||||
}
|
||||
for (const auto& f : foundRouters)
|
||||
{
|
||||
const RouterID id = f.as_array();
|
||||
// discard shit routers
|
||||
if (router->router_profiling().IsBadForConnect(id))
|
||||
continue;
|
||||
closer.emplace_back(id);
|
||||
}
|
||||
llarp::LogDebug("Gave ", closer.size(), " routers for exploration");
|
||||
reply.emplace_back(new GotRouterMessage(txid, closer, false));
|
||||
return true;
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::LookupRouterForPath(
|
||||
const RouterID& target, uint64_t txid, const llarp::PathID_t& path, const Key_t& askpeer)
|
||||
|
||||
{
|
||||
const TXOwner peer(askpeer, ++ids);
|
||||
const TXOwner whoasked(OurKey(), txid);
|
||||
_pendingRouterLookups.NewTX(
|
||||
peer, whoasked, target, new LocalRouterLookup(path, txid, target, this));
|
||||
}
|
||||
|
||||
void
|
||||
DHTMessageHandler::LookupRouterRecursive(
|
||||
const RouterID& target,
|
||||
const Key_t& whoasked,
|
||||
uint64_t txid,
|
||||
const Key_t& askpeer,
|
||||
RouterLookupHandler handler)
|
||||
{
|
||||
const TXOwner asker(whoasked, txid);
|
||||
const TXOwner peer(askpeer, ++ids);
|
||||
_pendingRouterLookups.NewTX(
|
||||
peer, asker, target, new RecursiveRouterLookup(asker, target, this, handler));
|
||||
}
|
||||
|
||||
llarp_time_t
|
||||
DHTMessageHandler::Now() const
|
||||
{
|
||||
return router->now();
|
||||
}
|
||||
|
||||
std::unique_ptr<AbstractDHTMessageHandler>
|
||||
make_handler()
|
||||
{
|
||||
return std::make_unique<DHTMessageHandler>();
|
||||
}
|
||||
|
||||
} // namespace llarp::dht
|
||||
@ -1,52 +0,0 @@
|
||||
#include "dht.h"
|
||||
#include <llarp/router_contact.hpp>
|
||||
|
||||
// llarp_dht_context::llarp_dht_context(llarp::Router* router)
|
||||
// {
|
||||
// parent = router;
|
||||
// impl = llarp::dht::make_handler();
|
||||
// }
|
||||
|
||||
// struct llarp_dht_context*
|
||||
// llarp_dht_context_new(llarp::Router* router)
|
||||
// {
|
||||
// return new llarp_dht_context(router);
|
||||
// }
|
||||
|
||||
// void
|
||||
// llarp_dht_context_free(struct llarp_dht_context* ctx)
|
||||
// {
|
||||
// delete ctx;
|
||||
// }
|
||||
|
||||
// void
|
||||
// __llarp_dht_remove_peer(struct llarp_dht_context* ctx, const byte_t* id)
|
||||
// {
|
||||
// ctx->impl->Nodes()->DelNode(llarp::dht::Key_t(id));
|
||||
// }
|
||||
|
||||
// void
|
||||
// llarp_dht_allow_transit(llarp_dht_context* ctx)
|
||||
// {
|
||||
// ctx->impl->AllowTransit() = true;
|
||||
// }
|
||||
|
||||
// void
|
||||
// llarp_dht_context_start(struct llarp_dht_context* ctx, const byte_t* key)
|
||||
// {
|
||||
// ctx->impl->Init(llarp::dht::Key_t(key), ctx->parent);
|
||||
// }
|
||||
|
||||
void
|
||||
llarp_dht_lookup_router(struct llarp_dht_context* ctx, struct llarp_router_lookup_job* job)
|
||||
{
|
||||
job->dht = ctx;
|
||||
job->found = false;
|
||||
job->result.Clear();
|
||||
// llarp_rc_clear(&job->result);
|
||||
llarp::LogError("implement me llarp_dht_lookup_router");
|
||||
/*
|
||||
ctx->parent->logic->queue_job(
|
||||
{job, &llarp::dht::Context::queue_router_lookup});
|
||||
*/
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <llarp/crypto/crypto.hpp>
|
||||
#include <llarp/router_contact.hpp>
|
||||
#include <llarp/util/buffer.hpp>
|
||||
|
||||
/**
|
||||
* dht.h
|
||||
*
|
||||
* DHT functions
|
||||
*/
|
||||
|
||||
struct llarp_dht_context;
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
struct Router;
|
||||
}
|
||||
|
||||
/// allocator
|
||||
struct llarp_dht_context*
|
||||
llarp_dht_context_new(llarp::Router* parent);
|
||||
|
||||
/// deallocator
|
||||
void
|
||||
llarp_dht_context_free(struct llarp_dht_context* dht);
|
||||
|
||||
/// start dht context with our location in keyspace
|
||||
void
|
||||
llarp_dht_context_start(struct llarp_dht_context* ctx, const byte_t* key);
|
||||
|
||||
// remove this? dns needs it atm
|
||||
struct llarp_router_lookup_job;
|
||||
|
||||
using llarp_router_lookup_handler = void (*)(struct llarp_router_lookup_job*);
|
||||
|
||||
struct llarp_router_lookup_job
|
||||
{
|
||||
/// can be anything but usually a class context for hook
|
||||
void* user;
|
||||
llarp_router_lookup_handler hook;
|
||||
struct llarp_dht_context* dht;
|
||||
llarp::PubKey target;
|
||||
bool found;
|
||||
// make sure you initialize addr and exits
|
||||
llarp::RouterContact result;
|
||||
bool iterative;
|
||||
};
|
||||
// end dns requirement
|
||||
|
||||
/// start allowing dht participation on a context
|
||||
void
|
||||
llarp_dht_allow_transit(struct llarp_dht_context* ctx);
|
||||
|
||||
/// remove router from tracked dht peer list
|
||||
/// internal function do not use
|
||||
void
|
||||
__llarp_dht_remove_peer(struct llarp_dht_context* ctx, const byte_t* id);
|
||||
|
||||
void
|
||||
llarp_dht_lookup_router(struct llarp_dht_context* ctx, struct llarp_router_lookup_job* job);
|
||||
@ -1,79 +0,0 @@
|
||||
#ifndef LLARP_DHT_TX
|
||||
#define LLARP_DHT_TX
|
||||
|
||||
#include "key.hpp"
|
||||
#include "txowner.hpp"
|
||||
|
||||
#include <llarp/util/logging.hpp>
|
||||
#include <llarp/util/status.hpp>
|
||||
|
||||
#include <set>
|
||||
#include <vector>
|
||||
|
||||
namespace llarp
|
||||
{
|
||||
struct Router;
|
||||
|
||||
namespace dht
|
||||
{
|
||||
template <typename K, typename V>
|
||||
struct TX
|
||||
{
|
||||
K target;
|
||||
Router* router;
|
||||
std::set<Key_t> peersAsked;
|
||||
std::vector<V> valuesFound;
|
||||
TXOwner whoasked;
|
||||
|
||||
TX(const TXOwner& asker, const K& k, Router* r) : target(k), router{r}, whoasked(asker)
|
||||
{}
|
||||
|
||||
virtual ~TX() = default;
|
||||
|
||||
void
|
||||
OnFound(const Key_t& askedPeer, const V& value);
|
||||
|
||||
util::StatusObject
|
||||
ExtractStatus() const
|
||||
{
|
||||
util::StatusObject obj{
|
||||
{"whoasked", whoasked.ExtractStatus()}, {"target", target.ExtractStatus()}};
|
||||
std::vector<util::StatusObject> foundObjs;
|
||||
std::transform(
|
||||
valuesFound.begin(),
|
||||
valuesFound.end(),
|
||||
std::back_inserter(foundObjs),
|
||||
[](const auto& item) -> util::StatusObject { return item.ExtractStatus(); });
|
||||
|
||||
obj["found"] = foundObjs;
|
||||
std::vector<std::string> asked;
|
||||
std::transform(
|
||||
peersAsked.begin(),
|
||||
peersAsked.end(),
|
||||
std::back_inserter(asked),
|
||||
[](const auto& item) -> std::string { return item.ToString(); });
|
||||
obj["asked"] = asked;
|
||||
return obj;
|
||||
}
|
||||
|
||||
virtual bool
|
||||
Validate(const V& value) const = 0;
|
||||
|
||||
virtual void
|
||||
Start(const TXOwner& peer) = 0;
|
||||
};
|
||||
|
||||
template <typename K, typename V>
|
||||
inline void
|
||||
TX<K, V>::OnFound(const Key_t& askedPeer, const V& value)
|
||||
{
|
||||
peersAsked.insert(askedPeer);
|
||||
if (Validate(value))
|
||||
{
|
||||
valuesFound.push_back(value);
|
||||
}
|
||||
}
|
||||
} // namespace dht
|
||||
} // namespace llarp
|
||||
|
||||
#endif
|
||||
@ -1,212 +0,0 @@
|
||||
#ifndef LLARP_DHT_TXHOLDER
|
||||
#define LLARP_DHT_TXHOLDER
|
||||
|
||||
#include "tx.hpp"
|
||||
#include "txowner.hpp"
|
||||
#include <llarp/util/time.hpp>
|
||||
#include <llarp/util/status.hpp>
|
||||
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
|
||||
namespace llarp::dht
|
||||
{
|
||||
template <typename K, typename V>
|
||||
struct TXHolder
|
||||
{
|
||||
using TXPtr = std::unique_ptr<TX<K, V>>;
|
||||
// tx who are waiting for a reply for each key
|
||||
std::unordered_multimap<K, TXOwner> waiting;
|
||||
// tx timesouts by key
|
||||
std::unordered_map<K, llarp_time_t> timeouts;
|
||||
// maps remote peer with tx to handle reply from them
|
||||
std::unordered_map<TXOwner, TXPtr> tx;
|
||||
|
||||
const TX<K, V>*
|
||||
GetPendingLookupFrom(const TXOwner& owner) const;
|
||||
|
||||
util::StatusObject
|
||||
ExtractStatus() const
|
||||
{
|
||||
util::StatusObject obj{};
|
||||
std::vector<util::StatusObject> txObjs, timeoutsObjs, waitingObjs;
|
||||
std::transform(
|
||||
tx.begin(),
|
||||
tx.end(),
|
||||
std::back_inserter(txObjs),
|
||||
[](const auto& item) -> util::StatusObject {
|
||||
return util::StatusObject{
|
||||
{"owner", item.first.ExtractStatus()}, {"tx", item.second->ExtractStatus()}};
|
||||
});
|
||||
obj["tx"] = txObjs;
|
||||
std::transform(
|
||||
timeouts.begin(),
|
||||
timeouts.end(),
|
||||
std::back_inserter(timeoutsObjs),
|
||||
[](const auto& item) -> util::StatusObject {
|
||||
return util::StatusObject{
|
||||
{"time", to_json(item.second)}, {"target", item.first.ExtractStatus()}};
|
||||
});
|
||||
obj["timeouts"] = timeoutsObjs;
|
||||
std::transform(
|
||||
waiting.begin(),
|
||||
waiting.end(),
|
||||
std::back_inserter(waitingObjs),
|
||||
[](const auto& item) -> util::StatusObject {
|
||||
return util::StatusObject{
|
||||
{"target", item.first.ExtractStatus()}, {"whoasked", item.second.ExtractStatus()}};
|
||||
});
|
||||
obj["waiting"] = waitingObjs;
|
||||
return obj;
|
||||
}
|
||||
|
||||
bool
|
||||
HasLookupFor(const K& target) const
|
||||
{
|
||||
return timeouts.find(target) != timeouts.end();
|
||||
}
|
||||
|
||||
bool
|
||||
HasPendingLookupFrom(const TXOwner& owner) const
|
||||
{
|
||||
return GetPendingLookupFrom(owner) != nullptr;
|
||||
}
|
||||
|
||||
void
|
||||
NewTX(
|
||||
const TXOwner& askpeer,
|
||||
const TXOwner& whoasked,
|
||||
const K& k,
|
||||
TX<K, V>* t,
|
||||
llarp_time_t requestTimeoutMS = 15s);
|
||||
|
||||
/// mark tx as not fond
|
||||
void
|
||||
NotFound(const TXOwner& from, const std::unique_ptr<Key_t>& next);
|
||||
|
||||
void
|
||||
Found(const TXOwner& from, const K& k, const std::vector<V>& values)
|
||||
{
|
||||
Inform(from, k, values, true);
|
||||
}
|
||||
|
||||
/// inform all watches for key of values found
|
||||
void
|
||||
Inform(
|
||||
TXOwner from,
|
||||
K key,
|
||||
std::vector<V> values,
|
||||
bool sendreply = false,
|
||||
bool removeTimeouts = true);
|
||||
|
||||
void
|
||||
Expire(llarp_time_t now);
|
||||
};
|
||||
|
||||
template <typename K, typename V>
|
||||
const TX<K, V>*
|
||||
TXHolder<K, V>::GetPendingLookupFrom(const TXOwner& owner) const
|
||||
{
|
||||
auto itr = tx.find(owner);
|
||||
if (itr == tx.end())
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
return itr->second.get();
|
||||
}
|
||||
|
||||
template <typename K, typename V>
|
||||
void
|
||||
TXHolder<K, V>::NewTX(
|
||||
const TXOwner& askpeer,
|
||||
const TXOwner& whoasked,
|
||||
const K& k,
|
||||
TX<K, V>* t,
|
||||
llarp_time_t requestTimeoutMS)
|
||||
{
|
||||
(void)whoasked;
|
||||
tx.emplace(askpeer, std::unique_ptr<TX<K, V>>(t));
|
||||
auto count = waiting.count(k);
|
||||
waiting.emplace(k, askpeer);
|
||||
|
||||
auto itr = timeouts.find(k);
|
||||
if (itr == timeouts.end())
|
||||
{
|
||||
timeouts.emplace(k, time_now_ms() + requestTimeoutMS);
|
||||
}
|
||||
if (count == 0)
|
||||
{
|
||||
t->Start(askpeer);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename K, typename V>
|
||||
void
|
||||
TXHolder<K, V>::NotFound(const TXOwner& from, const std::unique_ptr<Key_t>&)
|
||||
{
|
||||
auto txitr = tx.find(from);
|
||||
if (txitr == tx.end())
|
||||
{
|
||||
return;
|
||||
}
|
||||
Inform(from, txitr->second->target, {}, true, true);
|
||||
}
|
||||
|
||||
template <typename K, typename V>
|
||||
void
|
||||
TXHolder<K, V>::Inform(
|
||||
TXOwner from, K key, std::vector<V> values, bool sendreply, bool removeTimeouts)
|
||||
{
|
||||
auto range = waiting.equal_range(key);
|
||||
auto itr = range.first;
|
||||
while (itr != range.second)
|
||||
{
|
||||
auto txitr = tx.find(itr->second);
|
||||
if (txitr != tx.end())
|
||||
{
|
||||
for (const auto& value : values)
|
||||
{
|
||||
txitr->second->OnFound(from.node, value);
|
||||
}
|
||||
if (sendreply)
|
||||
{
|
||||
txitr->second->SendReply();
|
||||
tx.erase(txitr);
|
||||
}
|
||||
}
|
||||
++itr;
|
||||
}
|
||||
|
||||
if (sendreply)
|
||||
{
|
||||
waiting.erase(key);
|
||||
}
|
||||
|
||||
if (removeTimeouts)
|
||||
{
|
||||
timeouts.erase(key);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename K, typename V>
|
||||
void
|
||||
TXHolder<K, V>::Expire(llarp_time_t now)
|
||||
{
|
||||
auto itr = timeouts.begin();
|
||||
while (itr != timeouts.end())
|
||||
{
|
||||
if (now >= itr->second)
|
||||
{
|
||||
Inform(TXOwner{}, itr->first, {}, true, false);
|
||||
itr = timeouts.erase(itr);
|
||||
}
|
||||
else
|
||||
{
|
||||
++itr;
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace llarp::dht
|
||||
|
||||
#endif
|
||||
@ -1,61 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include "key.hpp"
|
||||
#include <llarp/util/status.hpp>
|
||||
#include <cstdint>
|
||||
|
||||
namespace llarp::dht
|
||||
{
|
||||
struct TXOwner
|
||||
{
|
||||
Key_t node;
|
||||
uint64_t txid = 0;
|
||||
|
||||
TXOwner() = default;
|
||||
TXOwner(const TXOwner&) = default;
|
||||
TXOwner(TXOwner&&) = default;
|
||||
|
||||
TXOwner&
|
||||
operator=(const TXOwner&) = default;
|
||||
|
||||
TXOwner(const Key_t& k, uint64_t id) : node(k), txid(id)
|
||||
{}
|
||||
|
||||
util::StatusObject
|
||||
ExtractStatus() const
|
||||
{
|
||||
util::StatusObject obj{
|
||||
{"txid", txid},
|
||||
{"node", node.ToHex()},
|
||||
};
|
||||
return obj;
|
||||
}
|
||||
|
||||
bool
|
||||
operator==(const TXOwner& other) const
|
||||
{
|
||||
return std::tie(txid, node) == std::tie(other.txid, other.node);
|
||||
}
|
||||
|
||||
bool
|
||||
operator<(const TXOwner& other) const
|
||||
{
|
||||
return std::tie(txid, node) < std::tie(other.txid, other.node);
|
||||
}
|
||||
};
|
||||
} // namespace llarp::dht
|
||||
|
||||
namespace std
|
||||
{
|
||||
template <>
|
||||
struct hash<llarp::dht::TXOwner>
|
||||
{
|
||||
std::size_t
|
||||
operator()(const llarp::dht::TXOwner& o) const noexcept
|
||||
{
|
||||
std::size_t sz2;
|
||||
memcpy(&sz2, o.node.data(), sizeof(std::size_t));
|
||||
return o.txid ^ (sz2 << 1);
|
||||
}
|
||||
};
|
||||
} // namespace std
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue