Fixed bugs in announce message sending.

pendulum-project · Mar 13, 2024 · b77707b · b77707b
1 parent 1641959
commit b77707b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/statime/src/datastructures/messages/mod.rs b/statime/src/datastructures/messages/mod.rs
@@ -310,7 +310,6 @@ impl<'a> Message<'a> {
 }
 
 impl Message<'_> {
-    #[allow(unused)]
     pub(crate) fn verify_signed(&self, provider: &impl SecurityAssociationProvider) -> bool {
         log::trace!("Validation message");
         let mut tlv_offset = 0;

diff --git a/statime/src/port/state/master.rs b/statime/src/port/state/master.rs
@@ -182,19 +182,16 @@ impl MasterState {
             }
         }
 
-        let packet_length =
-            match Message::announce(global, port_identity, self.announce_seq_ids.generate())
-                .serialize(buffer)
-            {
-                Ok(length) => length,
-                Err(error) => {
-                    log::error!(
-                        "Statime bug: Could not serialize announce message {:?}",
-                        error
-                    );
-                    return actions![];
-                }
-            };
+        let packet_length = match message.serialize(buffer) {
+            Ok(length) => length,
+            Err(error) => {
+                log::error!(
+                    "Statime bug: Could not serialize announce message {:?}",
+                    error
+                );
+                return actions![];
+            }
+        };
 
         actions![
             PortAction::ResetAnnounceTimer {