Refactored path message serialization

- DRYing out message serialization across path message types
oxen-io · Oct 25, 2024 · de4843c · de4843c
1 parent 0805844
commit de4843c
Show file tree

Hide file tree

Showing 18 changed files with 442 additions and 471 deletions.
diff --git a/external/oxen-libquic b/external/oxen-libquic
diff --git a/llarp/crypto/crypto.cpp b/llarp/crypto/crypto.cpp
@@ -262,9 +262,12 @@ namespace llarp
     }
 
     void crypto::derive_decrypt_outer_wrapping(
-        const Ed25519SecretKey& local_sk, const PubKey& remote, const SymmNonce& nonce, uspan encrypted)
+        const Ed25519SecretKey& local_sk,
+        SharedSecret& shared,
+        const PubKey& remote,
+        const SymmNonce& nonce,
+        uspan encrypted)
     {
-        SharedSecret shared;
         // derive shared secret using ephemeral pubkey and our secret key (and nonce)
         if (!crypto::dh_server(shared, remote, local_sk, nonce))
         {

diff --git a/llarp/crypto/crypto.hpp b/llarp/crypto/crypto.hpp
@@ -73,7 +73,11 @@ namespace llarp
         /// pubkey and the provided nonce. The encrypted payload is mutated in-place. Will throw on failure of either
         /// the server DH derivation or the xchacha20 payload mutation
         void derive_decrypt_outer_wrapping(
-            const Ed25519SecretKey& local, const PubKey& remote, const SymmNonce& nonce, uspan encrypted);
+            const Ed25519SecretKey& local,
+            SharedSecret& shared,
+            const PubKey& remote,
+            const SymmNonce& nonce,
+            uspan encrypted);
 
         bool make_scalar(AlignedBuffer<32>& out, const PubKey& k, uint64_t i);
 

diff --git a/llarp/handlers/session.cpp b/llarp/handlers/session.cpp
@@ -36,6 +36,12 @@ namespace llarp::handlers
 
         _running = false;
 
+        if (_cc_publisher)
+        {
+            log::debug(logcat, "ClientContact publish ticker stopped!");
+            _cc_publisher->stop();
+        }
+
         Lock_t l{paths_mutex};
 
         _sessions.stop_sessions(send_close);
@@ -145,7 +151,7 @@ namespace llarp::handlers
                 true);
         }
         else
-            log::debug(logcat, "SessionEndpoint configured to NOT publish ClientContact...");
+            log::info(logcat, "SessionEndpoint configured to NOT publish ClientContact...");
     }
 
     void SessionEndpoint::resolve_ons_mappings()
+22 −24		src/btstream.cpp
+1 −2		src/connection.cpp
+1 −1		src/endpoint.cpp
+5 −3		src/loop.cpp
+2 −2		src/network.cpp
+10 −10		tests/015-bt-encoding.cpp