Added span backport

pull/2204/head
dr7ana 9 months ago
parent 7f8207d5d3
commit a4272c4503

3
.gitmodules vendored

@ -32,3 +32,6 @@
[submodule "external/oxen-libquic"] [submodule "external/oxen-libquic"]
path = external/oxen-libquic path = external/oxen-libquic
url = https://github.com/oxen-io/oxen-libquic.git url = https://github.com/oxen-io/oxen-libquic.git
[submodule "external/span-lite"]
path = external/span-lite
url = https://github.com/martinmoene/span-lite.git

@ -0,0 +1 @@
Subproject commit bc08bf87258d881aaa83b50c54dea67ea33d0e8e

@ -5,7 +5,7 @@
#include <llarp/link/server.hpp> #include <llarp/link/server.hpp>
#include <llarp/router_contact.hpp> #include <llarp/router_contact.hpp>
#include <llarp/nodedb.hpp> #include <llarp/nodedb.hpp>
#include "i_rc_lookup_handler.hpp" #include "rc_lookup_handler.hpp"
#include <llarp/link/link_manager.hpp> #include <llarp/link/link_manager.hpp>
#include <llarp/util/meta/memfn.hpp> #include <llarp/util/meta/memfn.hpp>
#include <llarp/util/thread/threading.hpp> #include <llarp/util/thread/threading.hpp>
@ -159,7 +159,7 @@ namespace llarp
OutboundSessionMaker::Init( OutboundSessionMaker::Init(
AbstractRouter* router, AbstractRouter* router,
LinkManager* linkManager, LinkManager* linkManager,
I_RCLookupHandler* rcLookup, RCLookupHandler* rcLookup,
Profiling* profiler, Profiling* profiler,
EventLoop_ptr loop, EventLoop_ptr loop,
WorkerFunc_t dowork) WorkerFunc_t dowork)

@ -82,7 +82,7 @@ namespace llarp
Init( Init(
AbstractRouter* router, AbstractRouter* router,
LinkManager* linkManager, LinkManager* linkManager,
I_RCLookupHandler* rcLookup, RCLookupHandler* rcLookup,
Profiling* profiler, Profiling* profiler,
EventLoop_ptr loop, EventLoop_ptr loop,
WorkerFunc_t work); WorkerFunc_t work);
@ -127,7 +127,7 @@ namespace llarp
AbstractRouter* _router = nullptr; AbstractRouter* _router = nullptr;
LinkManager* _linkManager = nullptr; LinkManager* _linkManager = nullptr;
I_RCLookupHandler* _rcLookup = nullptr; RCLookupHandler* _rcLookup = nullptr;
Profiling* _profiler = nullptr; Profiling* _profiler = nullptr;
std::shared_ptr<NodeDB> _nodedb; std::shared_ptr<NodeDB> _nodedb;
EventLoop_ptr _loop; EventLoop_ptr _loop;

@ -1,6 +1,5 @@
#pragma once #pragma once
#include <llarp/router_id.hpp> #include <llarp/router_id.hpp>
#include <llarp/util/thread/threading.hpp> #include <llarp/util/thread/threading.hpp>

Loading…
Cancel
Save