From a4272c4503e0133b3ea7c66d87576eadc29d6fb0 Mon Sep 17 00:00:00 2001
From: dr7ana <danielrouhana@gmail.com>
Date: Thu, 14 Sep 2023 05:08:10 -0700
Subject: [PATCH] Added span backport

---
 .gitmodules                             | 3 +++
 external/span-lite                      | 1 +
 llarp/router/outbound_session_maker.cpp | 4 ++--
 llarp/router/outbound_session_maker.hpp | 4 ++--
 llarp/router/rc_lookup_handler.hpp      | 1 -
 5 files changed, 8 insertions(+), 5 deletions(-)
 create mode 160000 external/span-lite

diff --git a/.gitmodules b/.gitmodules
index 5790be24d..73f0a7935 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,3 +32,6 @@
 [submodule "external/oxen-libquic"]
 	path = external/oxen-libquic
 	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
diff --git a/external/span-lite b/external/span-lite
new file mode 160000
index 000000000..bc08bf872
--- /dev/null
+++ b/external/span-lite
@@ -0,0 +1 @@
+Subproject commit bc08bf87258d881aaa83b50c54dea67ea33d0e8e
diff --git a/llarp/router/outbound_session_maker.cpp b/llarp/router/outbound_session_maker.cpp
index e6cbc32c0..f9297cc0b 100644
--- a/llarp/router/outbound_session_maker.cpp
+++ b/llarp/router/outbound_session_maker.cpp
@@ -5,7 +5,7 @@
 #include <llarp/link/server.hpp>
 #include <llarp/router_contact.hpp>
 #include <llarp/nodedb.hpp>
-#include "i_rc_lookup_handler.hpp"
+#include "rc_lookup_handler.hpp"
 #include <llarp/link/link_manager.hpp>
 #include <llarp/util/meta/memfn.hpp>
 #include <llarp/util/thread/threading.hpp>
@@ -159,7 +159,7 @@ namespace llarp
   OutboundSessionMaker::Init(
       AbstractRouter* router,
       LinkManager* linkManager,
-      I_RCLookupHandler* rcLookup,
+      RCLookupHandler* rcLookup,
       Profiling* profiler,
       EventLoop_ptr loop,
       WorkerFunc_t dowork)
diff --git a/llarp/router/outbound_session_maker.hpp b/llarp/router/outbound_session_maker.hpp
index 5e978dfe1..7749268da 100644
--- a/llarp/router/outbound_session_maker.hpp
+++ b/llarp/router/outbound_session_maker.hpp
@@ -82,7 +82,7 @@ namespace llarp
     Init(
         AbstractRouter* router,
         LinkManager* linkManager,
-        I_RCLookupHandler* rcLookup,
+        RCLookupHandler* rcLookup,
         Profiling* profiler,
         EventLoop_ptr loop,
         WorkerFunc_t work);
@@ -127,7 +127,7 @@ namespace llarp
 
     AbstractRouter* _router = nullptr;
     LinkManager* _linkManager = nullptr;
-    I_RCLookupHandler* _rcLookup = nullptr;
+    RCLookupHandler* _rcLookup = nullptr;
     Profiling* _profiler = nullptr;
     std::shared_ptr<NodeDB> _nodedb;
     EventLoop_ptr _loop;
diff --git a/llarp/router/rc_lookup_handler.hpp b/llarp/router/rc_lookup_handler.hpp
index 4758f2dac..45bb0291c 100644
--- a/llarp/router/rc_lookup_handler.hpp
+++ b/llarp/router/rc_lookup_handler.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <llarp/router_id.hpp>
 #include <llarp/util/thread/threading.hpp>