michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Make use of bt_uuid_cmp to compare UUIDs

Browse source 
This replace the old code that could only compare 16 bits UUID with
bt_uuid_cmp which can expand to 128 bits if types don't match.

Change-Id: I84219d451d8c95baf6f7e42b92629cb106428ccf
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2015-05-19 17:47:48 +03:00 • committed by Anas Nashif
commit 2506aa93b3
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
net/bluetooth/att.c
View file

@ -62,6 +62,16 @@ struct bt_att {
static struct bt_att bt_att_pool[CONFIG_BLUETOOTH_MAX_CONN];
static const struct bt_uuid primary_uuid = {
.type = BT_UUID_16,
.u16 = BT_UUID_GATT_PRIMARY,
};
static const struct bt_uuid secondary_uuid = {
.type = BT_UUID_16,
.u16 = BT_UUID_GATT_SECONDARY,
};
static void send_err_rsp(struct bt_conn *conn, uint8_t req, uint16_t handle,
uint8_t err)
{
@ -396,14 +406,12 @@ static void att_read_group_req(struct bt_conn *conn, struct bt_buf *data)
* Request. The «Characteristic» grouping type shall not be used in
* the ATT Read By Group Type Request.
*/
if (uuid.type == BT_UUID_16) {
if (uuid.u16 != 0x2800 && uuid.u16 != 0x2801) {
send_err_rsp(conn, BT_ATT_OP_READ_GROUP_REQ,
start_handle,
if (bt_uuid_cmp(&uuid, &primary_uuid) &&
bt_uuid_cmp(&uuid, &secondary_uuid)) {
send_err_rsp(conn, BT_ATT_OP_READ_GROUP_REQ, start_handle,
BT_ATT_ERR_UNSUPPORTED_GROUP_TYPE);
return;
}
} /* TODO: Add UUID helpers for UUID formats */
return;
}
/* TODO: Generate proper response once a database is defined */