Allow v3 responses to v4 client requests

pendulum-project · Jun 26, 2024 · 42d6f75 · 42d6f75
1 parent 8dc8cdf
commit 42d6f75
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/ntp-proto/src/algorithm/kalman/select.rs b/ntp-proto/src/algorithm/kalman/select.rs
@@ -2,6 +2,7 @@ use crate::config::SynchronizationConfig;
 
 use super::{config::AlgorithmConfig, SourceSnapshot};
 
+#[derive(Debug)]
 enum BoundType {
     Start,
     End,

diff --git a/ntp-proto/src/source.rs b/ntp-proto/src/source.rs
@@ -304,13 +304,13 @@ pub enum ProtocolVersion {
 }
 
 impl ProtocolVersion {
-    pub fn expected_incoming_version(&self) -> u8 {
+    pub fn is_expected_incoming_version(&self, incoming_version: u8) -> bool {
         match self {
-            ProtocolVersion::V4 => 4,
+            ProtocolVersion::V4 => incoming_version == 4 || incoming_version == 3,
             #[cfg(feature = "ntpv5")]
-            ProtocolVersion::V4UpgradingToV5 { .. } => 4,
+            ProtocolVersion::V4UpgradingToV5 { .. } => incoming_version == 4,
             #[cfg(feature = "ntpv5")]
-            ProtocolVersion::V5 => 5,
+            ProtocolVersion::V5 => incoming_version == 5,
         }
     }
 }
@@ -619,7 +619,15 @@ impl<Controller: SourceController> NtpSource<Controller> {
                 }
             };
 
-        if message.version() != self.protocol_version.expected_incoming_version() {
+        if !self
+            .protocol_version
+            .is_expected_incoming_version(message.version())
+        {
+            warn!(
+                incoming_version = message.version(),
+                expected_version = ?self.protocol_version,
+                "Received packet with unexpected version from source"
+            );
             return actions!();
         }