TimeSync, TrustedTimeSource client

Author: ivmarkov

examples/src/bin/chip_tool_tests.rs

@@ -463,7 +463,13 @@ const NODE: Node<'static> = Node {
             ROOT_ENDPOINT_ID,
             devices!(DEV_TYPE_ROOT_NODE),
             clusters!(
-                eth;
+                eth,
+                // Claim `TimeSynchronization.TIME_SYNC_CLIENT` (Matter Core
+                // spec §11.17.13) so the device advertises the
+                // `TrustedTimeSource` attribute + `SetTrustedTimeSource`
+                // command — exercised by `TC_TIMESYNC_2_13` and
+                // consumed by [`time_sync::client::TimeSyncClient`].
+                time_sync(time_sync_client);
                 groups::GroupsHandler::CLUSTER,
                 user_label::CLUSTER,
                 binding::CLUSTER

rs-matter/src/dm/clusters/noc.rs

@@ -530,7 +530,7 @@ impl ClusterHandler for NocHandler {
         let status = NodeOperationalCertStatusEnum::map(GenCommHandler::with_armed_failsafe(
             &ctx,
             |state, mut notify_mdns| {
-                let lkg_utc_secs = state.lkg_utc_secs();
+                let lkg_utc_secs = state.rtc.utc_time_best_effort() / 1_000_000;
                 let sess = ctx.exchange().id().session(&mut state.sessions);
 
                 let fabric = state.failsafe.add_noc(
@@ -621,7 +621,7 @@ impl ClusterHandler for NocHandler {
         let status = NodeOperationalCertStatusEnum::map(GenCommHandler::with_armed_failsafe(
             &ctx,
             |state, notify_mdns| {
-                let lkg_utc_secs = state.lkg_utc_secs();
+                let lkg_utc_secs = state.rtc.utc_time_best_effort() / 1_000_000;
                 let sess = ctx.exchange().id().session(&mut state.sessions);
 
                 state.failsafe.update_noc(
@@ -739,6 +739,18 @@ impl ClusterHandler for NocHandler {
 
                 persist.remove(fab_idx)?;
 
+                // Matter Core spec §11.17.8.7: if the removed fabric is the
+                // one that installed the TrustedTimeSource, the device SHALL
+                // clear the attribute (and emit `MissingTrustedTimeSource`).
+                if state.rtc.trusted_time_source().map(|tts| tts.fab_idx) == Some(fab_idx) {
+                    state.rtc.set_trusted_time_source_persist(
+                        None,
+                        persist.persist_mut(),
+                        &ctx,
+                        &ctx,
+                    )?;
+                }
+
                 info!("Removed operational fabric with local index {}", fab_idx);
 
                 // If the removed fabric was the one that opened the current
@@ -792,7 +804,7 @@ impl ClusterHandler for NocHandler {
         let mut buf = [0u8; crate::cert::MAX_CERT_ASN1_LEN];
 
         GenCommHandler::with_armed_failsafe(&ctx, |state, _| {
-            let lkg_utc_secs = state.lkg_utc_secs();
+            let lkg_utc_secs = state.rtc.utc_time_best_effort() / 1_000_000;
             let sess = ctx.exchange().id().session(&mut state.sessions);
 
             state.failsafe.add_trusted_root_cert(