lorawan: fix premature return in lorawan_send

Jordan Yates · nashif · commit 875f6a530286 · 2021-01-19T09:02:43.000-05:00
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 &lt;jordan.yates@data61.csiro.au&gt;
diff --git a/subsys/lorawan/lorawan.c b/subsys/lorawan/lorawan.c
@@ -85,7 +85,10 @@ static void McpsConfirm(McpsConfirm_t *mcpsConfirm)
 	}
 
 	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)

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,10 @@ static void McpsConfirm(McpsConfirm_t *mcpsConfirm)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`last_mcps_confirm_status = mcpsConfirm->Status;`
`88`		`- k_sem_give(&mcps_confirm_sem);`
	`88`	`+ /* mcps_confirm_sem is only blocked on in the MCPS_CONFIRMED case */`
	`89`	`+ if (mcpsConfirm->McpsRequest == MCPS_CONFIRMED) {`
	`90`	`+ k_sem_give(&mcps_confirm_sem);`
	`91`	`+ }`
`89`	`92`	`}`
`90`	`93`
`91`	`94`	`static void McpsIndication(McpsIndication_t *mcpsIndication)`