commit 8f104b02993bde68148f2dcbb38211af1c9ce6ac
author Henri Chataing <henrichataing@google.com> Tue Apr 02 10:28:44 2024 -0700
committer hchataing <104974782+hchataing@users.noreply.github.com> Fri Apr 05 14:41:48 2024 -0700
tree 3a18b77de8062fccb96308f3171f18b2fa0017be
parent b5006afdc4533af8fa4d5e6e0674f2a6a5c1af45

Update the format of the notification Update Controller Multicast List

The previous version implemented UCI 1.0, now that pica implements UCI 2.0
the format needs to be updated.

src/device.rs

diff --git a/src/device.rs b/src/device.rs
index e0fcf61..eec1c7f 100644
--- a/src/device.rs
+++ b/src/device.rs
@@ -690,7 +690,6 @@
                             MacAddress::Short(address) => address,
                             MacAddress::Extended(_) => panic!("Extended address is not supported!"),
                         },
-                        subsession_id: controlee.sub_session_id,
                         status: update_status,
                     });
                 });
@@ -726,7 +725,6 @@
                             MacAddress::Short(addr) => addr,
                             MacAddress::Extended(_) => panic!("Extended address is not supported!"),
                         },
-                        subsession_id: controlee.sub_session_id,
                         status: update_status,
                     });
                 });
@@ -745,10 +743,13 @@
         }
         let tx = self.tx.clone();
         tokio::spawn(async move {
+            // Sleep for 5ms to make sure the notification is not being
+            // sent before the response.
+            // TODO(#84) remove the sleep.
+            time::sleep(Duration::from_millis(5)).await;
             tx.send(
                 SessionUpdateControllerMulticastListNtfBuilder {
                     controlee_status,
-                    remaining_multicast_list_size: dst_addresses.len() as u8,
                     session_token: session_handle,
                 }
                 .build()
@@ -1069,6 +1070,7 @@
 
 struct Controlee {
     short_address: MacAddress,
+    #[allow(dead_code)]
     sub_session_id: u32,
     #[allow(dead_code)]
     session_key: SubSessionKey,

src/uci_packets.pdl

diff --git a/src/uci_packets.pdl b/src/uci_packets.pdl
index 4a2f69f..05ba3f3 100644
--- a/src/uci_packets.pdl
+++ b/src/uci_packets.pdl
@@ -1078,13 +1078,11 @@
 
 struct ControleeStatus {
     mac_address: 8[2],
-    subsession_id: 32,
     status: MulticastUpdateStatus,
 }
 
 packet SessionUpdateControllerMulticastListNtf : SessionConfigPacket (mt = NOTIFICATION, oid = UPDATE_CONTROLLER_MULTICAST_LIST) {
     session_token: 32, // Session ID or Session Handle (based on UWBS version)
-    remaining_multicast_list_size: 8,
     _count_(controlee_status): 8,
     controlee_status: ControleeStatus[],
 }