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

Merge branch 'fix/ble_mesh_24_76_v5.0' into 'release/v5.0'

Browse Source 
fix(ble_mesh): fixed BLEMESH24-76_v5.0

See merge request espressif/esp-idf!32229
This commit is contained in:
Jiang Jiang Jian 2024-08-20 10:31:43 +08:00
commit 27eeabbabd
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
/* /*
* SPDX-FileCopyrightText: 2017 Intel Corporation * SPDX-FileCopyrightText: 2017 Intel Corporation
* SPDX-FileContributor: 2018-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileContributor: 2018-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -967,18 +967,36 @@ int bt_mesh_net_send(struct bt_mesh_net_tx *tx, struct net_buf *buf,
} }
/* Deliver to local network interface if necessary */ /* Deliver to local network interface if necessary */
if (IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned() && if (((IS_ENABLED(CONFIG_BLE_MESH_NODE) && bt_mesh_is_provisioned()) ||
(bt_mesh_fixed_group_match(tx->ctx->addr) || (IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) && bt_mesh_is_provisioner_en())) &&
bt_mesh_elem_find(tx->ctx->addr))) { (bt_mesh_fixed_group_match(tx->ctx->addr) || bt_mesh_elem_find(tx->ctx->addr))) {
if (cb && cb->start) { /**
cb->start(0, 0, cb_data); * If the target address isn't a unicast address, then the callback function
* will be called by `adv task` in place of here, to avoid the callback function
* being called twice.
* See BLEMESH24-76 for more details.
*/
if (BLE_MESH_ADDR_IS_UNICAST(tx->ctx->addr)) {
if (cb && cb->start) {
cb->start(0, 0, cb_data);
}
net_buf_slist_put(&bt_mesh.local_queue, net_buf_ref(buf));
if (cb && cb->end) {
cb->end(0, cb_data);
}
k_work_submit(&bt_mesh.local_work);
goto done;
} else {
net_buf_slist_put(&bt_mesh.local_queue, net_buf_ref(buf));
k_work_submit(&bt_mesh.local_work);
} }
net_buf_slist_put(&bt_mesh.local_queue, net_buf_ref(buf)); }
if (cb && cb->end) {
cb->end(0, cb_data); if (tx->ctx->send_ttl != 1U) {
}
k_work_submit(&bt_mesh.local_work);
} else if (tx->ctx->send_ttl != 1U) {
/* Deliver to the advertising network interface. Mesh spec /* Deliver to the advertising network interface. Mesh spec
* 3.4.5.2: "The output filter of the interface connected to * 3.4.5.2: "The output filter of the interface connected to
* advertising or GATT bearers shall drop all messages with * advertising or GATT bearers shall drop all messages with