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

fix(ble/bluedroid): match read-multiple-var responses by handle

Browse Source 
(cherry picked from commit 979c7dc567)

Co-authored-by: zhanghaipeng <zhanghaipeng@espressif.com>
This commit is contained in:
Zhang Hai Peng
2026-07-14 10:36:02 +08:00
parent bc4889662b
commit 2fe6c39b83
1 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/host/bluedroid/stack/gatt/gatt_sr.c
+10 -28
View File
@@ -376,24 +376,11 @@ static BOOLEAN process_read_multi_var_rsp (tGATT_SR_CMD *p_cmd, tGATT_STATUS sta
*p++ = GATT_RSP_READ_MULTI_VAR; *p++ = GATT_RSP_READ_MULTI_VAR;
p_buf->len = 1; p_buf->len = 1;
/* Now walk through the buffers putting the data into the response in order */ /* Match responses by handle; replies may arrive out of order. */
list_t *list = NULL;
const list_node_t *node = NULL;
if (! fixed_queue_is_empty(p_cmd->multi_rsp_q)) {
list = fixed_queue_get_list(p_cmd->multi_rsp_q);
}
for (ii = 0; ii < p_cmd->multi_req.num_handles; ii++) { for (ii = 0; ii < p_cmd->multi_req.num_handles; ii++) {
tGATTS_RSP *p_rsp = NULL; tGATTS_RSP *p_rsp = gatt_find_multi_rsp_by_handle(
if (list != NULL) { p_cmd, p_cmd->multi_req.handles[ii],
if (ii == 0) { gatt_get_multi_handle_occurrence(p_cmd, ii));
node = list_begin(list);
} else {
node = list_next(node);
}
if (node != list_end(list)) {
p_rsp = (tGATTS_RSP *)list_node(node);
}
}
if (p_rsp != NULL) { if (p_rsp != NULL) {
@@ -405,16 +392,11 @@ static BOOLEAN process_read_multi_var_rsp (tGATT_SR_CMD *p_cmd, tGATT_STATUS sta
} }
len = MIN(p_rsp->attr_value.len, (mtu - total_len)); // attribute value length len = MIN(p_rsp->attr_value.len, (mtu - total_len)); // attribute value length
if (p_rsp->attr_value.handle == p_cmd->multi_req.handles[ii]) { GATT_TRACE_DEBUG("%s handle %x len %u", __func__, p_rsp->attr_value.handle, p_rsp->attr_value.len);
GATT_TRACE_DEBUG("%s handle %x len %u", __func__, p_rsp->attr_value.handle, p_rsp->attr_value.len); UINT16_TO_STREAM(p, p_rsp->attr_value.len);
UINT16_TO_STREAM(p, p_rsp->attr_value.len); memcpy (p, p_rsp->attr_value.value, len);
memcpy (p, p_rsp->attr_value.value, len); p += len;
p += len; p_buf->len += (2+len);
p_buf->len += (2+len);
} else {
p_cmd->status = GATT_NOT_FOUND;
break;
}
} else { } else {
p_cmd->status = GATT_NOT_FOUND; p_cmd->status = GATT_NOT_FOUND;
break; break;
@@ -423,7 +405,7 @@ static BOOLEAN process_read_multi_var_rsp (tGATT_SR_CMD *p_cmd, tGATT_STATUS sta
} /* loop through all handles*/ } /* loop through all handles*/
/* Sanity check on the buffer length */ /* Sanity check on the buffer length */
if (p_buf->len == 0) { if (p_buf->len <= 1) {
GATT_TRACE_ERROR("%s - nothing found!!", __func__); GATT_TRACE_ERROR("%s - nothing found!!", __func__);
p_cmd->status = GATT_NOT_FOUND; p_cmd->status = GATT_NOT_FOUND;
osi_free (p_buf); osi_free (p_buf);