gatt-database: Add OCF service handling logic

1. invalid handle issue
For bluez, the handle increases whenever service is added.
Invalid handle error occurs because mobile caches the handle for paired remote
device. Modify to use reserved handle for ocf uuid.

2. service persistence issue
Mobile is caching without service if gatt connection is lost while service is
removed.
Modify service changed notification not to be delivered for ocf service.

Change-Id: Ie77a21a7828251dbfd42a9b8749188c4696a819b
Signed-off-by: Wootak Jung <wootak.jung@samsung.com>

diff --git a/lib/uuid.h b/lib/uuid.h
index 634314b281107c3528cb12f9e1d998da544f0f6d..c2130a06fc24c91c06834b0b8f7190ad16c23255 100755 (executable)
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -106,6 +106,7 @@ extern "C" {
 /* Samsung Accessary Protocol UUIDs */
 #define WEARABLE_OLD_SAP_UUID  "a49eb41e-cb06-495c-9f4f-aa80a90cdf4a"
 #define WEARABLE_NEW_SAP_UUID  "a49eb41e-cb06-495c-9f4f-bb80a90cdf00"
+#define OCF_UUID               "ADE3D529-C784-4F63-A987-EB69F70EE816"
 #endif
 
 /* GATT UUIDs section */

diff --git a/src/gatt-database.c b/src/gatt-database.c
index 6982d2da48c29387921b3d1aa91d2cf65c5d4591..9e441ee8ab0dcbdcd5a869bf099034f82af42edf 100644 (file)
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -1926,6 +1926,18 @@ static void send_service_changed(struct btd_gatt_database *database,
                return;
        }
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       bt_uuid_t svc_uuid;
+       if (gatt_db_attribute_get_service_uuid(attrib, &svc_uuid)) {
+               bt_uuid_t ocf_uuid;
+               bt_string_to_uuid(&ocf_uuid, OCF_UUID);
+               if (!bt_uuid_cmp(&svc_uuid, &ocf_uuid)) {
+                       DBG("Do not send notification for ocf service");
+                       return;
+               }
+       }
+#endif
+
        put_le16(start, value);
        put_le16(end, value + 2);
 
@@ -4031,6 +4043,14 @@ static bool database_add_service(struct external_service *service)
                return false;
        }
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       bt_uuid_to_string(&uuid, str, sizeof(str));
+       if (!strcasecmp(str, OCF_UUID)) {
+               DBG("Use 1st handle for ocf service");
+               handle = 1;
+       }
+#endif
+
        service->attrib = gatt_db_insert_service(service->app->database->db,
                                                handle, &uuid,
                                                primary, service->attr_cnt);

diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
index 78de38f8994f45857d0143ee4c109e8caabd8641..75a3ff2a671e3f33108fcac835ec6cc66aa9a3f9 100644 (file)
--- a/src/shared/gatt-db.c
+++ b/src/shared/gatt-db.c
@@ -259,7 +259,11 @@ struct gatt_db *gatt_db_new(void)
        db->crypto = bt_crypto_new();
        db->services = queue_new();
        db->notify_list = queue_new();
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+       db->next_handle = 0x0010;
+#else
        db->next_handle = 0x0001;
+#endif
 
        return gatt_db_ref(db);
 }