michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: GATT: Skip certain attributes when discovering descriptors

Browse source 
When discovering descriptor Find Information procedure is used which
does not allow any filtering by the server so it will return all
attributes in the given range including services and characteristics.

Fixes #14265

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2019-03-11 23:07:10 +02:00 • committed by Johan Hedberg
commit 76deb657d7
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
subsys/bluetooth/host/gatt.c
View file

@ -2252,6 +2252,14 @@ static void gatt_find_info_rsp(struct bt_conn *conn, u8_t err,
continue;
}
/* Skip attributes that are not considered descriptors */
if (!bt_uuid_cmp(&u.uuid, BT_UUID_GATT_PRIMARY) ||
!bt_uuid_cmp(&u.uuid, BT_UUID_GATT_SECONDARY) ||
!bt_uuid_cmp(&u.uuid, BT_UUID_GATT_INCLUDE) ||
!bt_uuid_cmp(&u.uuid, BT_UUID_GATT_CHRC)) {
continue;
}
attr = (&(struct bt_gatt_attr)
BT_GATT_DESCRIPTOR(&u.uuid, 0, NULL, NULL, NULL));
attr->handle = handle;
@ -2320,6 +2328,13 @@ int bt_gatt_discover(struct bt_conn *conn,
case BT_GATT_DISCOVER_CHARACTERISTIC:
return gatt_read_type(conn, params);
case BT_GATT_DISCOVER_DESCRIPTOR:
/* Only descriptors can be filtered */
if (!bt_uuid_cmp(params->uuid, BT_UUID_GATT_PRIMARY) ||
!bt_uuid_cmp(params->uuid, BT_UUID_GATT_SECONDARY) ||
!bt_uuid_cmp(params->uuid, BT_UUID_GATT_INCLUDE) ||
!bt_uuid_cmp(params->uuid, BT_UUID_GATT_CHRC)) {
return -EINVAL;
}
return gatt_find_info(conn, params);
default:
BT_ERR("Invalid discovery type: %u", params->type);