riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnrc/lorawan : Bug fix for zero CFList

Browse Source 
Correct check for CFlist and then conditinally process CFList.
This commit is contained in:
Akshai M 2020-10-05 18:07:51 +05:30
parent e1418e0972
commit b4594ffe32
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_mlme.c
View File

@ -103,7 +103,7 @@ void gnrc_lorawan_mlme_process_join(gnrc_lorawan_t *mac, uint8_t *data,
/* Subtract 1 from join accept max size, since the MHDR was already read */ /* Subtract 1 from join accept max size, since the MHDR was already read */
uint8_t out[GNRC_LORAWAN_JOIN_ACCEPT_MAX_SIZE - 1]; uint8_t out[GNRC_LORAWAN_JOIN_ACCEPT_MAX_SIZE - 1];
uint8_t has_cflist = (size - 1) >= CFLIST_SIZE; uint8_t has_cflist = (size - 1) > CFLIST_SIZE;
gnrc_lorawan_decrypt_join_accept(mac->appskey, data + 1, gnrc_lorawan_decrypt_join_accept(mac->appskey, data + 1,
has_cflist, out); has_cflist, out);
@ -138,7 +138,10 @@ void gnrc_lorawan_mlme_process_join(gnrc_lorawan_t *mac, uint8_t *data,
/* delay 0 maps to 1 second */ /* delay 0 maps to 1 second */
mac->rx_delay = ja_hdr->rx_delay ? ja_hdr->rx_delay : 1; mac->rx_delay = ja_hdr->rx_delay ? ja_hdr->rx_delay : 1;
gnrc_lorawan_process_cflist(mac, out + sizeof(lorawan_join_accept_t) - 1); if (has_cflist) {
gnrc_lorawan_process_cflist(mac, out + sizeof(lorawan_join_accept_t) - 1);
}
mac->mlme.activation = MLME_ACTIVATION_OTAA; mac->mlme.activation = MLME_ACTIVATION_OTAA;
status = GNRC_LORAWAN_REQ_STATUS_SUCCESS; status = GNRC_LORAWAN_REQ_STATUS_SUCCESS;