ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-03-21 11:35:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Decode frm_payload mac-commands in device frame log.

Browse Source
This commit is contained in:
Orne Brocaar 2023-03-02 12:21:42 +00:00
parent 9ab059a552
commit ddea09d9d4
6 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/proto/internal/internal.proto vendored
View File

@ -229,8 +229,11 @@ message DownlinkFrame {
// Encrypted FOpts (LoRaWAN 1.1).
bool encrypted_fopts = 8;
// Network session encryption key (for FOpts).
// Network session encryption key (for FOpts and FRMPayload mac-commands).
bytes nwk_s_enc_key = 9;
// NFCntDown (for decrypting mac-commands).
uint32 n_f_cnt_down = 10;
}
message LoraCloudGeolocBuffer {

5
api/rust/proto/chirpstack/internal/internal.proto vendored
View File

@ -229,8 +229,11 @@ message DownlinkFrame {
// Encrypted FOpts (LoRaWAN 1.1).
bool encrypted_fopts = 8;
// Network session encryption key (for FOpts).
// Network session encryption key (for FOpts and FRMPayload mac-commands).
bytes nwk_s_enc_key = 9;
// NFCntDown (for decrypting mac-commands).
uint32 n_f_cnt_down = 10;
}
message LoraCloudGeolocBuffer {

2
chirpstack/src/downlink/data.rs
View File

@ -288,6 +288,7 @@ impl Data {
// The queue item should fit within the max payload size and should not be pending
// already.
if qi.data.len() <= max_payload_size && !qi.is_pending {
trace!(id = %qi.id, more_in_queue = more_in_queue, "Found device queue-item for downlink");
self.device_queue_item = Some(qi);
self.more_device_queue_items = more_in_queue;
return Ok(());
@ -634,6 +635,7 @@ impl Data {
.starts_with("1.1"),
nwk_s_enc_key: self.device_session.nwk_s_enc_key.clone(),
downlink_frame: Some(self.downlink_frame.clone()),
n_f_cnt_down: self.device_session.n_f_cnt_down,
..Default::default()
})
.await

7
chirpstack/src/downlink/tx_ack.rs
View File

@ -433,6 +433,13 @@ impl TxAck {
let nwk_s_enc_key = AES128Key::from_slice(&df.nwk_s_enc_key)?;
if let Payload::MACPayload(pl) = &mut phy.payload {
if pl.f_port.unwrap_or(0) == 0 {
// We need to set the full NFcntDown to decrypt the mac-commands.
pl.fhdr.f_cnt = df.n_f_cnt_down;
}
}
if let Payload::MACPayload(pl) = &phy.payload {
// f_port must be either None or 0
if pl.f_port.unwrap_or(0) == 0 {

2
chirpstack/src/framelog.rs
View File

@ -283,6 +283,7 @@ pub async fn get_frame_logs(
let mut phy = lrwn::PhyPayload::from_slice(&pl.phy_payload)?;
if pl.plaintext_mac_commands {
phy.decode_f_opts_to_mac_commands()?;
phy.decode_frm_payload_to_mac_commands()?;
}
let pl = api::LogItem {
@ -314,6 +315,7 @@ pub async fn get_frame_logs(
let mut phy = lrwn::PhyPayload::from_slice(&pl.phy_payload)?;
if pl.plaintext_mac_commands {
phy.decode_f_opts_to_mac_commands()?;
phy.decode_frm_payload_to_mac_commands()?;
}
let pl = api::LogItem {

19
lrwn/src/phy_payload.rs
View File

@ -654,6 +654,25 @@ impl PhyPayload {
Ok(())
}
/// Decode frm_payload to mac-commands.
pub fn decode_frm_payload_to_mac_commands(&mut self) -> Result<()> {
if let Payload::MACPayload(pl) = &mut self.payload {
let uplink = is_uplink(self.mhdr.m_type);
if pl.f_port.unwrap_or(0) == 0 {
let b = match &pl.frm_payload {
Some(FRMPayload::Raw(v)) => v.clone(),
_ => vec![],
};
let mut macs = MACCommandSet::new(vec![MACCommand::Raw(b)]);
macs.decode_from_raw(uplink)?;
pl.frm_payload = Some(FRMPayload::MACCommandSet(macs));
}
}
Ok(())
}
/// Encrypt the frm_payload with the given key.
pub fn encrypt_frm_payload(&mut self, key: &AES128Key) -> Result<()> {
if let Payload::MACPayload(pl) = &mut self.payload {