michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Ignore segments of cancelled message

Browse source 
This fixes the issue when after incomplete timer expiration
host sent ACK.
The host failed in two cases:
1. Sending ACK right after the incomplete timer expiration;
2. Sending ACK from new RX context. Now, seq_auth of cancelled
message is not cleaned on RX reset, so segments of cancelled message
will be discarded when resend.

According to the Mesh Profile v1.0
"When the incomplete timer expires, the lower transport layer
shall consider that the message being received has failed and
cancel the acknowledgment timer. Any segment of a canceled
message shall be ignored."

Fixes #6023

Signed-off-by: Mariusz Skamra <mariusz.skamra@codecoup.pl>
This commit is contained in:
Mariusz Skamra 2018-02-14 15:48:19 +01:00 • committed by Johan Hedberg
commit daa8040e2f
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/bluetooth/host/mesh/transport.c
View file

@ -1014,9 +1014,7 @@ static void seg_ack(struct k_work *work)
if (k_uptime_get_32() - rx->last > K_SECONDS(60)) { if (k_uptime_get_32() - rx->last > K_SECONDS(60)) {
BT_WARN("Incomplete timer expired"); BT_WARN("Incomplete timer expired");
send_ack(rx->sub, rx->dst, rx->src, rx->ttl, seg_rx_reset(rx, false);
&rx->seq_auth, 0, rx->obo);
seg_rx_reset(rx, true);
if (IS_ENABLED(CONFIG_BT_TESTING)) { if (IS_ENABLED(CONFIG_BT_TESTING)) {
bt_test_mesh_trans_incomp_timer_exp(); bt_test_mesh_trans_incomp_timer_exp();