ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix MIC calculation

feature-lorawan-1-1
Kimmo Vaisanen 2018-08-31 15:25:40 +03:00 committed by Antti Kauppila
parent 6e60f2e161
commit a8dbad926c
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
features/lorawan/lorastack/mac/LoRaMac.cpp
View File

@ -1235,9 +1235,19 @@ lorawan_status_t LoRaMac::schedule_tx()
uint8_t rx1_dr = _lora_phy->apply_DR_offset(_params.sys_params.channel_data_rate,
_params.sys_params.rx1_dr_offset);
status = calculate_mic();
if (status != LORAWAN_STATUS_OK) {
return status;
bool process_mic = true;
loramac_mhdr_t mac_hdr;
mac_hdr.value = _params.tx_buffer[0];
if (mac_hdr.bits.mtype == FRAME_TYPE_JOIN_REQ || mac_hdr.bits.mtype == FRAME_TYPE_REJOIN_REQUEST) {
// JOIN and REJOIN frames already has own MIC
process_mic = false;
}
if (process_mic) {
status = calculate_userdata_mic();
if (status != LORAWAN_STATUS_OK) {
return status;
}
}
tr_debug("TX: Channel=%d, TX DR=%d, RX1 DR=%d",
@ -1293,7 +1303,15 @@ lorawan_status_t LoRaMac::schedule_tx()
}
_can_cancel_tx = false;
return send_frame_on_channel(_params.channel);
status = send_frame_on_channel(_params.channel);
// If MIC was calculated, remove it from buffer after sending
// so it can be recalculated and added to the buffer in case
// of retransmission.
if (process_mic) {
_params.tx_buffer_len -= LORAMAC_MFR_LEN;
}
return status;
}
void LoRaMac::calculate_backOff(uint8_t channel)
@ -2206,7 +2224,7 @@ void LoRaMac::get_rejoin_parameters(uint32_t& max_time, uint32_t& max_count)
max_count = _lora_phy->get_rejoin_max_count();
}
lorawan_status_t LoRaMac::calculate_mic()
lorawan_status_t LoRaMac::calculate_userdata_mic()
{
lorawan_status_t status = LORAWAN_STATUS_OK;
uint32_t mic = 0;

5
features/lorawan/lorastack/mac/LoRaMac.h
View File

@ -650,7 +650,10 @@ private:
void set_tx_continuous_wave(uint8_t channel, int8_t datarate, int8_t tx_power,
float max_eirp, float antenna_gain, uint16_t timeout);
lorawan_status_t calculate_mic();
/**
* Calculate MIC for user data messages
*/
lorawan_status_t calculate_userdata_mic();
private:
typedef mbed::ScopedLock<LoRaMac> Lock;