Skip to content

Indicate to the client if incoming packets were APS encrypted #61

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
puddly merged 1 commit into from
Sep 24, 2026
Merged

Indicate to the client if incoming packets were APS encrypted #61

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
77 changes: 40 additions & 37 deletions crates/ziggurat-driver/src/zigbee_stack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,7 @@ pub enum ZigbeeNotification {
dst_ep: u8,
lqi: u8,
rssi: i8,
aps_encrypted: bool,
data: Vec<u8>,
},
/// The outgoing NWK security frame counter has advanced; the client should persist
Expand Down Expand Up @@ -1258,47 +1259,48 @@ impl<P: RadioPhy, R: Runtime> ZigbeeStack<P, R> {
continue;
};

let (aps_frame, aps_source_eui64) = match parse_aps_frame(aps_payload) {
Ok(ApsFrame::Data(data)) => (data, None),
Ok(ApsFrame::EncryptedData(encrypted)) => {
match self.decrypt_aps_data_frame(&nwk_frame, &encrypted) {
Some((data, source_eui64)) => (data, Some(source_eui64)),
None => {
tracing::warn!(
"Failed to decrypt APS data frame from {:?}",
let (aps_frame, aps_source_eui64, aps_encrypted) =
match parse_aps_frame(aps_payload) {
Ok(ApsFrame::Data(data)) => (data, None, false),
Ok(ApsFrame::EncryptedData(encrypted)) => {
match self.decrypt_aps_data_frame(&nwk_frame, &encrypted) {
Some((data, source_eui64)) => (data, Some(source_eui64), true),
None => {
tracing::warn!(
"Failed to decrypt APS data frame from {:?}",
nwk_frame.nwk_header.source
);
continue;
}
}
}
Ok(ApsFrame::Ack(ack)) => {
self.handle_aps_ack(&nwk_frame, &ack);
continue;
}
Ok(ApsFrame::EncryptedAck(encrypted)) => {
match self.decrypt_aps_ack_frame(&nwk_frame, &encrypted) {
Some(ack) => self.handle_aps_ack(&nwk_frame, &ack),
None => tracing::warn!(
"Failed to decrypt APS ACK from {:?}",
nwk_frame.nwk_header.source
);
continue;
),
}
continue;
}
}
Ok(ApsFrame::Ack(ack)) => {
self.handle_aps_ack(&nwk_frame, &ack);
continue;
}
Ok(ApsFrame::EncryptedAck(encrypted)) => {
match self.decrypt_aps_ack_frame(&nwk_frame, &encrypted) {
Some(ack) => self.handle_aps_ack(&nwk_frame, &ack),
None => tracing::warn!(
"Failed to decrypt APS ACK from {:?}",
nwk_frame.nwk_header.source
),
Ok(ApsFrame::Command(cmd)) => {
self.handle_aps_command_frame(&nwk_frame, &cmd, None, None);
continue;
}
continue;
}
Ok(ApsFrame::Command(cmd)) => {
self.handle_aps_command_frame(&nwk_frame, &cmd, None, None);
continue;
}
Ok(ApsFrame::EncryptedCommand(encrypted_cmd)) => {
self.handle_encrypted_aps_command_frame(&nwk_frame, &encrypted_cmd);
continue;
}
Err(e) => {
tracing::warn!("Error parsing APS frame: {e:?}");
continue;
}
};
Ok(ApsFrame::EncryptedCommand(encrypted_cmd)) => {
self.handle_encrypted_aps_command_frame(&nwk_frame, &encrypted_cmd);
continue;
}
Err(e) => {
tracing::warn!("Error parsing APS frame: {e:?}");
continue;
}
};

tracing::trace!("Received APS data frame: {aps_frame:?}");

Expand Down Expand Up @@ -1335,6 +1337,7 @@ impl<P: RadioPhy, R: Runtime> ZigbeeStack<P, R> {
dst_ep: aps_frame.destination_endpoint.unwrap_or(0),
lqi: packet.lqi,
rssi: packet.rssi,
aps_encrypted,
data: aps_frame.asdu.to_vec(),
};
self.push_notification(notification);
Expand Down
2 changes: 2 additions & 0 deletions crates/ziggurat-protocol/src/bridge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,11 +452,13 @@ pub fn notification_frame(update: &ZigbeeNotification) -> Option<Vec<u8>> {
dst_ep,
lqi,
rssi,
aps_encrypted,
data,
} => Notification::ReceivedAps(ReceivedApsPayload {
source: *source,
destination: *destination,
has_group: group.is_some(),
aps_encrypted: *aps_encrypted,
group: group.unwrap_or(0),
profile_id: *profile_id,
cluster_id: *cluster_id,
Expand Down
3 changes: 2 additions & 1 deletion crates/ziggurat-protocol/src/wire.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,8 @@ pub struct ReceivedApsPayload {
pub source: Nwk,
pub destination: Nwk,
pub has_group: bool,
pub reserved: u7,
pub aps_encrypted: bool,
pub reserved: u6,
pub group: u16,
pub profile_id: u16,
pub cluster_id: u16,
Expand Down