Split NTP protocol specific snapshot from SystemSnapshot

fuzz/fuzz_targets/handle.rs

@@ -5,17 +5,16 @@ use std::{
     borrow::Cow,
     io::{Cursor, Write},
     net::IpAddr,
+    sync::{Arc, RwLock},
     time::Duration,
 };
 
 use libfuzzer_sys::fuzz_target;
 use ntp_proto::{
-    test_cookie,
-    v5::{BloomFilter, ServerId},
-    EncryptResult, ExtensionField, ExtensionHeaderVersion, FilterAction, FilterList,
-    HandleInnerData, KeySetProvider, NtpClock, NtpDuration, NtpLeapIndicator, NtpTimestamp,
-    NtpVersion, ReferenceId, Server, ServerConfig, ServerReason, ServerResponse, ServerStatHandler,
-    SystemSnapshot, TimeSnapshot,
+    test_cookie, v5::BloomFilter, EncryptResult, ExtensionField, ExtensionHeaderVersion,
+    FilterAction, FilterList, HandleInnerData, KeySetProvider, NtpClock, NtpDuration,
+    NtpLeapIndicator, NtpServerInfo, NtpSnapshot, NtpTimestamp, NtpVersion, ReferenceId, Server,
+    ServerConfig, ServerReason, ServerResponse, ServerStatHandler, TimeSnapshot,
 };
 use rand::{rngs::StdRng, set_thread_rng, SeedableRng};
 
@@ -93,7 +92,7 @@ fuzz_target!(|parts: (
 
     let ip = IpAddr::from(parts.2);
 
-    let mut server = Server::new(
+    let mut server = Server::new_internal(
         ServerConfig {
             denylist,
             allowlist,
@@ -105,10 +104,12 @@ fuzz_target!(|parts: (
         TestClock {
             cur: NtpTimestamp::from_seconds_nanos_since_ntp_era(100, 0),
         },
-        SystemSnapshot {
-            stratum: 1,
-            reference_id: ReferenceId::NONE,
-            accumulated_steps_threshold: Some(NtpDuration::from_seconds(0.0)),
+        Arc::new(RwLock::new(NtpServerInfo {
+            ntp_snapshot: NtpSnapshot {
+                stratum: 1,
+                reference_id: ReferenceId::NONE,
+                bloom_filter: BloomFilter::new(),
+            },
             time_snapshot: TimeSnapshot {
                 precision: NtpDuration::from_seconds(0.00001),
                 root_delay: NtpDuration::from_seconds(0.01),
@@ -119,10 +120,9 @@ fuzz_target!(|parts: (
                 root_variance_cubic: 0.0,
                 leap_indicator: NtpLeapIndicator::NoWarning,
                 accumulated_steps: NtpDuration::from_seconds(0.0),
+                accumulated_steps_threshold: None,
             },
-            bloom_filter: BloomFilter::new(),
-            server_id: ServerId::new(&mut rand::thread_rng()),
-        },
+        })),
         keyset,
     );
 

ntp-proto/src/algorithm/kalman/mod.rs

@@ -388,7 +388,11 @@ impl<C: NtpClock> InternalTimeSyncController for KalmanClockController<C> {
             algo_config,
             freq_offset,
             desired_freq: 0.0,
-            timedata: TimeSnapshot::default(),
+            timedata: TimeSnapshot {
+                accumulated_steps_threshold: synchronization_config
+                    .accumulated_step_panic_threshold,
+                ..TimeSnapshot::default()
+            },
             in_startup: true,
         })
     }
@@ -553,7 +557,6 @@ mod tests {
                 offset: NtpDuration::from_seconds(1700.0 + noise),
                 localtime: algo.clock.current_time,
 
-                stratum: 0,
                 root_delay: NtpDuration::default(),
                 root_dispersion: NtpDuration::default(),
                 leap: NtpLeapIndicator::NoWarning,
@@ -801,7 +804,6 @@ mod tests {
                 offset: NtpDuration::from_seconds(1700.0 + noise),
                 localtime: algo.clock.current_time,
 
-                stratum: 0,
                 root_delay: NtpDuration::default(),
                 root_dispersion: NtpDuration::default(),
                 leap: NtpLeapIndicator::NoWarning,
@@ -856,7 +858,6 @@ mod tests {
                 offset: NtpDuration::from_seconds(-3600.0 + noise),
                 localtime: algo.clock.current_time,
 
-                stratum: 0,
                 root_delay: NtpDuration::default(),
                 root_dispersion: NtpDuration::default(),
                 leap: NtpLeapIndicator::NoWarning,