fix e2ee connection options defaults for proto

Author: stephen-derosa

src/ffi_client.cpp

@@ -37,10 +37,18 @@ namespace livekit {
 
 namespace {
 
+inline constexpr int kDefaultKeyRingSize = 16;
+inline constexpr proto::KeyDerivationFunction kDefaultKeyDerivationFunction = proto::PBKDF2;
+
 std::string bytesToString(const std::vector<std::uint8_t>& b) {
   return std::string(reinterpret_cast<const char*>(b.data()), b.size());
 }
 
+std::vector<std::uint8_t> defaultRatchetSalt() {
+  return std::vector<std::uint8_t>(kDefaultRatchetSalt,
+                                   kDefaultRatchetSalt + std::char_traits<char>::length(kDefaultRatchetSalt));
+}
+
 inline void logAndThrow(const std::string& error_msg) {
   LK_LOG_ERROR("LiveKit SDK Error: {}", error_msg);
   throw std::runtime_error(error_msg);
@@ -340,28 +348,13 @@ std::future<proto::ConnectCallback> FfiClient::connectAsync(const std::string& u
     } else {
       kp->clear_shared_key();
     }
-    // Only set ratchet_salt if caller overrides. Otherwise clear so Rust side
-    // uses default.
-    if (!kpo.ratchet_salt.empty() &&
-        kpo.ratchet_salt !=
-            std::vector<std::uint8_t>(kDefaultRatchetSalt,
-                                      kDefaultRatchetSalt + std::char_traits<char>::length(kDefaultRatchetSalt))) {
-      kp->set_ratchet_salt(bytesToString(kpo.ratchet_salt));
-    } else {
-      kp->clear_ratchet_salt();
-    }
-    // Same idea for window size / tolerance: set only on override; otherwise
-    // clear.
-    if (kpo.ratchet_window_size != kDefaultRatchetWindowSize) {
-      kp->set_ratchet_window_size(kpo.ratchet_window_size);
-    } else {
-      kp->clear_ratchet_window_size();
-    }
-    if (kpo.failure_tolerance != kDefaultFailureTolerance) {
-      kp->set_failure_tolerance(kpo.failure_tolerance);
-    } else {
-      kp->clear_failure_tolerance();
-    }
+
+    const auto ratchet_salt = kpo.ratchet_salt.empty() ? defaultRatchetSalt() : kpo.ratchet_salt;
+    kp->set_ratchet_window_size(kpo.ratchet_window_size);
+    kp->set_ratchet_salt(bytesToString(ratchet_salt));
+    kp->set_failure_tolerance(kpo.failure_tolerance);
+    kp->set_key_ring_size(kDefaultKeyRingSize);
+    kp->set_key_derivation_function(kDefaultKeyDerivationFunction);
   }
 
   // --- RTC configuration (optional) ---