Bootstrap seed

- nodes now send their RC to the bootstrap seed on making a request
- allows the bootstrap seed to distribute RCs

external/oxen-libquic

@@ -1 +1 @@
-Subproject commit c9271e87eaa2d6bcbdf4e49936fcce2b7bc9e693
+Subproject commit 55d81cbbc7bc5ea3667e87389d8143702731a32a

llarp/link/connection.cpp

@@ -3,7 +3,7 @@
 namespace llarp::link
 {
   Connection::Connection(
-      std::shared_ptr<oxen::quic::connection_interface>& c,
+      const std::shared_ptr<oxen::quic::connection_interface>& c,
       std::shared_ptr<oxen::quic::BTRequestStream>& s,
       const RemoteRC& rc)
       : conn{c}, control_stream{s}, remote_rc{std::move(rc)}

llarp/link/connection.hpp

@@ -18,7 +18,7 @@ namespace llarp::link
     bool remote_is_relay{true};
 
     Connection(
-        std::shared_ptr<oxen::quic::connection_interface>& c,
+        const std::shared_ptr<oxen::quic::connection_interface>& c,
         std::shared_ptr<oxen::quic::BTRequestStream>& s,
         const RemoteRC& rc);
   };

llarp/link/link_manager.cpp

@@ -175,6 +175,7 @@ namespace llarp
 
       if (auto itr = rids_pending_verification.find(other); itr != rids_pending_verification.end())
       {
+        verified_rids[other] = itr->second;
         rids_pending_verification.erase(itr);
         result = true;
       }
@@ -351,7 +352,7 @@ namespace llarp
     const auto& remote_addr = rc.addr();
     const auto& rid = rc.router_id();
 
-    rids_pending_verification.insert(rid);
+    rids_pending_verification[rid] = rc;
 
     // TODO: confirm remote end is using the expected pubkey (RouterID).
     // TODO: ALPN for "client" vs "relay" (could just be set on endpoint creation)
@@ -368,13 +369,34 @@ namespace llarp
     log::warning(quic_cat, "Failed to begin establishing connection to {}", remote_addr);
   }
 
+  void
+  LinkManager::on_inbound_conn(oxen::quic::connection_interface& ci)
+  {
+    const auto& scid = ci.scid();
+    RouterID rid{ci.remote_key()};
+
+    const auto& rc = verified_rids[rid];
+    ep.connid_map.emplace(scid, rid);
+    auto [itr, b] = ep.conns.emplace(rid, nullptr);
+
+    auto control_stream = ci.get_new_stream<oxen::quic::BTRequestStream>();
+    itr->second = std::make_shared<link::Connection>(ci.shared_from_this(), control_stream, rc);
+    log::critical(logcat, "Successfully configured inbound connection fom {}; storing RC...", rid);
+  }
+
   // TODO: should we add routes here now that Router::SessionOpen is gone?
   void
   LinkManager::on_conn_open(oxen::quic::connection_interface& ci)
   {
     _router.loop()->call([this, &conn_interface = ci]() {
-      const auto& scid = conn_interface.scid();
-      const auto& rid = ep.connid_map[scid];
+      const auto rid = RouterID{conn_interface.remote_key()};
+      const auto& remote = conn_interface.remote();
+
+      if (conn_interface.is_inbound())
+      {
+        log::critical(logcat, "Inbound connection fom {} (remote:{})", rid, remote);
+        on_inbound_conn(conn_interface);
+      }
 
       log::critical(
           logcat,
@@ -599,12 +621,15 @@ namespace llarp
     assert(_router.is_service_node());
 
     const auto& rcs = node_db->get_rcs();
+    RemoteRC remote;
     size_t quantity;
 
     try
     {
       oxenc::bt_dict_consumer btdc{m.body()};
       quantity = btdc.require<size_t>("quantity");
+      btdc.required("local");
+      remote = RemoteRC{btdc.consume_dict_consumer()};
     }
     catch (const std::exception& e)
     {
@@ -613,6 +638,8 @@ namespace llarp
       return;
     }
 
+    node_db->put_rc(remote);
+
     auto rc_size = rcs.size();
     auto now = llarp::time_now_ms();
     size_t i = 0;

llarp/link/link_manager.hpp

@@ -180,7 +180,10 @@ namespace llarp
     std::unordered_map<RouterID, MessageQueue> pending_conn_msg_queue;
     // when establishing a connection, the rid of the remote is placed here to be cross-
     // checked by the tls verification callback
-    std::set<RouterID> rids_pending_verification;
+    std::map<RouterID, RemoteRC> rids_pending_verification;
+    // in the interim of verifying an inbound connection and the creation of its link::Connection
+    // object, we store the rid and rc here
+    std::map<RouterID, RemoteRC> verified_rids;
 
     util::DecayingHashSet<RouterID> clients{path::DEFAULT_LIFETIME};
 
@@ -203,6 +206,9 @@ namespace llarp
     void
     recv_control_message(oxen::quic::message msg);
 
+    void
+    on_inbound_conn(oxen::quic::connection_interface& ci);
+
     void
     on_conn_open(oxen::quic::connection_interface& ci);
 

llarp/messages/fetch.hpp

@@ -37,10 +37,12 @@ namespace llarp
 
   namespace BootstrapFetchMessage
   {
+    // the LocalRC is converted to a RemoteRC type to send to the bootstrap seed
     inline static std::string
-    serialize(size_t quantity)
+    serialize(const RemoteRC& local_rc, size_t quantity)
     {
       oxenc::bt_dict_producer btdp;
+      btdp.append_encoded("local", local_rc.view());
       btdp.append("quantity", quantity);
       return std::move(btdp).str();
     }

llarp/nodedb.cpp

@@ -670,7 +670,8 @@ namespace llarp
 
     _router.link_manager().fetch_bootstrap_rcs(
         _bootstraps->current(),
-        BootstrapFetchMessage::serialize(BOOTSTRAP_SOURCE_COUNT),
+        BootstrapFetchMessage::serialize(
+            _router.router_contact.to_remote(), BOOTSTRAP_SOURCE_COUNT),
         [this](oxen::quic::message m) mutable {
           if (not m)
           {

llarp/router_contact.hpp

@@ -207,6 +207,8 @@ namespace llarp
     bt_load(oxenc::bt_dict_consumer& data);
   };
 
+  struct RemoteRC;
+
   /// Extension of RouterContact used to store a local "RC," and inserts a RouterContact by
   /// re-parsing and sending it out. This sub-class contains a pubkey and all the other attributes
   /// required for signing and serialization
@@ -236,6 +238,9 @@ namespace llarp
     explicit LocalRC(std::string payload, const SecretKey sk);
     ~LocalRC() = default;
 
+    RemoteRC
+    to_remote();
+
     void
     resign();
 

llarp/router_contact_local.cpp

@@ -27,6 +27,12 @@ namespace llarp
     resign();
   }
 
+  RemoteRC
+  LocalRC::to_remote()
+  {
+    return RemoteRC{view()};
+  }
+
   LocalRC::LocalRC(std::string payload, const SecretKey sk) : _secret_key{std::move(sk)}
   {
     _router_id = llarp::seckey_to_pubkey(_secret_key);

llarp/router_id.hpp

@@ -21,6 +21,9 @@ namespace llarp
     RouterID(const Data& data) : PubKey(data)
     {}
 
+    RouterID(ustring_view data) : PubKey(data.data())
+    {}
+
     util::StatusObject
     ExtractStatus() const;