Skip to contentSkip to conversation

mesh: fix sending messages to group addresses

PATCH Applied Aurelien Jarno 2 participants 2 messages Nov 11, 2019 – Nov 12, 2019 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mesh: fix sending messages to group addresses

When sending a message to a group address (either virtual or fixed), it has to be sent OTA even if successfully enqueued to an internal model.

---
 mesh/net.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
mesh/net.c +3 -3
index f07de4d8a..33b498135 100644
@@ -3339,10 +3339,10 @@ bool mesh_net_app_send(struct mesh_net *net, bool frnd_cred, uint16_t src,
 				szmic, seq & SEQ_ZERO_MASK,
 				msg, msg_len);
 
-	/* If successfully enqued or delivered
-	 * to Unicast address, we are done
+	/* If addressed to a unicast address and successfully enqueued,
+	 * or delivered to one of our Unicast addresses we are done
 	 */
-	if (result || src == dst ||
+	if ((result && IS_UNICAST(dst)) || src == dst ||
 			(dst >= net->src_addr && dst <= net->last_addr)) {
 		/* Adjust our seq_num for "virtual" delivery */
 		net->seq_num += seg_max;
Signature · 1 line
2.24.0
Applied
#1 lore raw

Applied, Thanks

Quoted 24 lines · Aurelien Jarno

When sending a message to a group address (either virtual or fixed), it has to be sent OTA even if successfully enqueued to an internal model.

---
 mesh/net.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
mesh/net.c +3 -3
index f07de4d8a..33b498135 100644
@@ -3339,10 +3339,10 @@ bool mesh_net_app_send(struct mesh_net *net, bool frnd_cred, uint16_t src,
 				szmic, seq & SEQ_ZERO_MASK,
 				msg, msg_len);
 
-	/* If successfully enqued or delivered
-	 * to Unicast address, we are done
+	/* If addressed to a unicast address and successfully enqueued,
+	 * or delivered to one of our Unicast addresses we are done
 	 */
-	if (result || src == dst ||
+	if ((result && IS_UNICAST(dst)) || src == dst ||
 			(dst >= net->src_addr && dst <= net->last_addr)) {
 		/* Adjust our seq_num for "virtual" delivery */
 		net->seq_num += seg_max;