squash; kick le net

oxen-io · Oct 24, 2024 · 1b14e79 · 1b14e79
1 parent d236b46
commit 1b14e79
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/external/oxen-libquic b/external/oxen-libquic
diff --git a/llarp/contact/client_contact.hpp b/llarp/contact/client_contact.hpp
@@ -46,12 +46,8 @@ namespace llarp
         TCP2QUIC = 1 << 5,
     };
 
-    /** TODO:
-            - LocalCC
-                - holds the derived Ed25519PrivateData
-            - RemoteCC:
-
-     */
+    // TESTNET:
+    inline static constexpr auto CC_PUBLISH_INTERVAL{5min};
 
     /** ClientContact
         On the wire we encode the data as a dict containing:

diff --git a/llarp/dht/node.hpp b/llarp/dht/node.hpp
@@ -32,7 +32,7 @@ namespace llarp::dht
 
         CCNode(EncryptedClientContact other) : client_contact{std::move(other)}, ID{client_contact.blinded_pubkey} {}
 
-        nlohmann::json ExtractStatus() const { return nlohmann::json{{"key", client_contact.key()}}; }
+        nlohmann::json ExtractStatus() const { return nlohmann::json{{"key", client_contact.key().to_string()}}; }
 
         bool operator<(const CCNode& other) const { return client_contact.signed_at < other.client_contact.signed_at; }
     };

diff --git a/llarp/handlers/session.cpp b/llarp/handlers/session.cpp
@@ -138,11 +138,11 @@ namespace llarp::handlers
     {
         if (should_publish_cc)
         {
-            log::debug(logcat, "Starting ClientContact publish ticker...");
+            log::critical(logcat, "Starting ClientContact publish ticker...");
             _cc_publisher = _router.loop()->call_every(
-                path::DEFAULT_LIFETIME,
+                CC_PUBLISH_INTERVAL,
                 [this]() {
-                    log::info(logcat, "Updating and publishing ClientContact...");
+                    log::critical(logcat, "Updating and publishing ClientContact...");
                     update_and_publish_localcc(get_current_client_intros());
                 },
                 true);

diff --git a/llarp/link/link_manager.cpp b/llarp/link/link_manager.cpp
@@ -1086,6 +1086,8 @@ namespace llarp
 
     void LinkManager::handle_publish_cc(std::string_view body, std::function<void(std::string)> respond)
     {
+        log::critical(logcat, "Received request to publish client contact!");
+
         EncryptedClientContact enc;
         bool is_relayed;
         uint64_t relay_order;

diff --git a/llarp/link/link_manager.hpp b/llarp/link/link_manager.hpp
@@ -285,8 +285,8 @@ namespace llarp
             void (LinkManager::*)(std::string_view body, std::function<void(std::string)> respond)>
             path_requests = {
                 {"resolve_ons"sv, &LinkManager::handle_resolve_ons},
-                {"publish_intro"sv, &LinkManager::handle_publish_cc},
-                {"find_intro"sv, &LinkManager::handle_find_cc}};
+                {"publish_cc"sv, &LinkManager::handle_publish_cc},
+                {"find_cc"sv, &LinkManager::handle_find_cc}};
 
         // Path relaying
         void handle_path_control(oxen::quic::message, const RouterID& from);
+0 −4		src/endpoint.cpp
+17 −17		tests/001-handshake.cpp
+47 −47		tests/002-send-receive.cpp
+4 −4		tests/003-multiclient.cpp
+42 −42		tests/004-streams.cpp
+5 −5		tests/005-chunked-sender.cpp
+9 −9		tests/006-server-send.cpp
+21 −21		tests/007-datagrams.cpp
+2 −2		tests/008-conn_hooks.cpp
+7 −7		tests/009-alpns.cpp
+5 −5		tests/010-migration.cpp
+1 −1		tests/011-manual_transmission.cpp
+5 −5		tests/012-watermarks.cpp
+1 −1		tests/013-eventhandler.cpp
+2 −2		tests/014-0rtt-resets.cpp
+197 −0		tests/015-bt-encoding.cpp
+1 −0		tests/CMakeLists.txt
+2 −2		tests/utils.cpp
+2 −1		tests/utils.hpp