Skip to content

Add support for multicastupdateRsp for Fira 2.0 version and bug fix. #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hchataing merged 1 commit into from
Mar 25, 2025
Merged

Add support for multicastupdateRsp for Fira 2.0 version and bug fix. #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 64 additions & 31 deletions src/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ impl Device {
let Some(session) = self.sessions.get_mut(&session_handle) else {
return SessionUpdateControllerMulticastListRsp {
status: uci::Status::ErrorSessionNotExist,
controlee_status: vec![],
};
};

Expand All @@ -594,6 +595,7 @@ impl Device {
{
return SessionUpdateControllerMulticastListRsp {
status: uci::Status::Rejected,
controlee_status: vec![],
};
}
let action = cmd.action;
Expand All @@ -612,6 +614,7 @@ impl Device {
} else {
return SessionUpdateControllerMulticastListRsp {
status: uci::Status::SyntaxError,
controlee_status: vec![],
};
}
}
Expand All @@ -629,6 +632,7 @@ impl Device {
} else {
return SessionUpdateControllerMulticastListRsp {
status: uci::Status::SyntaxError,
controlee_status: vec![],
};
}
}
Expand All @@ -646,11 +650,13 @@ impl Device {
} else {
return SessionUpdateControllerMulticastListRsp {
status: uci::Status::SyntaxError,
controlee_status: vec![],
};
}
}
};
let mut controlee_status = Vec::new();
let mut controlee_status_ntf = Vec::new();
let mut controlee_status_rsp = Vec::new();
let mut status = uci::Status::Ok;

match action {
Expand All @@ -659,34 +665,49 @@ impl Device {
| UpdateMulticastListAction::AddControleeWithExtendedSubSessionKey => {
new_controlees.iter().for_each(|controlee| {
let mut update_status = MulticastUpdateStatus::OkMulticastListUpdate;
if !dst_addresses.contains(&controlee.short_address) {
if dst_addresses.len() == MAX_NUMBER_OF_CONTROLEES {
status = uci::Status::ErrorMulticastListFull;
update_status = MulticastUpdateStatus::ErrorMulticastListFull;
} else if (action
== UpdateMulticastListAction::AddControleeWithShortSubSessionKey
|| action
== UpdateMulticastListAction::AddControleeWithExtendedSubSessionKey)
&& session.app_config.sts_config
!= uci::StsConfig::ProvisionedForResponderSubSessionKey
{
// If Action is 0x02 or 0x03 for STS_CONFIG values other than
// 0x04, the UWBS shall return SESSION_UPDATE_CONTROLLER_MULTICAST_LIST_NTF
// with Status set to STATUS_ERROR_SUB_SESSION_KEY_NOT_APPLICABLE for each
// Controlee in the Controlee List.
status = uci::Status::Failed;
update_status = MulticastUpdateStatus::ErrorSubSessionKeyNotApplicable;
if (action == UpdateMulticastListAction::AddControleeWithShortSubSessionKey
|| action
== UpdateMulticastListAction::AddControleeWithExtendedSubSessionKey)
&& session.app_config.sts_config
!= uci::StsConfig::ProvisionedForResponderSubSessionKey
{
// If Action is 0x02 or 0x03 for STS_CONFIG values other than
// 0x04, the UWBS shall return SESSION_UPDATE_CONTROLLER_MULTICAST_LIST_NTF
// with Status set to STATUS_ERROR_SUB_SESSION_KEY_NOT_APPLICABLE for each
// Controlee in the Controlee List.
status = uci::Status::Failed;
update_status = MulticastUpdateStatus::ErrorSubSessionKeyNotApplicable;
controlee_status_ntf.push(ControleeStatus {
mac_address: match controlee.short_address {
MacAddress::Short(address) => address,
MacAddress::Extended(_) => {
panic!("Extended address is not supported!")
}
},
status: update_status,
});
} else {
if !dst_addresses.contains(&controlee.short_address) {
if dst_addresses.len() == MAX_NUMBER_OF_CONTROLEES {
status = uci::Status::ErrorMulticastListFull;
update_status = MulticastUpdateStatus::ErrorMulticastListFull;
} else {
dst_addresses.push(controlee.short_address);
};
} else {
dst_addresses.push(controlee.short_address);
};
status = uci::Status::Failed;
update_status = MulticastUpdateStatus::ErrorAddressAlreadyPresent;
}
controlee_status_rsp.push(ControleeStatus {
mac_address: match controlee.short_address {
MacAddress::Short(address) => address,
MacAddress::Extended(_) => {
panic!("Extended address is not supported!")
}
},
status: update_status,
});
}
controlee_status.push(ControleeStatus {
mac_address: match controlee.short_address {
MacAddress::Short(address) => address,
MacAddress::Extended(_) => panic!("Extended address is not supported!"),
},
status: update_status,
});
});
}
UpdateMulticastListAction::RemoveControlee => {
Expand All @@ -697,7 +718,7 @@ impl Device {
let mut update_status = MulticastUpdateStatus::OkMulticastListUpdate;
if !dst_addresses.contains(&address) {
status = uci::Status::Failed;
update_status = MulticastUpdateStatus::ErrorKeyFetchFail;
update_status = MulticastUpdateStatus::ErrorAddressNotFound;
} else {
dst_addresses.retain(|value| *value != address);
// If IN_BAND_TERMINATION_ATTEMPT_COUNT is not equal to 0x00, then the
Expand All @@ -714,8 +735,17 @@ impl Device {
}
});
}
controlee_status_ntf.push(ControleeStatus {
mac_address: match address {
MacAddress::Short(addr) => addr,
MacAddress::Extended(_) => {
panic!("Extended address is not supported!")
}
},
status: update_status,
});
}
controlee_status.push(ControleeStatus {
controlee_status_rsp.push(ControleeStatus {
mac_address: match address {
MacAddress::Short(addr) => addr,
MacAddress::Extended(_) => panic!("Extended address is not supported!"),
Expand All @@ -738,7 +768,7 @@ impl Device {
time::sleep(Duration::from_millis(5)).await;
tx.send(
SessionUpdateControllerMulticastListNtf {
controlee_status,
controlee_status: controlee_status_ntf,
session_token: session_handle,
}
.encode_to_vec()
Expand All @@ -760,7 +790,10 @@ impl Device {
ReasonCode::ErrorInvalidNumOfControlees,
)
}
SessionUpdateControllerMulticastListRsp { status }
SessionUpdateControllerMulticastListRsp {
status,
controlee_status: controlee_status_rsp,
}
}

fn session_start(&mut self, cmd: SessionStartCmd) -> SessionStartRsp {
Expand Down
2 changes: 2 additions & 0 deletions src/uci_packets.pdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,8 @@ struct SessionUpdateControllerMulticastListCmd_2_0_32_Byte_Payload {

packet SessionUpdateControllerMulticastListRsp : SessionConfigPacket (mt = RESPONSE, oid = UPDATE_CONTROLLER_MULTICAST_LIST) {
status: Status,
_count_(controlee_status): 8,
controlee_status: ControleeStatus[],
}

test SessionUpdateControllerMulticastListRsp {
Expand Down
Loading