From 1ba40c63761c77903f391ff697c5736e957817f1 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Fri, 5 Mar 2021 14:23:44 -0800 Subject: [PATCH] gatt: Fix registering DIS without a valid source If source has not been set don't register DIS as it would not contain any useful information and by doing this it actually allows systems to register their own DIS instance. Signed-off-by: Anuj Jain Signed-off-by: Ayush Garg --- src/gatt-database.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/gatt-database.c b/src/gatt-database.c index c38ab85..9327f9a 100644 --- a/src/gatt-database.c +++ b/src/gatt-database.c @@ -1462,22 +1462,22 @@ static void device_info_read_pnp_id_cb(struct gatt_db_attribute *attrib, static void populate_devinfo_service(struct btd_gatt_database *database) { struct gatt_db_attribute *service; + struct gatt_db_attribute *attrib; bt_uuid_t uuid; + if (!btd_opts.did_source) + return; + bt_uuid16_create(&uuid, UUID_DIS); service = gatt_db_add_service(database->db, &uuid, true, 3); - if (btd_opts.did_source > 0) { - struct gatt_db_attribute *attrib; - - bt_uuid16_create(&uuid, GATT_CHARAC_PNP_ID); - attrib = gatt_db_service_add_characteristic(service, &uuid, + bt_uuid16_create(&uuid, GATT_CHARAC_PNP_ID); + attrib = gatt_db_service_add_characteristic(service, &uuid, BT_ATT_PERM_READ, BT_GATT_CHRC_PROP_READ, device_info_read_pnp_id_cb, NULL, database); - gatt_db_attribute_set_fixed_length(attrib, 7); - } + gatt_db_attribute_set_fixed_length(attrib, 7); gatt_db_service_set_active(service, true); @@ -1488,8 +1488,7 @@ static void register_core_services(struct btd_gatt_database *database) populate_gap_service(database); populate_gatt_service(database); - if (btd_opts.did_source > 0) - populate_devinfo_service(database); + populate_devinfo_service(database); } -- 2.7.4