libquic vbump

oxen-io · Jan 16, 2024 · 7421d59 · 7421d59
1 parent a5b7a7e
commit 7421d59
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/external/oxen-libquic b/external/oxen-libquic
diff --git a/llarp/link/link_manager.cpp b/llarp/link/link_manager.cpp
@@ -160,39 +160,39 @@ namespace llarp
   {
     log::debug(logcat, "{} called", __PRETTY_FUNCTION__);
 
-    s->register_command("bfetch_rcs"s, [this](oxen::quic::message m) {
+    s->register_handler("bfetch_rcs"s, [this](oxen::quic::message m) {
       _router.loop()->call(
           [this, msg = std::move(m)]() mutable { handle_fetch_bootstrap_rcs(std::move(msg)); });
     });
 
-    s->register_command("fetch_rcs"s, [this](oxen::quic::message m) {
+    s->register_handler("fetch_rcs"s, [this](oxen::quic::message m) {
       _router.loop()->call(
           [this, msg = std::move(m)]() mutable { handle_fetch_rcs(std::move(msg)); });
     });
 
-    s->register_command("fetch_rids"s, [this](oxen::quic::message m) {
+    s->register_handler("fetch_rids"s, [this](oxen::quic::message m) {
       _router.loop()->call(
           [this, msg = std::move(m)]() mutable { handle_fetch_router_ids(std::move(msg)); });
     });
 
-    s->register_command("path_build"s, [this, rid = router_id](oxen::quic::message m) {
+    s->register_handler("path_build"s, [this, rid = router_id](oxen::quic::message m) {
       _router.loop()->call(
           [this, &rid, msg = std::move(m)]() mutable { handle_path_build(std::move(msg), rid); });
     });
 
-    s->register_command("path_control"s, [this, rid = router_id](oxen::quic::message m) {
+    s->register_handler("path_control"s, [this, rid = router_id](oxen::quic::message m) {
       _router.loop()->call(
           [this, &rid, msg = std::move(m)]() mutable { handle_path_control(std::move(msg), rid); });
     });
 
-    s->register_command("gossip_rc"s, [this](oxen::quic::message m) {
+    s->register_handler("gossip_rc"s, [this](oxen::quic::message m) {
       _router.loop()->call(
           [this, msg = std::move(m)]() mutable { handle_gossip_rc(std::move(msg)); });
     });
 
     for (auto& method : direct_requests)
     {
-      s->register_command(
+      s->register_handler(
           std::string{method.first},
           [this, func = std::move(method.second)](oxen::quic::message m) {
             _router.loop()->call([this, msg = std::move(m), func = std::move(func)]() mutable {
@@ -394,8 +394,8 @@ namespace llarp
   LinkManager::on_conn_closed(oxen::quic::connection_interface& ci, uint64_t ec)
   {
     _router.loop()->call(
-        [this, scid = ci.scid(), rid = RouterID{ci.remote_key()}, error_code = ec]() {
-          log::critical(quic_cat, "Purging quic connection CID:{} (ec:{})", scid, error_code);
+        [this, ref_id = ci.reference_id(), rid = RouterID{ci.remote_key()}, error_code = ec]() {
+          log::critical(quic_cat, "Purging quic connection {} (ec:{})", ref_id, error_code);
 
           if (auto s_itr = ep.service_conns.find(rid); s_itr != ep.service_conns.end())
           {
@@ -408,7 +408,7 @@ namespace llarp
             ep.client_conns.erase(c_itr);
           }
           else
-            log::critical(quic_cat, "Nothing to purge for quic connection CID:{}", scid);
+            log::critical(quic_cat, "Nothing to purge for quic connection {}", ref_id);
         });
   }
 
@@ -1369,8 +1369,8 @@ namespace llarp
       }
 
       oxenc::bt_dict_consumer frame_info{payload_list.front()};
-      auto hash = frame_info.require<ustring>("HASH");
       auto frame = frame_info.require<ustring>("FRAME");
+      auto hash = frame_info.require<ustring>("HASH");
 
       oxenc::bt_dict_consumer hop_dict{frame};
       auto hop_payload = hop_dict.require<ustring>("ENCRYPTED");

diff --git a/llarp/service/endpoint.hpp b/llarp/service/endpoint.hpp
@@ -178,7 +178,7 @@ namespace llarp
       EgresPacketRouter()
       {
         return nullptr;
-      };
+      }
 
       virtual vpn::NetworkInterface*
       GetVPNInterface()
+3 −2		CMakeLists.txt
+0 −1		cmake/StaticBuild.cmake
+1 −1		external/oxen-encoding
+9 −0		include/quic/address.hpp
+44 −7		include/quic/btstream.hpp
+73 −58		include/quic/connection.hpp
+101 −0		include/quic/connection_ids.hpp
+6 −1		include/quic/crypto.hpp
+3 −2		include/quic/datagram.hpp
+99 −48		include/quic/endpoint.hpp
+15 −29		include/quic/gnutls_crypto.hpp
+12 −10		include/quic/stream.hpp
+1 −0		include/quic/utils.hpp
+6 −0		src/CMakeLists.txt
+31 −0		src/address.cpp
+57 −17		src/btstream.cpp
+373 −84		src/connection.cpp
+4 −4		src/datagram.cpp
+373 −72		src/endpoint.cpp
+19 −17		src/gnutls_creds.cpp
+125 −115		src/gnutls_session.cpp
+2 −2		src/stream.cpp
+6 −2		tests/001-handshake.cpp
+146 −7		tests/002-send-receive.cpp
+91 −12		tests/004-streams.cpp
+113 −0		tests/010-migration.cpp
+42 −23		tests/CMakeLists.txt
+18 −31		tests/dgram-speed-client.cpp
+29 −33		tests/dgram-speed-server.cpp
+3 −0		tests/main.cpp
+16 −21		tests/speedtest-client.cpp
+29 −25		tests/speedtest-server.cpp
+161 −0		tests/utils.cpp
+42 −79		tests/utils.hpp