blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-04-02 04:40:11 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/ble_mesh_proxy_client_net_resend_v4.2' into 'release/v4.2'

Browse Source 
ble_mesh: stack: Fix proxy client may fail to resend msg (v4.2)

See merge request espressif/esp-idf!12079
This commit is contained in:
Island 2021-01-21 11:07:27 +08:00
commit 7c9be015aa
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/esp_ble_mesh/mesh_core/adv.c
View File

@ -543,7 +543,7 @@ static void ble_mesh_relay_task_post(bt_mesh_msg_t *msg, uint32_t timeout)
BT_INFO("Full queue, remove the oldest relay packet"); BT_INFO("Full queue, remove the oldest relay packet");
/* Remove the oldest relay packet from queue */ /* Remove the oldest relay packet from queue */
if (xQueueReceive(relay_queue.handle, &old_msg, K_NO_WAIT) != pdTRUE) { if (xQueueReceive(relay_queue.handle, &old_msg, K_NO_WAIT) != pdTRUE) {
BT_ERR("Failed to remove item from queue"); BT_ERR("Failed to remove item from relay queue");
bt_mesh_unref_buf(msg); bt_mesh_unref_buf(msg);
return; return;
} }

6
components/bt/esp_ble_mesh/mesh_core/net.c
View File

@ -828,6 +828,12 @@ int bt_mesh_net_resend(struct bt_mesh_subnet *sub, struct net_buf *buf,
return 0; return 0;
} }
if (IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_CLIENT) &&
bt_mesh_proxy_client_relay(&buf->b, dst)) {
send_cb_finalize(cb, cb_data);
return 0;
}
bt_mesh_adv_send(buf, cb, cb_data); bt_mesh_adv_send(buf, cb, cb_data);
return 0; return 0;
} }