patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

lorawan: fix premature return in lorawan_send

Browse source 
Fixes an issue where `lorawan_send` would return prematurely when
`LORAWAN_MSG_CONFIRMED` is mixed with unconfirmed messages.

All calls to `LoRaMacMcpsRequest` result in `McpsConfirm` being run,
where the semaphore `mcps_confirm_sem` is given. However this semaphore
is only taken when `LORAWAN_MSG_CONFIRMED` is set.

Therefore if an unconfirmed message is sent, any following confirmed
messages will return from `lorawan_send` immediately as the semaphore
will be available from the previous send. The return value would also
be wrong for the same reasons.

Fixed by only giving the semaphore in situations when it is being
blocked on.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2021-01-14 23:08:59 +10:00 committed by Anas Nashif
parent f862972f35
commit 875f6a5302
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subsys/lorawan/lorawan.c
View file

@ -85,7 +85,10 @@ static void McpsConfirm(McpsConfirm_t *mcpsConfirm)
} }
last_mcps_confirm_status = mcpsConfirm->Status; last_mcps_confirm_status = mcpsConfirm->Status;
k_sem_give(&mcps_confirm_sem); /* mcps_confirm_sem is only blocked on in the MCPS_CONFIRMED case */
if (mcpsConfirm->McpsRequest == MCPS_CONFIRMED) {
k_sem_give(&mcps_confirm_sem);
}
} }
static void McpsIndication(McpsIndication_t *mcpsIndication) static void McpsIndication(McpsIndication_t *mcpsIndication)