Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/ble_mesh_added_gatt_err_rsp_v5.3' into 'release/v5.3'

Browse Source 
fix(ble_mesh): align GATTS read/write response handling with ATT (5.3)

See merge request espressif/esp-idf!51460
This commit is contained in:
Jiang Jiang Jian
2026-08-05 12:31:23 +08:00
parent bffa546626 2d378a5563
commit 37d29951af
1 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c
+55 -5
View File
@@ -1172,17 +1172,43 @@ static void bt_mesh_bta_gatts_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
BT_DBG("gatts read, handle %d", p_data->req_data.p_data->read_req.handle); BT_DBG("gatts read, handle %d", p_data->req_data.p_data->read_req.handle);
if (attr != NULL && attr->read != NULL && index < ARRAY_SIZE(bt_mesh_gatts_conn)) { if (attr != NULL && attr->read != NULL && index < ARRAY_SIZE(bt_mesh_gatts_conn)) {
if ((len = attr->read(&bt_mesh_gatts_conn[index], attr, buf, 100, len = attr->read(&bt_mesh_gatts_conn[index], attr, buf, 100,
p_data->req_data.p_data->read_req.offset)) > 0) { p_data->req_data.p_data->read_req.offset);
if (len >= 0) {
rsp.attr_value.handle = p_data->req_data.p_data->read_req.handle; rsp.attr_value.handle = p_data->req_data.p_data->read_req.handle;
if (len > sizeof(buf)) {
/* A read callback must not return more than the buf_len it was
* given; clamp to the source buffer size (also below the
* rsp.attr_value.value capacity) to avoid an out-of-bounds copy. */
BT_WARN("Mesh gatts read len %d exceeds buffer", (int)len);
len = sizeof(buf);
}
rsp.attr_value.len = len; rsp.attr_value.len = len;
memcpy(&rsp.attr_value.value[0], buf, len); memcpy(&rsp.attr_value.value[0], buf, len);
BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id, BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id,
p_data->req_data.status, &rsp); p_data->req_data.status, &rsp);
BT_DBG("Send gatts read rsp, handle %d", attr->handle); BT_DBG("Send gatts read rsp, handle %d", attr->handle);
} else { } else {
BT_WARN("Mesh gatts read failed"); /* Attribute read callback returned an ATT error code (negative).
* Reply with an ATT Error Response so the client does not time out. */
BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id,
(tBTA_GATT_STATUS)(-len), NULL);
BT_WARN("Mesh gatts read failed, err %d", (int)len);
} }
} else {
/* No matching attribute, or read not supported: respond with an ATT
* Error Response so the client does not time out. */
tBTA_GATT_STATUS err;
if (attr == NULL) {
err = BLE_MESH_ATT_ERR_INVALID_HANDLE;
} else if (attr->read == NULL) {
err = BLE_MESH_ATT_ERR_READ_NOT_PERMITTED;
} else {
err = BLE_MESH_ATT_ERR_UNLIKELY; /* index out of range */
}
BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id, err, NULL);
BT_WARN("Mesh gatts read rejected, handle %d, err 0x%02x",
p_data->req_data.p_data->read_req.handle, (unsigned)err);
} }
break; break;
} }
@@ -1196,16 +1222,40 @@ static void bt_mesh_bta_gatts_cb(tBTA_GATTS_EVT event, tBTA_GATTS *p_data)
bt_hex(p_data->req_data.p_data->write_req.value, p_data->req_data.p_data->write_req.len)); bt_hex(p_data->req_data.p_data->write_req.value, p_data->req_data.p_data->write_req.len));
if (attr != NULL && attr->write != NULL && index < ARRAY_SIZE(bt_mesh_gatts_conn)) { if (attr != NULL && attr->write != NULL && index < ARRAY_SIZE(bt_mesh_gatts_conn)) {
if ((len = attr->write(&bt_mesh_gatts_conn[index], attr, len = attr->write(&bt_mesh_gatts_conn[index], attr,
p_data->req_data.p_data->write_req.value, p_data->req_data.p_data->write_req.value,
p_data->req_data.p_data->write_req.len, p_data->req_data.p_data->write_req.len,
p_data->req_data.p_data->write_req.offset, 0)) > 0) { p_data->req_data.p_data->write_req.offset, 0);
if (p_data->req_data.p_data->write_req.need_rsp) { if (p_data->req_data.p_data->write_req.need_rsp) {
if (len == p_data->req_data.p_data->write_req.len) {
BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id, BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id,
p_data->req_data.status, NULL); p_data->req_data.status, NULL);
BT_DBG("Send gatts write rsp, handle %d", attr->handle); BT_DBG("Send gatts write rsp, handle %d", attr->handle);
} else {
/* Write callback returned an ATT error code (negative), a partial
* write, or 0. Match upstream Zephyr, which requires write == len
* and otherwise replies with an ATT Error Response. */
tBTA_GATT_STATUS err = (len < 0) ? (tBTA_GATT_STATUS)(-len)
: BLE_MESH_ATT_ERR_UNLIKELY;
BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id,
err, NULL);
BT_WARN("Mesh gatts write failed, len %d", (int)len);
} }
} }
} else if (p_data->req_data.p_data->write_req.need_rsp) {
/* No matching attribute, or write not supported: respond with an ATT
* Error Response for Write Requests (Write Commands get no response). */
tBTA_GATT_STATUS err;
if (attr == NULL) {
err = BLE_MESH_ATT_ERR_INVALID_HANDLE;
} else if (attr->write == NULL) {
err = BLE_MESH_ATT_ERR_WRITE_NOT_PERMITTED;
} else {
err = BLE_MESH_ATT_ERR_UNLIKELY; /* index out of range */
}
BTA_GATTS_SendRsp(p_data->req_data.conn_id, p_data->req_data.trans_id, err, NULL);
BT_WARN("Mesh gatts write rejected, handle %d, err 0x%02x",
p_data->req_data.p_data->write_req.handle, (unsigned)err);
} }
break; break;
} }