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

Merge branch 'feat/ble_mesh_micellaneous_fix_v5.1' into 'release/v5.1'

Browse Source 
Feat/ble mesh micellaneous fix (v5.1)

See merge request espressif/esp-idf!39634
This commit is contained in:
Island
2025-06-18 10:16:54 +08:00
parent 7bc593a5ea c71bba7f9c
commit 0810436ff2
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/esp_ble_mesh/mesh_core/bluedroid_host/mesh_bearer_adapt.c
View File

@@ -1576,8 +1576,10 @@ static void bt_mesh_bta_gattc_cb(tBTA_GATTC_EVT event, tBTA_GATTC *p_data)
for (i = 0; i < ARRAY_SIZE(bt_mesh_gattc_info); i++) { for (i = 0; i < ARRAY_SIZE(bt_mesh_gattc_info); i++) {
if (bt_mesh_gattc_info[i].conn.handle == handle) { if (bt_mesh_gattc_info[i].conn.handle == handle) {
if (bt_mesh_gattc_info[i].wr_desc_done == false) { if (bt_mesh_gattc_info[i].wr_desc_done == false) {
BT_DBG("Receive notification before finishing to write ccc"); BT_WARN("Receive notification before finishing to write ccc");
#if !CONFIG_BLE_MESH_BQB_TEST
return; return;
#endif
} }
conn = &bt_mesh_gattc_info[i].conn; conn = &bt_mesh_gattc_info[i].conn;

20
components/bt/esp_ble_mesh/mesh_core/proxy_client.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2017-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -37,6 +37,7 @@
static struct bt_mesh_proxy_server { static struct bt_mesh_proxy_server {
struct bt_mesh_conn *conn; struct bt_mesh_conn *conn;
bt_mesh_addr_t addr;
enum __packed { enum __packed {
NONE, NONE,
PROV, PROV,
@@ -411,6 +412,7 @@ static void proxy_connected(bt_mesh_addr_t *addr, struct bt_mesh_conn *conn, int
server->conn = bt_mesh_conn_ref(conn); server->conn = bt_mesh_conn_ref(conn);
server->conn_type = NONE; server->conn_type = NONE;
memcpy(&server->addr, addr, sizeof(bt_mesh_addr_t));
net_buf_simple_reset(&server->buf); net_buf_simple_reset(&server->buf);
bt_mesh_gattc_exchange_mtu(id); bt_mesh_gattc_exchange_mtu(id);
@@ -544,6 +546,12 @@ static ssize_t proxy_write_ccc(bt_mesh_addr_t *addr, struct bt_mesh_conn *conn)
return 0; return 0;
} }
#if CONFIG_BLE_MESH_BQB_TEST
/* notify maybe received first */
if (server->conn_type == PROXY) {
return 0;
}
#endif
return -EINVAL; return -EINVAL;
} }
@@ -556,6 +564,16 @@ static ssize_t proxy_recv_ntf(struct bt_mesh_conn *conn, uint8_t *data, uint16_t
return -ENOTCONN; return -ENOTCONN;
} }
#if CONFIG_BLE_MESH_BQB_TEST
/* update conn type if notify received before write ccc */
if (server->conn_type == NONE) {
server->conn_type = PROXY;
if (proxy_client_connect_cb) {
proxy_client_connect_cb(&server->addr, server - servers, server->net_idx);
}
}
#endif
if (server->conn_type == PROXY) { if (server->conn_type == PROXY) {
return proxy_recv(conn, NULL, data, len, 0, 0); return proxy_recv(conn, NULL, data, len, 0, 0);
} }

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

@@ -1059,7 +1059,7 @@ static int proxy_segment_and_send(struct bt_mesh_conn *conn, uint8_t type,
net_buf_simple_pull(msg, mtu); net_buf_simple_pull(msg, mtu);
while (msg->len) { while (msg->len) {
if (msg->len + 1 < mtu) { if (msg->len + 1 <= mtu) {
net_buf_simple_push_u8(msg, PDU_HDR(SAR_LAST, type)); net_buf_simple_push_u8(msg, PDU_HDR(SAR_LAST, type));
proxy_send(conn, msg->data, msg->len); proxy_send(conn, msg->data, msg->len);
break; break;