Apply Tizen3.0 Gatt client product patch
[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-gatt-client.c
index 1d80967..9819f1e 100644 (file)
@@ -1,10 +1,5 @@
 /*
- * Bluetooth-frwk low energy (GATT Client)
- *
- * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Hocheol Seo <hocheol.seo@samsung.com>
- *                 Chanyeol Park <chanyeol.park@samsung.com>
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
 #include <stdint.h>
 
 #include "bt-common.h"
+#include "bt-event-handler.h"
+#include "bt-gatt-client.h"
+#include "bt-internal-types.h"
+#include "bt-request-sender.h"
 
-#define GATT_SERV_INTERFACE            "org.bluez.GattService1"
-#define GATT_CHAR_INTERFACE            "org.bluez.GattCharacteristic1"
-#define GATT_DESC_INTERFACE            "org.bluez.GattDescriptor1"
-
-#define GATT_USER_DESC_UUID             "00002901-0000-1000-8000-00805f9b34fb"
-#define GATT_CHAR_CLIENT_CONF          "00002902-0000-1000-8000-00805f9b34fb"
-#define GATT_CHAR_SERVER_CONF           "00002903-0000-1000-8000-00805f9b34fb"
-#define GATT_CHAR_FORMAT               "00002904-0000-1000-8000-00805f9b34fb"
+#define GATT_DEFAULT_TIMEOUT  (6 * 1000) // Dependent on supervision timeout 6 sec
 
 typedef enum {
        TYPE_NONE,
@@ -44,12 +36,12 @@ typedef enum {
        CLIENT_CONF,
        SERVER_CONF,
        CHAR_FORMAT
-}char_descriptor_type_t;
+} char_descriptor_type_t;
+
+static GSList *service_monitor_list = NULL;
 
 BT_EXPORT_API int bluetooth_gatt_free_service_property(bt_gatt_service_property_t *svc_pty)
 {
-       BT_DBG("+");
-
        BT_CHECK_PARAMETER(svc_pty, return);
 
        g_free(svc_pty->uuid);
@@ -59,14 +51,11 @@ BT_EXPORT_API int bluetooth_gatt_free_service_property(bt_gatt_service_property_
 
        memset(svc_pty, 0, sizeof(bt_gatt_service_property_t));
 
-       BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
 BT_EXPORT_API int bluetooth_gatt_free_char_property(bt_gatt_char_property_t *char_pty)
 {
-       BT_DBG("+");
-
        BT_CHECK_PARAMETER(char_pty, return);
 
        g_free(char_pty->uuid);
@@ -78,14 +67,11 @@ BT_EXPORT_API int bluetooth_gatt_free_char_property(bt_gatt_char_property_t *cha
 
        memset(char_pty, 0, sizeof(bt_gatt_char_property_t));
 
-       BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
 BT_EXPORT_API int bluetooth_gatt_free_desc_property(bt_gatt_char_descriptor_property_t *desc_pty)
 {
-       BT_DBG("+");
-
        BT_CHECK_PARAMETER(desc_pty, return);
 
        g_free(desc_pty->uuid);
@@ -94,7 +80,6 @@ BT_EXPORT_API int bluetooth_gatt_free_desc_property(bt_gatt_char_descriptor_prop
 
        memset(desc_pty, 0, sizeof(bt_gatt_char_descriptor_property_t));
 
-       BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
@@ -109,19 +94,95 @@ static char **__get_string_array_from_gptr_array(GPtrArray *gp)
 
        path = g_malloc0((gp->len + 1) * sizeof(char *));
 
-       /* Fix : NULL_RETURNS */
-       if (path == NULL)
-               return NULL;
-
        for (i = 0; i < gp->len; i++) {
                gp_path = g_ptr_array_index(gp, i);
                path[i] = g_strdup(gp_path);
-               BT_DBG("path[%d] : [%s]", i, path[i]);
+       //      BT_DBG("path[%d] : [%s]", i, path[i]);
        }
 
        return path;
 }
 
