korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-14 06:25:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

shared/gatt-client: Fix tracking current service during discovery

Browse Source 
We should mark service as completed before trying to insert another
characteristic - in case inserting characteristic for new service
fails, previous one won't be discarded.
This commit is contained in:
Andrzej Kaczmarek 2018-03-22 16:21:01 +01:00 committed by Luiz Augusto von Dentz
parent a07eb3a5e9
commit 806ba442da
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/shared/gatt-client.c
View File

@ -588,6 +588,19 @@ static bool discover_descs(struct discovery_op *op, bool *discovering)
struct gatt_db_attribute *svc;
uint16_t start, end;
/* Adjust current service */
svc = gatt_db_get_service(client->db, chrc_data->value_handle);
if (op->cur_svc != svc) {
if (op->cur_svc) {
queue_remove(op->pending_svcs, op->cur_svc);
/* Done with the current service */
gatt_db_service_set_active(op->cur_svc, true);
}
op->cur_svc = svc;
}
attr = gatt_db_insert_characteristic(client->db,
chrc_data->value_handle,
&chrc_data->uuid, 0,
@ -605,19 +618,6 @@ static bool discover_descs(struct discovery_op *op, bool *discovering)
chrc_data->value_handle)
goto failed;
/* Adjust current service */
svc = gatt_db_get_service(client->db, chrc_data->value_handle);
if (op->cur_svc != svc) {
if (op->cur_svc) {
queue_remove(op->pending_svcs, op->cur_svc);
/* Done with the current service */
gatt_db_service_set_active(op->cur_svc, true);
}
op->cur_svc = svc;
}
gatt_db_attribute_get_service_handles(svc, &start, &end);
/*