Ignore PTPv1 packets

statime-linux/src/main.rs

@@ -12,7 +12,8 @@ use statime::{
     config::{ClockIdentity, InstanceConfig, SdoId, TimePropertiesDS, TimeSource},
     filters::{Filter, KalmanConfiguration, KalmanFilter},
     port::{
-        InBmca, Measurement, Port, PortAction, PortActionIterator, TimestampContext, MAX_DATA_LEN,
+        is_message_buffer_compatible, InBmca, Measurement, Port, PortAction, PortActionIterator,
+        TimestampContext, MAX_DATA_LEN,
     },
     time::Time,
     PtpInstance, PtpInstanceState,
@@ -506,7 +507,10 @@ async fn port_task<A: NetworkAddress + PtpTargetAddress>(
             let mut actions = tokio::select! {
                 result = event_socket.recv(&mut event_buffer) => match result {
                     Ok(packet) => {
-                        if let Some(mut timestamp) = packet.timestamp {
+                        if !is_message_buffer_compatible(&event_buffer[..packet.bytes_read]) {
+                            // do not spam with missing timestamp error in mixed-version PTPv1+v2 networks
+                            PortActionIterator::empty()
+                        } else if let Some(mut timestamp) = packet.timestamp {
                             // get_tai gives zero if this is a hardware clock, and the needed
                             // correction when this port uses software timestamping
                             timestamp.seconds += clock.get_tai_offset().expect("Unable to get tai offset") as i64;

statime/src/datastructures/messages/mod.rs

@@ -237,6 +237,13 @@ fn base_header(
     }
 }
 
+/// Checks whether message is of PTP revision compatible with Statime
+pub fn is_compatible(buffer: &[u8]) -> bool {
+    // this ensures that versionPTP in the header is 2
+    // it will never happen in PTPv1 packets because this octet is the LSB of versionPTP there
+    (buffer.len() >= 2) && (buffer[1] & 0xF) == 2
+}
+
 impl Message<'_> {
     pub(crate) fn sync(
         default_ds: &InternalDefaultDS,

statime/src/port/mod.rs

@@ -13,6 +13,7 @@ use rand::Rng;
 use state::PortState;
 
 use self::sequence_id::SequenceIdGenerator;
+pub use crate::datastructures::messages::is_compatible as is_message_buffer_compatible;
 pub use crate::datastructures::messages::MAX_DATA_LEN;
 #[cfg(doc)]
 use crate::PtpInstance;
@@ -437,6 +438,10 @@ impl<'a, A: AcceptableMasterList, C: Clock, F: Filter, R: Rng, S: PtpInstanceSta
         &mut self,
         data: &'b [u8],
     ) -> ControlFlow<PortActionIterator<'b>, Message<'b>> {
+        if !is_message_buffer_compatible(data) {
+            // do not spam with parse error in mixed-version PTPv1+v2 networks
+            return ControlFlow::Break(actions![]);
+        }
         let message = match Message::deserialize(data) {
             Ok(message) => message,
             Err(error) => {