alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ble_mesh: stack: Fix add continuously secure update into friend queue.

Browse Source 
For MESH/NODE/FRND/FN/BV-20-C
This commit is contained in:
wangjialiang 2022-08-05 14:38:35 +08:00
parent d21a87f60c
commit 2eb28028ed
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
components/bt/esp_ble_mesh/mesh_core/friend.c
View File

@ -64,6 +64,7 @@ enum {
}; };
static void (*friend_cb)(bool establish, uint16_t lpn_addr, uint8_t reason); static void (*friend_cb)(bool establish, uint16_t lpn_addr, uint8_t reason);
static void enqueue_update(struct bt_mesh_friend *frnd, uint8_t md);
static bool friend_init = false; static bool friend_init = false;
@ -233,7 +234,23 @@ void bt_mesh_friend_sec_update(uint16_t net_idx)
} }
if (net_idx == BLE_MESH_KEY_ANY || frnd->net_idx == net_idx) { if (net_idx == BLE_MESH_KEY_ANY || frnd->net_idx == net_idx) {
frnd->sec_update = 1U; /* For case MESH/NODE/FRND/FN/BV-20-C.
* A situation is:
* The friend node may receive more than one different secure updates
* consecutively. And using the previous approach will cause only the
* latest Friend Update message been enqueued.
* So we update the implementation here to enqueue the Friend Update
* message immediately once a different secure beacon is received.
*
* A disadvantage of the change is:
* A friend node may receive different secure beacons. Then the
* beacon_cache mechanism will not work. This will cause the friend
* message queue been full of these secure beacons. So before enqueuing
* the secure updates, we should check if the currently received one
* is already exists in the message queue. Or enhance the beacon cache
* filtering mechanism.
*/
enqueue_update(frnd, 1);
} }
} }
} }
@ -699,7 +716,6 @@ static void enqueue_update(struct bt_mesh_friend *frnd, uint8_t md)
return; return;
} }
frnd->sec_update = 0U;
enqueue_buf(frnd, buf); enqueue_buf(frnd, buf);
} }
@ -1116,10 +1132,6 @@ static void enqueue_friend_pdu(struct bt_mesh_friend *frnd,
BT_DBG("type %u", type); BT_DBG("type %u", type);
if (type == BLE_MESH_FRIEND_PDU_SINGLE) { if (type == BLE_MESH_FRIEND_PDU_SINGLE) {
if (frnd->sec_update) {
enqueue_update(frnd, 1);
}
enqueue_buf(frnd, buf); enqueue_buf(frnd, buf);
return; return;
} }
@ -1136,10 +1148,6 @@ static void enqueue_friend_pdu(struct bt_mesh_friend *frnd,
net_buf_slist_put(&seg->queue, buf); net_buf_slist_put(&seg->queue, buf);
if (type == BLE_MESH_FRIEND_PDU_COMPLETE) { if (type == BLE_MESH_FRIEND_PDU_COMPLETE) {
if (frnd->sec_update) {
enqueue_update(frnd, 1);
}
sys_slist_merge_slist(&frnd->queue, &seg->queue); sys_slist_merge_slist(&frnd->queue, &seg->queue);
frnd->queue_size += seg->seg_count; frnd->queue_size += seg->seg_count;

1
components/bt/esp_ble_mesh/mesh_core/net.h
View File

@ -95,7 +95,6 @@ struct bt_mesh_friend {
uint8_t fsn:1, uint8_t fsn:1,
send_last:1, send_last:1,
pending_req:1, pending_req:1,
sec_update:1,
pending_buf:1, pending_buf:1,
valid:1, valid:1,
established:1; established:1;