Merge pull request #1046 from NordSecurity/fix-pollKeepalive

Make pollKeepalive optional
NordSecurity · Dec 30, 2024 · d71b3d5 · d71b3d5
2 parents b4906ff + 3493a91
commit d71b3d5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.unreleased/fix_pollKeepalive b/.unreleased/fix_pollKeepalive
diff --git a/crates/telio-model/src/features.rs b/crates/telio-model/src/features.rs
@@ -330,7 +330,7 @@ pub struct FeatureDerp {
     /// Poll Keepalive: Application level keepalives meant to replace the TCP keepalives
     /// They will use derp_keepalive as interval
     #[serde(default)]
-    pub poll_keepalive: bool,
+    pub poll_keepalive: Option<bool>,
     /// Enable polling of remote peer states to reduce derp traffic
     pub enable_polling: Option<bool>,
     /// Use Mozilla's root certificates instead of OS ones [default false]
@@ -631,7 +631,7 @@ mod tests {
                     derp: Some(FeatureDerp {
                         tcp_keepalive: Some(13),
                         derp_keepalive: Some(14),
-                        poll_keepalive: true,
+                        poll_keepalive: Some(true),
                         enable_polling: Some(true),
                         use_built_in_root_certificates: true,
                     }),

diff --git a/crates/telio-relay/src/derp.rs b/crates/telio-relay/src/derp.rs
@@ -149,7 +149,7 @@ impl From<&Option<FeatureDerp>> for DerpKeepaliveConfig {
             if let Some(derp_ka) = derp.derp_keepalive {
                 derp_keepalive = derp_ka;
             }
-            poll_keepalive = derp.poll_keepalive;
+            poll_keepalive = derp.poll_keepalive.unwrap_or_default();
         }
 
         DerpKeepaliveConfig {

diff --git a/src/libtelio.udl b/src/libtelio.udl
@@ -686,7 +686,7 @@ dictionary FeatureDerp {
     u32? derp_keepalive;
     /// Poll Keepalive: Application level keepalives meant to replace the TCP keepalives
     /// They will reuse the derp_keepalive interval
-    boolean poll_keepalive;
+    boolean? poll_keepalive;
     /// Enable polling of remote peer states to reduce derp traffic
     boolean? enable_polling;
     /// Use Mozilla's root certificates instead of OS ones [default false]