+gboolean _bluetooth_gatt_check_service_change_watcher_address(
+               const bluetooth_device_address_t *device_addr)
+{
+       GSList *l;
+       char device_address[BT_ADDRESS_STRING_SIZE] = { 0 };
+       char secure_address[BT_ADDRESS_STRING_SIZE] = { 0 };
+
+       _bt_convert_addr_type_to_string(device_address,
+                       (unsigned char *)device_addr->addr);
+
+       for (l = service_monitor_list; l != NULL; l = l->next) {
+               char device_address2[BT_ADDRESS_STRING_SIZE] = { 0 };
+               char secure_address2[BT_ADDRESS_STRING_SIZE] = { 0 };
+               bluetooth_device_address_t *addr = l->data;
+
+               _bt_convert_addr_type_to_string(device_address2,
+                               (unsigned char *)addr->addr);
+               _bt_convert_addr_string_to_secure_string(secure_address,
+                               device_address);
+               _bt_convert_addr_string_to_secure_string(secure_address2,
+                               device_address2);
+               BT_INFO("service_monitor_list [%s] - Input [%s]",
+                               secure_address2, secure_address);
+
+               if (!memcmp(device_addr, addr,
+                               sizeof(bluetooth_device_address_t)))
+                       return TRUE;
+       }
+
+       return FALSE;
+}
+
+BT_EXPORT_API int bluetooth_gatt_set_service_change_watcher(
+               const bluetooth_device_address_t *address, gboolean enable)
+{
+       GSList *l;
+       bluetooth_device_address_t *addr = NULL;
+       char device_address[BT_ADDRESS_STRING_SIZE] = { 0 };
+       char secure_address[BT_ADDRESS_STRING_SIZE] = { 0 };
+
+       _bt_convert_addr_type_to_string(device_address,
+                       (unsigned char *)address->addr);
+       _bt_convert_addr_string_to_secure_string(secure_address,
+                       device_address);
+       BT_INFO("Set watcher for %s with %d", secure_address, enable);
+
+       if (enable == TRUE) {
+               if (service_monitor_list == NULL)
+                       _bt_register_manager_subscribe_signal(TRUE);
+
+               if (_bluetooth_gatt_check_service_change_watcher_address(address)
+                               == TRUE) {
+                       BT_INFO("The watcher is already set");
+                       return BLUETOOTH_ERROR_NONE;
+               }
+               addr = g_malloc0(sizeof(bluetooth_device_address_t));
+               memcpy(addr, address, sizeof(bluetooth_device_address_t));
+
+               service_monitor_list =
+                       g_slist_append(service_monitor_list, addr);
+       } else {
+
+               for (l = service_monitor_list; l != NULL; l = l->next) {
+                       addr = l->data;
+                       if (!memcmp(address, addr,
+                                       sizeof(bluetooth_device_address_t))) {
+                               service_monitor_list =
+                                       g_slist_remove(service_monitor_list, addr);
+                               g_free(addr);
+                               break;
+                       }
+               }
+
+               if (service_monitor_list == NULL)
+                       _bt_register_manager_subscribe_signal(FALSE);
+       }
+
+       return BLUETOOTH_ERROR_NONE;
+}
+
 BT_EXPORT_API int bluetooth_gatt_get_service_property(const char *service_handle,
                                                bt_gatt_service_property_t *service)
 {
@@ -132,7 +193,7 @@ BT_EXPORT_API int bluetooth_gatt_get_service_property(const char *service_handle
        gsize len;
        char *char_handle = NULL;
        GPtrArray *gp_array  = NULL ;
-       GVariantIter *property_iter, *char_iter;
+       GVariantIter *property_iter, *char_iter = NULL;
        const gchar *key;
        GVariant *value;
 
@@ -175,36 +236,42 @@ BT_EXPORT_API int bluetooth_gatt_get_service_property(const char *service_handle
        memset(service, 0, sizeof(bt_gatt_service_property_t));
 
        while (g_variant_iter_loop(property_iter, "{sv}", &key, &value)) {
-               if (!g_strcmp0(key,"UUID")) {
-                       service->uuid = g_variant_dup_string(value,&len);
-
-               } else if(!g_strcmp0(key, "Primary")) {
+               if (!g_strcmp0(key, "UUID")) {
+                       char *name = NULL;
+                       service->uuid = g_variant_dup_string(value, &len);
+                       _bt_get_uuid_specification_name(service->uuid, &name);
+                       BT_INFO("======> Service : %s [%s]", service->uuid, name);
+                       g_free(name);
+               } else if (!g_strcmp0(key, "Primary")) {
                        service->primary = g_variant_get_boolean(value);
 
                } else if (!g_strcmp0(key, "Includes")) {
                        g_variant_get(value, "ao", &char_iter);
                        gp_array = g_ptr_array_new();
-                       while (g_variant_iter_loop(char_iter, "&o", &char_handle)) {
+                       while (g_variant_iter_loop(char_iter, "&o", &char_handle))
                                g_ptr_array_add(gp_array, (gpointer)char_handle);
-                       }
+
                        if (gp_array->len != 0) {
                                service->include_handles.count = gp_array->len;
                                service->include_handles.handle =
                                                __get_string_array_from_gptr_array(gp_array);
                        }
                        g_ptr_array_free(gp_array, TRUE);
+                       g_variant_iter_free(char_iter);
                } else if (!g_strcmp0(key, "Characteristics")) {
                        g_variant_get(value, "ao", &char_iter);
                        gp_array = g_ptr_array_new();
-                       while (g_variant_iter_loop(char_iter, "&o", &char_handle)) {
+                       while (g_variant_iter_loop(char_iter, "&o", &char_handle))
                                g_ptr_array_add(gp_array, (gpointer)char_handle);
-                       }
+
                        if (gp_array->len != 0) {
                                service->char_handle.count = gp_array->len;
                                service->char_handle.handle =
                                                __get_string_array_from_gptr_array(gp_array);
                        }
+                       BT_DBG("Characteristics count : %d", service->char_handle.count);
                        g_ptr_array_free(gp_array, TRUE);
+                       g_variant_iter_free(char_iter);
                }
        }
 
@@ -367,7 +434,6 @@ static void __bluetooth_internal_get_char_cb(GDBusProxy *proxy,
        GVariantIter *char_iter;
        GPtrArray *gp_array = NULL;
        bt_gatt_discovered_char_t svc_char = { 0, };
-       int i;
        char *char_handle;
        GError *error = NULL;
        bt_user_info_t *user_info;
@@ -400,20 +466,16 @@ static void __bluetooth_internal_get_char_cb(GDBusProxy *proxy,
        g_variant_get(value, "(v)", &char_value);
        g_variant_get(char_value, "ao", &char_iter);
 
-       int len = g_variant_get_size((GVariant *)char_iter);
-       if (len > 0) {
-               gp_array = g_ptr_array_new();
-               for (i = 0; i < len; i++) {
-                       g_variant_iter_loop(char_iter, "&o",  &char_handle);
-                       g_ptr_array_add(gp_array, (gpointer)char_handle);
-               }
-               if (gp_array->len != 0) {
-                       svc_char.handle_info.count = gp_array->len;
-                       svc_char.handle_info.handle =
-                               __get_string_array_from_gptr_array(gp_array);
-               }
-               g_ptr_array_free(gp_array, TRUE);
+       gp_array = g_ptr_array_new();
+       while (g_variant_iter_loop(char_iter, "&o",  &char_handle))
+               g_ptr_array_add(gp_array, (gpointer)char_handle);
+
+       if (gp_array->len != 0) {
+               svc_char.handle_info.count = gp_array->len;
+               svc_char.handle_info.handle =
+                       __get_string_array_from_gptr_array(gp_array);
        }
+       g_ptr_array_free(gp_array, TRUE);
 
        if (user_info) {
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_SVC_CHAR_DISCOVERED,
@@ -424,6 +486,7 @@ static void __bluetooth_internal_get_char_cb(GDBusProxy *proxy,
        g_strfreev(svc_char.handle_info.handle);
        g_free(svc_char.service_handle);
        g_variant_iter_free(char_iter);
+       g_variant_unref(value);
        g_object_unref(proxy);
 }
 
@@ -474,27 +537,34 @@ static int __get_permission_flag(char *permission)
 
        retv_if(permission == NULL, ret);
 
-       BT_DBG("permission = %s",permission);
+       BT_INFO("permission = %s", permission);
 
-       if (!g_strcmp0(permission,"broadcast")) {
+       if (!g_strcmp0(permission, "broadcast"))
                ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_BROADCAST;
-       } else if (!g_strcmp0(permission,"read")) {
+       else if (!g_strcmp0(permission, "read"))
                ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ;
-       } else if (!g_strcmp0(permission,"write-without-response")) {
+       else if (!g_strcmp0(permission, "write-without-response"))
                ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE_NO_RESPONSE;
-       } else if (!g_strcmp0(permission,"write")) {
+       else if (!g_strcmp0(permission, "write"))
                ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE;
-       } else if (!g_strcmp0(permission,"notify")) {
+       else if (!g_strcmp0(permission, "notify"))
                ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_NOTIFY;
-       } else if (!g_strcmp0(permission,"indicate")) {
+       else if (!g_strcmp0(permission, "indicate"))
                ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_INDICATE;
-       } else if (!g_strcmp0(permission,"authenticated-signed-writes")) {
+       else if (!g_strcmp0(permission, "authenticated-signed-writes"))
                ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_SIGNED_WRITE;
-       } else if (!g_strcmp0(permission,"reliable-write")) {
-               ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_EXTENDED_PROPS;
-       } else if (!g_strcmp0(permission,"writable-auxiliaries")) {
-               ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_EXTENDED_PROPS;
-       }
+       else if (!g_strcmp0(permission, "reliable-write"))
+               ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_RELIABLE_WRITE;
+       else if (!g_strcmp0(permission, "writable-auxiliaries"))
+               ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITABLE_AUXILIARIES;
+       else if (!g_strcmp0(permission, "encrypt-read"))
+               ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_READ;
+       else if (!g_strcmp0(permission, "encrypt-write"))
+               ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_WRITE;
+       else if (!g_strcmp0(permission, "encrypt-authenticated-read"))
+               ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_READ;
+       else if (!g_strcmp0(permission, "encrypt-authenticated-write"))
+               ret = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_WRITE;
 
        return ret;
 }
@@ -519,7 +589,6 @@ BT_EXPORT_API int bluetooth_gatt_get_characteristics_property(
        GVariantIter *char_perm_iter;
        GVariantIter *char_desc_iter;
 
-       BT_DBG("+");
        BT_CHECK_PARAMETER(char_handle, return);
        BT_CHECK_PARAMETER(characteristic, return);
 
@@ -561,17 +630,21 @@ BT_EXPORT_API int bluetooth_gatt_get_characteristics_property(
        characteristic->handle = g_strdup(char_handle);
 
        while (g_variant_iter_loop(property_iter, "{sv}", &key, &value)) {
-               BT_DBG("property");
-               if (!g_strcmp0(key,"UUID")) {
-                       characteristic->uuid = g_variant_dup_string(value,&len);
-                       BT_DBG("UUID of the char = %s",characteristic->uuid);
-               } else if(!g_strcmp0(key, "Value")) {
+               if (!g_strcmp0(key, "UUID")) {
+                       char *name = NULL;
+                       characteristic->uuid = g_variant_dup_string(value, &len);
+                       _bt_get_uuid_specification_name(characteristic->uuid, &name);
+                       BT_INFO("Characteristic : %s [%s]", characteristic->uuid, name);
+                       g_free(name);
+               } else if (!g_strcmp0(key, "Value")) {
                        gb_array = g_byte_array_new();
                        g_variant_get(value, "ay", &char_value_iter);
-                       while(g_variant_iter_loop(char_value_iter, "y",  &char_value)) {
-                               BT_DBG("value of char = %d",char_value);
+                       while (g_variant_iter_loop(char_value_iter, "y",  &char_value)) {
+                       //      BT_DBG("value of char = %d",char_value);
                                g_byte_array_append(gb_array, &char_value, 1);
                        }
+                       g_variant_iter_free(char_value_iter);
+
                        if (gb_array->len != 0) {
                                characteristic->val = g_malloc0(gb_array->len *
                                                                sizeof(unsigned char));
@@ -579,21 +652,21 @@ BT_EXPORT_API int bluetooth_gatt_get_characteristics_property(
                        }
                        characteristic->val_len = gb_array->len;
                        g_byte_array_free(gb_array, TRUE);
-               } else if(!g_strcmp0(key, "Flags")) {
+               } else if (!g_strcmp0(key, "Flags")) {
                        g_variant_get(value, "as", &char_perm_iter);
                        characteristic->permission = 0x00;
-                       while (g_variant_iter_loop(char_perm_iter, "s", &permission)) {
-                               BT_DBG("permission = %s",permission);
+
+                       while (g_variant_iter_loop(char_perm_iter, "s", &permission))
                                characteristic->permission |= __get_permission_flag(permission);
-                               BT_DBG("permission check = %d",characteristic->permission);
-                       }
+
                        g_variant_iter_free(char_perm_iter);
                } else if (!g_strcmp0(key, "Descriptors")) {
                        g_variant_get(value, "ao", &char_desc_iter);
                        gp_array = g_ptr_array_new();
-                       while (g_variant_iter_loop(char_desc_iter, "&o", &char_desc_handle)) {
+                       while (g_variant_iter_loop(char_desc_iter, "&o", &char_desc_handle))
                                g_ptr_array_add(gp_array, (gpointer)char_desc_handle);
-                       }
+
+                       g_variant_iter_free(char_desc_iter);
                        if (gp_array->len != 0) {
                                characteristic->char_desc_handle.count = gp_array->len;
                                characteristic->char_desc_handle.handle =
@@ -607,7 +680,6 @@ BT_EXPORT_API int bluetooth_gatt_get_characteristics_property(
        g_variant_unref(result);
        g_object_unref(properties_proxy);
 
-       BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
@@ -616,7 +688,6 @@ void bluetooth_gatt_get_char_from_uuid_cb(GDBusProxy *proxy,
 {
        GVariant *value;
        GVariantIter *char_iter;
-       int i, len;
        char *char_handle;
        GError *error = NULL;
        bt_user_info_t *user_info;
@@ -647,10 +718,7 @@ void bluetooth_gatt_get_char_from_uuid_cb(GDBusProxy *proxy,
 
        g_variant_get(value, "(ao)", &char_iter);
 
-       len = g_variant_get_size((GVariant *)char_iter);
-
-       for (i = 0; i < len; i++) {
-               g_variant_iter_loop(char_iter, "o",  &char_handle);
+       while (g_variant_iter_loop(char_iter, "&o",  &char_handle)) {
                if (!char_handle)
                        continue;
                ret = bluetooth_gatt_get_characteristics_property(char_handle,
@@ -674,6 +742,7 @@ void bluetooth_gatt_get_char_from_uuid_cb(GDBusProxy *proxy,
 
        bluetooth_gatt_free_char_property(&characteristic);
        g_variant_iter_free(char_iter);
+       g_variant_unref(value);
        g_free(user_data);
 }
 
@@ -730,7 +799,6 @@ BT_EXPORT_API int bluetooth_gatt_get_char_descriptor_property(
        GByteArray *gb_array = NULL;
        GVariantIter *desc_value_iter;
 
-       BT_DBG("+");
        BT_CHECK_PARAMETER(descriptor_handle, return);
        BT_CHECK_PARAMETER(descriptor, return);
 
@@ -772,17 +840,21 @@ BT_EXPORT_API int bluetooth_gatt_get_char_descriptor_property(
        descriptor->handle = g_strdup(descriptor_handle);
 
        while (g_variant_iter_loop(property_iter, "{sv}", &key, &value)) {
-               BT_DBG("property");
-               if (!g_strcmp0(key,"UUID")) {
-                       descriptor->uuid = g_variant_dup_string(value,&len);
-                       BT_DBG("UUID of the char_desc = %s",descriptor->uuid);
-               } else if(!g_strcmp0(key, "Value")) {
+               if (!g_strcmp0(key, "UUID")) {
+                       char *name = NULL;
+                       descriptor->uuid = g_variant_dup_string(value, &len);
+                       _bt_get_uuid_specification_name(descriptor->uuid, &name);
+                       BT_INFO("Descriptor : %s [%s]", descriptor->uuid, name);
+                       g_free(name);
+               } else if (!g_strcmp0(key, "Value")) {
                        gb_array = g_byte_array_new();
                        g_variant_get(value, "ay", &desc_value_iter);
-                       while(g_variant_iter_loop(desc_value_iter, "y",  &char_value)) {
-                               BT_DBG("value of descriptor = %d",char_value);
+                       while (g_variant_iter_loop(desc_value_iter, "y",  &char_value)) {
+                               BT_DBG("value of descriptor = %d", char_value);
                                g_byte_array_append(gb_array, &char_value, 1);
                        }
+                       g_variant_iter_free(desc_value_iter);
+
                        if (gb_array->len != 0) {
                                descriptor->val = g_malloc0(gb_array->len *
                                                                sizeof(unsigned char));
@@ -797,105 +869,210 @@ BT_EXPORT_API int bluetooth_gatt_get_char_descriptor_property(
        g_variant_unref(result);
        g_object_unref(properties_proxy);
 
-       BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
+static int __bluetooth_get_att_error_code(GError *error)
+{
+       int att_ecode = 0;
+       int len;
+       char *str = NULL;
+
+       BT_ERR("Error : %s", error->message);
+       str = g_strrstr(error->message, "ATT error: 0x");
+       if (str) {
+               len = strlen(str);
+               att_ecode =  g_ascii_xdigit_value(str[len-2]) << 4;
+               att_ecode += g_ascii_xdigit_value(str[len-1]);
+       } else
+               return BLUETOOTH_ATT_ERROR_INTERNAL;
+
+       switch (att_ecode) {
+       case BLUETOOTH_ATT_ERROR_READ_NOT_PERMITTED:
+               BT_ERR("Read not permitted");
+               break;
+       case BLUETOOTH_ATT_ERROR_WRITE_NOT_PERMITTED:
+               BT_ERR("Write not permitted");
+               break;
+       case BLUETOOTH_ATT_ERROR_AUTHENTICATION:
+               break;
+       case BLUETOOTH_ATT_ERROR_INSUFFICIENT_ENCRYPTION:
+       case BLUETOOTH_ATT_ERROR_INSUFFICIENT_ENCRYPTION_KEY_SIZE:
+               BT_ERR("Not paired");
+               break;
+       case BLUETOOTH_ATT_ERROR_INVALID_OFFSET:
+               BT_ERR("Invalid offset");
+               break;
+       case BLUETOOTH_ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN:
+               BT_ERR("Invalid Length");
+               break;
+       case BLUETOOTH_ATT_ERROR_AUTHORIZATION:
+               BT_ERR("Operation not Authorized");
+               break;
+       }
+
+       if (att_ecode >= 0x80 && att_ecode <= 0x9F)
+               BT_ERR("Application error");
+
+       return att_ecode;
+}
+
 static void __bluetooth_internal_read_cb(GObject *source_object,
-                       GAsyncResult *res,
-                       gpointer user_data)
+                                        GAsyncResult *res, gpointer user_data)
 {
        GError *error = NULL;
-       bt_user_info_t *user_info;
-       bt_gatt_char_value_t char_value =  { 0, };
        GDBusConnection *system_gconn = NULL;
        GVariant *value;
-       GByteArray *gp_byte_array = NULL;
+       bt_user_info_t *user_info;
        GVariantIter *iter;
+       GByteArray *gp_byte_array = NULL;
        guint8 g_byte;
+       int att_ecode = 0;
+       bt_gatt_resp_data_t *resp_data = user_data;
 
        BT_DBG("+");
-       user_info = _bt_get_user_data(BT_COMMON);
 
        system_gconn = _bt_gdbus_get_system_gconn();
        value = g_dbus_connection_call_finish(system_gconn, res, &error);
 
+       user_info = _bt_get_user_data(BT_COMMON);
+       if (!user_info) {
+               g_free(resp_data);
+               if (error) {
+                       BT_ERR("Error : %s", error->message);
+                       g_clear_error(&error);
+                       return;
+               }
+               g_variant_unref(value);
+               return;
+       }
+
        if (error) {
-               BT_ERR("Error : %s \n", error->message);
+               att_ecode = __bluetooth_get_att_error_code(error);
                g_clear_error(&error);
-               if (user_info) {
-                       _bt_common_event_cb(BLUETOOTH_EVENT_GATT_READ_CHAR,
-                               BLUETOOTH_ERROR_INTERNAL, NULL,
-                               user_info->cb, user_info->user_data);
-               }
-               g_free(user_data);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_READ_CHAR,
+                                   att_ecode, resp_data,
+                                   user_info->cb, user_info->user_data);
+               g_free(resp_data);
                return;
        }
 
-       char_value.char_handle = user_data;
        gp_byte_array = g_byte_array_new();
        g_variant_get(value, "(ay)", &iter);
 
-       while (g_variant_iter_loop(iter, "y", &g_byte)) {
+       while (g_variant_iter_loop(iter, "y", &g_byte))
                g_byte_array_append(gp_byte_array, &g_byte, 1);
-       }
 
        if (gp_byte_array->len != 0) {
-               char_value.val_len = gp_byte_array->len;
-               char_value.char_value = gp_byte_array->data;
+               resp_data->len = gp_byte_array->len;
+               resp_data->value = gp_byte_array->data;
        }
 
-       if (user_info) {
-               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_READ_CHAR,
-                               BLUETOOTH_ERROR_NONE, &char_value,
-                               user_info->cb, user_info->user_data);
-       }
+       _bt_common_event_cb(BLUETOOTH_EVENT_GATT_READ_CHAR,
+                           BLUETOOTH_ATT_ERROR_NONE, resp_data,
+                           user_info->cb, user_info->user_data);
+       g_free(resp_data);
 
-       g_free(char_value.char_handle);
        g_byte_array_free(gp_byte_array, TRUE);
-       g_variant_unref(value);
        g_variant_iter_free(iter);
+       g_variant_unref(value);
 
        BT_DBG("-");
 }
 
-BT_EXPORT_API int bluetooth_gatt_read_characteristic_value(const char *characteristic)
+BT_EXPORT_API int bluetooth_gatt_read_characteristic_value(const char *chr,
+                                                          gpointer user_data)
 {
        GDBusConnection *conn;
-       char *handle;
+       bt_gatt_resp_data_t *resp_data;
+       GVariantBuilder *builder = NULL;
+       guint16 offset = 0;
 
-       BT_CHECK_PARAMETER(characteristic, return);
+       BT_CHECK_PARAMETER(chr, return);
        BT_CHECK_ENABLED(return);
 
        conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-       handle = g_strdup(characteristic);
+       resp_data = g_malloc0(sizeof(bt_gatt_resp_data_t));
+       resp_data->user_data = user_data;
 
-       g_dbus_connection_call(conn,
-                       BT_BLUEZ_NAME,
-                       characteristic,
-                       GATT_CHAR_INTERFACE,
-                       "ReadValue",
-                       NULL,
-                       G_VARIANT_TYPE("(ay)"),
-                       G_DBUS_CALL_FLAGS_NONE,
-                       -1,
-                       NULL,
+       builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+
+       /*offset*/
+       g_variant_builder_add(builder, "{sv}", "offset",
+               g_variant_new("q", offset));
+
+       /* Device Object path*/
+//     g_variant_builder_add(builder, "{sv}", "device",
+//     g_variant_new_object("o", NULL));
+
+       g_dbus_connection_call(conn, BT_BLUEZ_NAME, chr, GATT_CHAR_INTERFACE,
+                       "ReadValue", g_variant_new("(a{sv})", builder),
+                       G_VARIANT_TYPE("(ay)"), G_DBUS_CALL_FLAGS_NONE, -1, NULL,
                        (GAsyncReadyCallback)__bluetooth_internal_read_cb,
-                       (gpointer)handle);
+                       (gpointer)resp_data);
+       g_variant_builder_unref(builder);
 
        return BLUETOOTH_ERROR_NONE;
 }
 
+static void __bluetooth_internal_write_cb(GObject *source_object,
+                                         GAsyncResult *res, gpointer user_data)
+{
+       GError *error = NULL;
+       GDBusConnection *system_gconn = NULL;
+       bt_user_info_t *user_info;
+       GVariant *value;
+       int att_ecode = 0;
+       bt_gatt_resp_data_t *resp_data = user_data;
+
+       system_gconn = _bt_gdbus_get_system_gconn();
+       value = g_dbus_connection_call_finish(system_gconn, res, &error);
+
+       user_info = _bt_get_user_data(BT_COMMON);
+       if (!user_info) {
+               g_free(resp_data);
+               if (error) {
+                       BT_ERR("Error : %s", error->message);
+                       g_clear_error(&error);
+                       return;
+               }
+               g_variant_unref(value);
+               return;
+       }
+
+       if (error) {
+               att_ecode = __bluetooth_get_att_error_code(error);
+               g_clear_error(&error);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_WRITE_CHAR,
+                               att_ecode, resp_data,
+                               user_info->cb, user_info->user_data);
+               g_free(resp_data);
+               return;
+       }
+
+       _bt_common_event_cb(BLUETOOTH_EVENT_GATT_WRITE_CHAR,
+                       BLUETOOTH_ATT_ERROR_NONE, resp_data,
+                       user_info->cb, user_info->user_data);
+       g_free(resp_data);
+
+       g_variant_unref(value);
+       return;
+}
+
 BT_EXPORT_API int bluetooth_gatt_set_characteristics_value(
                const char *char_handle, const guint8 *value, int length)
 {
-       GVariant *val;
-       GVariantBuilder *builder;
+       GVariant *val, *options;
+       GVariantBuilder *builder1;
+       GVariantBuilder *builder2;
        GError *error = NULL;
        GDBusConnection *conn;
        int i = 0;
+       guint16 offset = 0;
 
        BT_DBG("+");
        BT_CHECK_PARAMETER(char_handle, return);
@@ -906,136 +1083,114 @@ BT_EXPORT_API int bluetooth_gatt_set_characteristics_value(
        conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-       builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
-
-       for (i = 0; i < length; i++) {
-               g_variant_builder_add(builder, "y", value[i]);
-       }
-
-       val = g_variant_new("(ay)", builder);
+       builder1 = g_variant_builder_new(G_VARIANT_TYPE("ay"));
+       for (i = 0; i < length; i++)
+               g_variant_builder_add(builder1, "y", value[i]);
 
-       g_dbus_connection_call_sync(conn,
-                       BT_BLUEZ_NAME,
-                       char_handle,
-                       GATT_CHAR_INTERFACE,
-                       "WriteValue",
-                       val,
-                       NULL,
-                       G_DBUS_CALL_FLAGS_NONE,
-                       -1, NULL, &error);
-
-       if (error) {
-               BT_ERR("Set value Failed: %s", error->message);
-               g_clear_error(&error);
-               g_variant_builder_unref(builder);
-               return BLUETOOTH_ERROR_INTERNAL;
-       }
+       val = g_variant_new("ay", builder1);
 
-       g_variant_builder_unref(builder);
+       builder2 = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+       /*offset*/
+       g_variant_builder_add(builder2, "{sv}", "offset",
+                               g_variant_new_uint16(offset));
 
-       BT_DBG("-");
-       return BLUETOOTH_ERROR_NONE;
-}
+       /* Device Object path*/
+//     g_variant_builder_add(builder2, "{sv}", "device",
+//     g_variant_new_object("o", NULL));
 
-static void __bluetooth_internal_write_cb(GObject *source_object,
-                       GAsyncResult *res,
-                       gpointer user_data)
-{
-       BT_DBG("+");
-       GError *error = NULL;
-       bt_user_info_t *user_info;
-       GDBusConnection *system_gconn = NULL;
-       GVariant *value;
-       int result = BLUETOOTH_ERROR_NONE;
+       options = g_variant_new("a{sv}", builder2);
 
-       user_info = _bt_get_user_data(BT_COMMON);
+       g_dbus_connection_call(conn,
+                               BT_BLUEZ_NAME,
+                               char_handle,
+                               GATT_CHAR_INTERFACE,
+                               "WriteValue",
+                               g_variant_new("(@ay@a{sv})",
+                               val, options),
+                               NULL,
+                               G_DBUS_CALL_FLAGS_NONE,
+                               -1, NULL,
+                               (GAsyncReadyCallback)__bluetooth_internal_write_cb,
+                               NULL);
 
-       system_gconn = _bt_gdbus_get_system_gconn();
-       value = g_dbus_connection_call_finish(system_gconn, res, &error);
 
        if (error) {
-               BT_ERR("Error : %s \n", error->message);
+               BT_ERR("Set value Failed: %s", error->message);
                g_clear_error(&error);
-               result = BLUETOOTH_ERROR_INTERNAL;
-       }
-       if (user_info) {
-               BT_DBG("result = %d", result);
-               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_WRITE_CHAR,
-                               result, NULL,
-                               user_info->cb, user_info->user_data);
+               g_variant_builder_unref(builder1);
+               return BLUETOOTH_ERROR_INTERNAL;
        }
+       g_variant_builder_unref(builder1);
+       g_variant_builder_unref(builder2);
 
-       if (value)
-               g_variant_unref(value);
        BT_DBG("-");
-       return;
+       return BLUETOOTH_ERROR_NONE;
 }
 
 BT_EXPORT_API int bluetooth_gatt_set_characteristics_value_by_type(
-               const char *char_handle, const guint8 *value, int length, guint8 write_type)
+                       const char *chr, const guint8 *value, int length,
+                       guint8 write_type, gpointer user_data)
 {
-       GVariant *val;
-       GVariantBuilder *builder;
+       GVariant *val, *options;
+       GVariantBuilder *builder1;
+       GVariantBuilder *builder2;
        GDBusConnection *conn;
+       guint16 offset = 0;
        int i = 0;
        int ret = BLUETOOTH_ERROR_NONE;
+       bt_gatt_resp_data_t *resp_data;
 
-       BT_CHECK_PARAMETER(char_handle, return);
+       BT_CHECK_PARAMETER(chr, return);
        BT_CHECK_PARAMETER(value, return);
        retv_if(length == 0, BLUETOOTH_ERROR_INVALID_PARAM);
-       BT_CHECK_ENABLED(return);
+       BT_CHECK_ENABLED_INTERNAL(return);
 
        conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-       builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
+       builder1 = g_variant_builder_new(G_VARIANT_TYPE("ay"));
 
-       for (i = 0; i < length; i++) {
-               g_variant_builder_add(builder, "y", value[i]);
-       }
+       for (i = 0; i < length; i++)
+               g_variant_builder_add(builder1, "y", value[i]);
 
-       val = g_variant_new("ay", builder);
+       val = g_variant_new("ay", builder1);
 
-       if (write_type ==
-               BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE_NO_RESPONSE) {
-               g_dbus_connection_call(conn,
-                               BT_BLUEZ_NAME,
-                               char_handle,
-                               GATT_CHAR_INTERFACE,
-                               "WriteValuebyType",
-                               g_variant_new("(y@ay)", write_type, val),
-                               NULL,
-                               G_DBUS_CALL_FLAGS_NONE,
-                               -1, NULL,
-                               (GAsyncReadyCallback)__bluetooth_internal_write_cb,
-                               NULL);
-       } else if (write_type ==
-                       BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE) {
-               g_dbus_connection_call(conn,
-                               BT_BLUEZ_NAME,
-                               char_handle,
-                               GATT_CHAR_INTERFACE,
-                               "WriteValuebyType",
-                               g_variant_new("(y@ay)", write_type, val),
-                               NULL,
-                               G_DBUS_CALL_FLAGS_NONE,
-                               -1, NULL,
-                               (GAsyncReadyCallback)__bluetooth_internal_write_cb,
-                               NULL);
-       } else
-               ret = BLUETOOTH_ERROR_INVALID_PARAM;
+       builder2 = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+       /*offset*/
+       g_variant_builder_add(builder2, "{sv}", "offset",
+                       g_variant_new_uint16(offset));
 
+       /* Device Object path*/
+//     g_variant_builder_add(builder2, "{sv}", "device",
+//     g_variant_new_object("o", NULL));
+
+       options = g_variant_new("a{sv}", builder2);
+
+       resp_data = g_malloc0(sizeof(bt_gatt_resp_data_t));
+       resp_data->user_data = user_data;
+
+       g_dbus_connection_call(conn, BT_BLUEZ_NAME, chr, GATT_CHAR_INTERFACE,
+                       "WriteValuebyType",
+                       g_variant_new("(y@ay@a{sv})", write_type, val, options),
+                       NULL,
+                       G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                       (GAsyncReadyCallback)__bluetooth_internal_write_cb,
+                       (gpointer)resp_data);
+
+       g_variant_builder_unref(builder1);
+       g_variant_builder_unref(builder2);
 
-       g_variant_builder_unref(builder);
        return ret;
 }
 
 BT_EXPORT_API int bluetooth_gatt_set_characteristics_value_request(
                        const char *char_handle, const guint8 *value, int length)
 {
-       GVariant *val;
+       GVariant *val, *options;
        GDBusConnection *conn;
-       GVariantBuilder *builder;
+       GVariantBuilder *builder1;
+       GVariantBuilder *builder2;
+       guint offset = 0;
        int i;
 
        BT_DBG("+");
@@ -1047,28 +1202,41 @@ BT_EXPORT_API int bluetooth_gatt_set_characteristics_value_request(
        conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-       builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
+       builder1 = g_variant_builder_new(G_VARIANT_TYPE("ay"));
 
        for (i = 0; i < length; i++) {
-               g_variant_builder_add(builder, "y", value[i]);
+               g_variant_builder_add(builder1, "y", value[i]);
                BT_DBG("value [] = %d", value[i]);
        }
 
-       val = g_variant_new("(ay)", builder);
+       val = g_variant_new("ay", builder1);
+
+       builder2 = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+       /*offset*/
+       g_variant_builder_add(builder2, "{sv}", "offset",
+                               g_variant_new_uint16(offset));
+
+       /* Device Object path*/
+//     g_variant_builder_add(builder2, "{sv}", "device",
+//     g_variant_new_object("o", NULL));
+
+       options = g_variant_new("a{sv}", builder2);
 
        g_dbus_connection_call(conn,
                                BT_BLUEZ_NAME,
                                char_handle,
                                GATT_CHAR_INTERFACE,
                                "WriteValue",
-                               val,
+                               g_variant_new("(@ay@a{sv})",
+                               val, options),
                                NULL,
                                G_DBUS_CALL_FLAGS_NONE,
                                -1, NULL,
                                (GAsyncReadyCallback)__bluetooth_internal_write_cb,
                                NULL);
 
-       g_variant_builder_unref(builder);
+       g_variant_builder_unref(builder1);
+       g_variant_builder_unref(builder2);
 
        BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
@@ -1121,7 +1289,7 @@ static int __bluetooth_gatt_descriptor_iter(const char *char_handle,
        }
        g_variant_get(result, "(a{sv})", &property_iter);
        while (g_variant_iter_loop(property_iter, "{sv}", &key, &value)) {
-               if (!g_strcmp0(key,"UUID")) {
+               if (!g_strcmp0(key, "UUID")) {
                        uuid = g_variant_get_string(value, &len);
                        if (g_strcmp0(uuid, GATT_USER_DESC_UUID) == 0) {
                                BT_DBG("GATT_USER_DESC_UUID");
@@ -1139,46 +1307,43 @@ static int __bluetooth_gatt_descriptor_iter(const char *char_handle,
                                BT_DBG("descriptor uuid = %s", uuid);
                        }
                } else if (!g_strcmp0(key, "Value")) {
-                       switch(desc_type) {
-                               case CHAR_FORMAT :
-                                       BT_DBG("Format descriptor");
-                                       g_variant_get(value, "(yyqyq)",
-                                                       &(characteristic->format.format),
-                                                       &(characteristic->format.exponent),
-                                                       &(characteristic->format.unit),
-                                                       &(characteristic->format.name_space),
-                                                       &(characteristic->format.description));
-                                       break;
-                               case USER_DESC:
-                                       BT_DBG("User descriptor");
-                                       g_variant_get(value, "ay", &desc_value_iter);
-                                       len = g_variant_get_size((GVariant *)desc_value_iter);
-
-                                       if (len > 0) {
-                                               characteristic->description = (char *)g_malloc0(len + 1);
-                                               if (!characteristic->description) {
-                                                       ret = BLUETOOTH_ERROR_OUT_OF_MEMORY;
-                                                       goto done;
-                                               }
-                                       }
-                                       for (i = 0; i < len; i++) {
-                                               g_variant_iter_loop(desc_value_iter, "y",
-                                                       &characteristic->description[i]);
-                                               BT_DBG("description = %s", characteristic->description);
-                                       }
-                                       break;
-                               case CLIENT_CONF :
-                                       BT_DBG(" CLIENT_CONF");
-                                       break;
-                               case SERVER_CONF :
-                                       BT_DBG(" SERVER_CONF");
-                                       break;
-                               default:break;
+                       switch (desc_type) {
+                       case CHAR_FORMAT:
+                               BT_DBG("Format descriptor");
+                               g_variant_get(value, "(yyqyq)",
+                                               &(characteristic->format.format),
+                                               &(characteristic->format.exponent),
+                                               &(characteristic->format.unit),
+                                               &(characteristic->format.name_space),
+                                               &(characteristic->format.description));
+                               break;
+                       case USER_DESC:
+                               BT_DBG("User descriptor");
+                               g_variant_get(value, "ay", &desc_value_iter);
+                               len = g_variant_get_size((GVariant *)desc_value_iter);
+
+                               if (len > 0)
+                                       characteristic->description = (char *)g_malloc0(len + 1);
+
+                               for (i = 0; i < len; i++) {
+                                       g_variant_iter_loop(desc_value_iter, "y",
+                                               &characteristic->description[i]);
+                                       BT_DBG("description = %s", characteristic->description);
+                               }
+                               g_variant_iter_free(desc_value_iter);
+                               break;
+                       case CLIENT_CONF:
+                               BT_DBG(" CLIENT_CONF");
+                               break;
+                       case SERVER_CONF:
+                               BT_DBG(" SERVER_CONF");
+                               break;
+                       default:
+                               break;
                        }
                }
        }
 
-done:
        g_variant_iter_free(property_iter);
        g_variant_unref(result);
        g_object_unref(properties_proxy);
@@ -1195,7 +1360,6 @@ static void bluetooth_gatt_get_char_desc_cb(GDBusProxy *proxy,
        GVariant *value;
        GVariant        *char_value;
        GVariantIter *char_iter;
-       int i;
        char *char_handle;
        GError *error = NULL;
        bt_user_info_t *user_info;
@@ -1205,6 +1369,7 @@ static void bluetooth_gatt_get_char_desc_cb(GDBusProxy *proxy,
        user_info = _bt_get_user_data(BT_COMMON);
 
        value = g_dbus_proxy_call_finish(proxy, res, &error);
+       characteristic.handle = user_data;
 
        if (value == NULL) {
                if (error != NULL) {
@@ -1219,7 +1384,7 @@ static void bluetooth_gatt_get_char_desc_cb(GDBusProxy *proxy,
                                BLUETOOTH_ERROR_INTERNAL, NULL,
                                user_info->cb, user_info->user_data);
                }
-               g_free(user_data);
+               g_free(characteristic.handle);
                g_object_unref(proxy);
                return;
        }
@@ -1227,27 +1392,24 @@ static void bluetooth_gatt_get_char_desc_cb(GDBusProxy *proxy,
        g_variant_get(value, "(v)", &char_value);
        g_variant_get(char_value, "ao", &char_iter);
 
-       int len = g_variant_get_size((GVariant *)char_iter);
-       if (len > 0) {
-               for (i = 0; i < len; i++) {
-                       g_variant_iter_loop(char_iter, "o",  &char_handle);
-                       BT_DBG("object path of descriptor = %s",char_handle);
-                       if(char_handle) {
-                               ret = __bluetooth_gatt_descriptor_iter(char_handle,
-                                                       &characteristic);
-                               BT_DBG("Descriptor read status [%d]",ret);
-                       }
+       while (g_variant_iter_loop(char_iter, "&o",  &char_handle)) {
+               BT_DBG("object path of descriptor = %s", char_handle);
+               if (char_handle) {
+                       ret = __bluetooth_gatt_descriptor_iter(char_handle,
+                                               &characteristic);
+                       BT_DBG("Descriptor read status [%d]", ret);
                }
        }
 
-       characteristic.handle = user_data;
        if (user_info) {
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_SVC_CHAR_DESC_DISCOVERED,
                                ret, &characteristic, user_info->cb, user_info->user_data);
        }
        bluetooth_gatt_free_char_property(&characteristic);
 
+       g_free(characteristic.handle);
        g_variant_iter_free(char_iter);
+       g_variant_unref(value);
        BT_DBG("-");
 }
 
@@ -1292,133 +1454,168 @@ static void __bluetooth_internal_read_desc_cb(GObject *source_object,
                        gpointer user_data)
 {
        GError *error = NULL;
-       bt_user_info_t *user_info;
-       bt_gatt_char_property_t char_value =  { 0, };
        GDBusConnection *system_gconn = NULL;
        GVariant *value;
+       bt_user_info_t *user_info;
        GByteArray *gp_byte_array = NULL;
        GVariantIter *iter;
        guint8 g_byte;
+       int att_ecode = 0;
+       bt_gatt_resp_data_t *resp_data = user_data;
 
        BT_DBG("+");
-       user_info = _bt_get_user_data(BT_COMMON);
-       system_gconn = _bt_gdbus_get_system_gconn();
 
-       char_value.handle = user_data;
+       system_gconn = _bt_gdbus_get_system_gconn();
        value = g_dbus_connection_call_finish(system_gconn, res, &error);
 
+       user_info = _bt_get_user_data(BT_COMMON);
+       if (!user_info) {
+               g_free(resp_data);
+               if (error) {
+                       BT_ERR("Error : %s", error->message);
+                       g_clear_error(&error);
+                       return;
+               }
+               g_variant_unref(value);
+               return;
+       }
+
        if (error) {
-               BT_ERR("Error : %s \n", error->message);
+               att_ecode = __bluetooth_get_att_error_code(error);
                g_clear_error(&error);
-               if (user_info) {
-                       _bt_common_event_cb(BLUETOOTH_EVENT_GATT_READ_DESC,
-                                       BLUETOOTH_ERROR_INTERNAL, NULL,
-                                       user_info->cb, user_info->user_data);
-               }
-               g_free(char_value.handle);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_READ_DESC,
+                               att_ecode, resp_data,
+                               user_info->cb, user_info->user_data);
+               g_free(resp_data);
                return;
        }
 
        gp_byte_array = g_byte_array_new();
        g_variant_get(value, "(ay)", &iter);
 
-       while(g_variant_iter_loop(iter, "y",  &g_byte)) {
+       while (g_variant_iter_loop(iter, "y", &g_byte))
                g_byte_array_append(gp_byte_array, &g_byte, 1);
-       }
 
        if (gp_byte_array->len != 0) {
-               char_value.val_len = (unsigned int )gp_byte_array->len;
-               char_value.description= (char *)gp_byte_array->data;
+               resp_data->len = gp_byte_array->len;
+               resp_data->value = gp_byte_array->data;
        }
 
-       if (user_info) {
-               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_READ_DESC,
-                               BLUETOOTH_ERROR_NONE, &char_value,
-                               user_info->cb, user_info->user_data);
-       }
+       _bt_common_event_cb(BLUETOOTH_EVENT_GATT_READ_DESC,
+                       BLUETOOTH_ATT_ERROR_NONE, resp_data,
+                       user_info->cb, user_info->user_data);
+       g_free(resp_data);
+
 
        g_byte_array_free(gp_byte_array, TRUE);
-       g_free(char_value.handle);
-       g_variant_unref(value);
        g_variant_iter_free(iter);
+       g_variant_unref(value);
 
        BT_DBG("-");
 }
 
-BT_EXPORT_API int bluetooth_gatt_read_descriptor_value(const char *char_descriptor)
+BT_EXPORT_API int bluetooth_gatt_read_descriptor_value(const char *desc,
+                                                      gpointer user_data)
 {
        GDBusConnection *conn;
-       char *handle;
+       GVariantBuilder *builder;
+       guint offset = 0;
+       bt_gatt_resp_data_t *resp_data;
 
        BT_DBG("+");
-       BT_CHECK_PARAMETER(char_descriptor, return);
+
+       BT_CHECK_PARAMETER(desc, return);
        BT_CHECK_ENABLED(return);
 
        conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-       handle = g_strdup(char_descriptor);
+       resp_data = g_malloc0(sizeof(bt_gatt_resp_data_t));
+       resp_data->user_data = user_data;
 
-       g_dbus_connection_call(conn,
-                       BT_BLUEZ_NAME,
-                       char_descriptor,
-                       GATT_DESC_INTERFACE,
-                       "ReadValue",
-                       NULL,
+       builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+
+       /*offset*/
+       g_variant_builder_add(builder, "{sv}", "offset",
+                               g_variant_new("q", offset));
+       /* Device Object path*/
+//  g_variant_builder_add(builder, "{sv}", "device",
+//  g_variant_new("o", serv_info->serv_path));
+
+       g_dbus_connection_call(conn, BT_BLUEZ_NAME, desc, GATT_DESC_INTERFACE,
+                       "ReadValue", g_variant_new("(a{sv})", builder),
                        G_VARIANT_TYPE("(ay)"),
-                       G_DBUS_CALL_FLAGS_NONE,
-                       -1,
-                       NULL,
+                       G_DBUS_CALL_FLAGS_NONE, -1, NULL,
                        (GAsyncReadyCallback)__bluetooth_internal_read_desc_cb,
-                       (gpointer)handle);
+                       (gpointer)resp_data);
+       g_variant_builder_unref(builder);
 
        BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
 
 static void __bluetooth_internal_write_desc_cb(GObject *source_object,
-                       GAsyncResult *res,
-                       gpointer user_data)
+                                       GAsyncResult *res, gpointer user_data)
 {
        GError *error = NULL;
        bt_user_info_t *user_info;
        GDBusConnection *system_gconn = NULL;
        GVariant *value;
-       int result = BLUETOOTH_ERROR_NONE;
+       int att_ecode = BLUETOOTH_ATT_ERROR_NONE;
+       bt_gatt_resp_data_t *resp_data = user_data;
 
        BT_DBG("+");
-       user_info = _bt_get_user_data(BT_COMMON);
 
        system_gconn = _bt_gdbus_get_system_gconn();
        value = g_dbus_connection_call_finish(system_gconn, res, &error);
 
+       user_info = _bt_get_user_data(BT_COMMON);
+       if (!user_info) {
+               g_free(resp_data);
+               if (error) {
+                       BT_ERR("Error : %s", error->message);
+                       g_clear_error(&error);
+                       return;
+               }
+               g_variant_unref(value);
+               return;
+       }
+
        if (error) {
-               BT_ERR("Error : %s \n", error->message);
+               att_ecode = __bluetooth_get_att_error_code(error);
                g_clear_error(&error);
-               result = BLUETOOTH_ERROR_INTERNAL;
-       }
-       if (user_info) {
+
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_WRITE_DESC,
-                               result, NULL,
+                               att_ecode, resp_data,
                                user_info->cb, user_info->user_data);
+               g_free(resp_data);
+               return;
        }
 
-       if(value)
-               g_variant_unref(value);
+       _bt_common_event_cb(BLUETOOTH_EVENT_GATT_WRITE_DESC,
+                               BLUETOOTH_ATT_ERROR_NONE, resp_data,
+                       user_info->cb, user_info->user_data);
+       g_free(resp_data);
 
+       g_variant_unref(value);
        BT_DBG("-");
 }
 
-BT_EXPORT_API int bluetooth_gatt_write_descriptor_value(
-                       const char *desc_handle, const guint8 *value, int length)
+BT_EXPORT_API int bluetooth_gatt_write_descriptor_value(const char *desc,
+                       const guint8 *value, int length, gpointer user_data)
 {
-       GVariant *val;
+       GVariant *val, *options;
        GDBusConnection *conn;
-       GVariantBuilder *builder;
+       GVariantBuilder *builder1;
+       GVariantBuilder *builder2;
+       guint offset = 0;
        int i;
+       bt_gatt_resp_data_t *resp_data;
 
        BT_DBG("+");
-       BT_CHECK_PARAMETER(desc_handle, return);
+
+       BT_CHECK_PARAMETER(desc, return);
        BT_CHECK_PARAMETER(value, return);
        retv_if(length == 0, BLUETOOTH_ERROR_INVALID_PARAM);
        BT_CHECK_ENABLED(return);
@@ -1426,27 +1623,36 @@ BT_EXPORT_API int bluetooth_gatt_write_descriptor_value(
        conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-       builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
+       builder1 = g_variant_builder_new(G_VARIANT_TYPE("ay"));
 
-       for (i = 0; i < length; i++) {
-               g_variant_builder_add(builder, "y", value[i]);
-       }
+       for (i = 0; i < length; i++)
+               g_variant_builder_add(builder1, "y", value[i]);
 
-       val = g_variant_new("(ay)", builder);
+       val = g_variant_new("ay", builder1);
 
-       g_dbus_connection_call(conn,
-                               BT_BLUEZ_NAME,
-                               desc_handle,
-                               GATT_DESC_INTERFACE,
-                               "WriteValue",
-                               val,
-                               NULL,
-                               G_DBUS_CALL_FLAGS_NONE,
-                               -1, NULL,
-                               (GAsyncReadyCallback)__bluetooth_internal_write_desc_cb,
-                               NULL);
+       builder2 = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+       /*offset*/
+       g_variant_builder_add(builder2, "{sv}", "offset",
+                               g_variant_new_uint16(offset));
 
-       g_variant_builder_unref(builder);
+       /* Device Object path*/
+//     g_variant_builder_add(builder2, "{sv}", "device",
+//     g_variant_new_object("o", NULL));
+
+       options = g_variant_new("a{sv}", builder2);
+
+       resp_data = g_malloc0(sizeof(bt_gatt_resp_data_t));
+       resp_data->user_data = user_data;
+
+       g_dbus_connection_call(conn, BT_BLUEZ_NAME, desc, GATT_DESC_INTERFACE,
+                       "WriteValue", g_variant_new("(@ay@a{sv})",
+                       val, options), NULL,
+                       G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                       (GAsyncReadyCallback)__bluetooth_internal_write_desc_cb,
+                       (gpointer)resp_data);
+
+       g_variant_builder_unref(builder1);
+       g_variant_builder_unref(builder2);
 
        BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
@@ -1454,16 +1660,14 @@ BT_EXPORT_API int bluetooth_gatt_write_descriptor_value(
 
 BT_EXPORT_API int bluetooth_gatt_watch_characteristics(const char *char_handle)
 {
-
        GDBusConnection *conn;
        GError *error = NULL;
        int ret = BLUETOOTH_ERROR_NONE;
-       BT_DBG("+");
-       BT_CHECK_PARAMETER(char_handle, return);
 
+       BT_CHECK_PARAMETER(char_handle, return);
        BT_CHECK_ENABLED(return);
 
-       BT_DBG("Entered characteristic handle:%s \n ", char_handle);
+       BT_INFO_C("### Enable CCCD : %s", char_handle);
 
        conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -1476,10 +1680,11 @@ BT_EXPORT_API int bluetooth_gatt_watch_characteristics(const char *char_handle)
                        NULL,
                        NULL,
                        G_DBUS_CALL_FLAGS_NONE,
-                       -1, NULL, &error);
+                       GATT_DEFAULT_TIMEOUT, NULL, &error);
 
        if (error) {
-               BT_ERR("Watch Failed: %s", error->message);
+               g_dbus_error_strip_remote_error(error);
+               BT_ERR_C("### Watch Failed: %s", error->message);
                if (g_strrstr(error->message, "Already notifying"))
                        ret = BLUETOOTH_ERROR_NONE;
                else if (g_strrstr(error->message, "In Progress"))
@@ -1499,7 +1704,7 @@ BT_EXPORT_API int bluetooth_gatt_watch_characteristics(const char *char_handle)
 
                g_clear_error(&error);
        }
-       BT_DBG("-");
+
        return ret;
 }
 
@@ -1509,12 +1714,11 @@ BT_EXPORT_API int bluetooth_gatt_unwatch_characteristics(const char *char_handle
        GDBusConnection *conn;
        GError *error = NULL;
        int ret = BLUETOOTH_ERROR_NONE;
-       BT_DBG("+");
        BT_CHECK_PARAMETER(char_handle, return);
 
        BT_CHECK_ENABLED(return);
 
-       BT_DBG("Entered characteristic handle:%s \n ", char_handle);
+       BT_INFO("Disable CCCD : %s", char_handle);
 
        conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
@@ -1527,13 +1731,13 @@ BT_EXPORT_API int bluetooth_gatt_unwatch_characteristics(const char *char_handle
                        NULL,
                        NULL,
                        G_DBUS_CALL_FLAGS_NONE,
-                       -1, NULL, &error);
+                       GATT_DEFAULT_TIMEOUT, NULL, &error);
 
        if (error) {
                BT_ERR("Watch Failed: %s", error->message);
                g_clear_error(&error);
                ret =  BLUETOOTH_ERROR_INTERNAL;
        }
-       BT_DBG("-");
+
        return ret;
 }