From 556af3525cadbce34392d639557d91b82433b79a Mon Sep 17 00:00:00 2001 From: Santiago Carot-Nemesio Date: Wed, 25 Jan 2012 14:12:40 +0100 Subject: [PATCH] attrib-server: Allocate 128-bits UUIDs using highest available handlers 128-uuids services are grouped at the end of the handlers database list. This group grows from the highest handlers toward lowers handlers until the whole range is used or the last 16 bit-uuid service is reached. --- src/attrib-server.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/attrib-server.c b/src/attrib-server.c index f635c6747..299516723 100644 --- a/src/attrib-server.c +++ b/src/attrib-server.c @@ -1318,7 +1318,47 @@ static uint16_t find_uuid16_avail(struct btd_adapter *adapter, uint16_t nitems) static uint16_t find_uuid128_avail(struct btd_adapter *adapter, uint16_t nitems) { - /* TODO: Allocate 128 uuids at the end of the list */ + uint16_t handle = 0, end = 0xffff; + struct gatt_server *server; + GList *dl; + GSList *l; + + l = g_slist_find_custom(servers, adapter, adapter_cmp); + if (l == NULL) + return 0; + + server = l->data; + if (server->database == NULL) + return 0xffff - nitems + 1; + + for (dl = g_list_last(server->database); dl; dl = dl->prev) { + struct attribute *a = dl->data; + + if (handle == 0) + handle = a->handle; + + if (bt_uuid_cmp(&a->uuid, &prim_uuid) != 0 && + bt_uuid_cmp(&a->uuid, &snd_uuid) != 0) + continue; + + if (end - handle >= nitems) + return end - nitems + 1; + + if (a->len == 2) { + /* 16 bit UUID service definition */ + return 0; + } + + if (a->handle == 0x0001) + return 0; + + end = a->handle - 1; + handle = 0; + } + + if (end - 0x0001 >= nitems) + return end - nitems + 1; + return 0; } -- 2.47.3