feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/blemesh25-92_v5.0' into 'release/v5.0'

Browse Source 
fix(ble_mesh): fixed issues with decrypt failed when resending messages (v5.0)

See merge request espressif/esp-idf!38556
This commit is contained in:
Jiang Jiang Jian
2025-04-21 14:07:47 +08:00
parent 77819073b7 9e944c86a5
commit 36a8ce4896
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/bt/esp_ble_mesh/mesh_core/transport.c
View File

@@ -2,7 +2,7 @@
/*
* SPDX-FileCopyrightText: 2017 Intel Corporation
* SPDX-FileContributor: 2018-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileContributor: 2018-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -322,6 +322,19 @@ static inline void seg_tx_complete(struct seg_tx *tx, int err)
static void schedule_retransmit(struct seg_tx *tx)
{
/* It's possible that a segment broadcast hasn't finished,
* but the tx are already released. Only the seg_pending
* of this segment remains unprocessed. So, here, we
* determine if the tx are released by checking if the
* destination (dst) is unassigned, and then process
* the seg_pending of this segment.
* See BLEMESH25-92 for details */
if (tx->dst == BLE_MESH_ADDR_UNASSIGNED) {
assert(tx->seg_pending == 1);
tx->seg_pending = 0;
return;
}
if (--tx->seg_pending) {
return;
}
@@ -448,7 +461,15 @@ static int send_seg(struct bt_mesh_net_tx *net_tx, struct net_buf_simple *sdu,
}
for (tx = NULL, i = 0; i < ARRAY_SIZE(seg_tx); i++) {
if (!seg_tx[i].nack_count) {
if (!seg_tx[i].nack_count &&
/* In some critical conditions, the tx might be
* reset before a segment broadcast is finished.
* If this happens, the seg_pending of the segment
* hasn't been processed. To avoid assigning this
* uncleared tx to a new message, extra checks for
* seg_pending being 0 are added. See BLEMESH25-92
* for details.*/
!seg_tx[i].seg_pending) {
tx = &seg_tx[i];
break;
}