Fix Coverity issues in Bluetooth-frwk
[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-gatt-service.c
index a79cf40..0c4c127 100644 (file)
 #include<stdbool.h>
 
 #include "bt-common.h"
+/* TODO_40 : 4.0 merge - Need to check why includes bt-event-handler.h */
+#include "bt-event-handler.h"
 #include "bt-internal-types.h"
 
+
+#include "bluetooth-gatt-server-api.h"
+#include "bt-request-sender.h"
+#define BT_GATT_ATT_UUID_LEN_MAX 50
+#define BT_GATT_SERVER_DBUS_NAME_LEN_MAX 50
+
+
+/* Common defintions to follow , applicable for both
+   GATT_DIRECT and RELAY */
+
+
+#define NUMBER_OF_FLAGS 10
+int bluetooth_gatt_convert_prop2string(
+                       bt_gatt_characteristic_property_t properties,
+                       char *char_properties[])
+{
+       int flag_count = 0;
+
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_BROADCAST) {
+               char_properties[flag_count] = g_strdup("broadcast");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ) {
+               char_properties[flag_count] = g_strdup("read");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE_NO_RESPONSE) {
+               char_properties[flag_count] = g_strdup("write-without-response");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE) {
+               char_properties[flag_count] = g_strdup("write");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_NOTIFY) {
+               char_properties[flag_count] = g_strdup("notify");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_INDICATE) {
+               char_properties[flag_count] = g_strdup("indicate");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_SIGNED_WRITE) {
+               char_properties[flag_count] = g_strdup("authenticated-signed-writes");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_RELIABLE_WRITE) {
+               char_properties[flag_count] = g_strdup("reliable-write");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITABLE_AUXILIARIES) {
+               char_properties[flag_count] = g_strdup("writable-auxiliaries");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_READ) {
+               char_properties[flag_count] = g_strdup("encrypt-read");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_WRITE) {
+               char_properties[flag_count] = g_strdup("encrypt-write");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_READ) {
+               char_properties[flag_count] = g_strdup("encrypt-authenticated-read");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_WRITE) {
+               char_properties[flag_count] = g_strdup("encrypt-authenticated-write");
+               flag_count++;
+       }
+
+       if (flag_count == 0) {
+               char_properties[flag_count] = g_strdup("read");
+               flag_count++;
+       }
+
+       return flag_count;
+}
+
+int bluetooth_gatt_convert_perm2string(
+                       bt_gatt_permission_t properties,
+                       char *char_properties[])
+{
+       int flag_count = 0;
+
+       if (properties & BLUETOOTH_GATT_PERMISSION_READ) {
+               char_properties[flag_count] = g_strdup("read");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_PERMISSION_WRITE) {
+               char_properties[flag_count] = g_strdup("write");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_READ) {
+               char_properties[flag_count] = g_strdup("encrypt-read");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_WRITE) {
+               char_properties[flag_count] = g_strdup("encrypt-write");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_AUTHENTICATED_READ) {
+               char_properties[flag_count] = g_strdup("encrypt-authenticated-read");
+               flag_count++;
+       }
+       if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_AUTHENTICATED_WRITE) {
+               char_properties[flag_count] = g_strdup("encrypt-authenticated-write");
+               flag_count++;
+       }
+
+       if (flag_count == 0) {
+               char_properties[flag_count] = g_strdup("read");
+               flag_count++;
+       }
+
+       return flag_count;
+}
+
+
 #define NUMBER_OF_FLAGS        10
 
 GDBusConnection *g_conn;
@@ -37,6 +158,8 @@ static int serv_id = 1;
 static int register_pending_cnt = 0;
 static bool is_server_started = false;
 
+GCancellable *register_cancel;
+
 /* Introspection data for the service we are exporting */
 static const gchar service_introspection_xml[] =
 "<node name='/'>"
@@ -60,14 +183,15 @@ static const gchar characteristics_introspection_xml[] =
 "  <interface name='org.bluez.GattCharacteristic1'>"
 "       <method name='ReadValue'>"
 "              <arg type='s' name='address' direction='in'/>"
-"              <arg type='y' name='id' direction='in'/>"
+"              <arg type='u' name='id' direction='in'/>"
 "              <arg type='q' name='offset' direction='in'/>"
 "              <arg type='ay' name='Value' direction='out'/>"
 "       </method>"
 "       <method name='WriteValue'>"
 "              <arg type='s' name='address' direction='in'/>"
-"              <arg type='y' name='id' direction='in'/>"
+"              <arg type='u' name='id' direction='in'/>"
 "              <arg type='q' name='offset' direction='in'/>"
+"              <arg type='b' name='response_needed' direction='in'/>"
 "              <arg type='ay' name='value' direction='in'/>"
 "       </method>"
 "       <method name='StartNotify'>"
@@ -103,14 +227,15 @@ static const gchar descriptor_introspection_xml[] =
 "  <interface name='org.bluez.GattDescriptor1'>"
 "       <method name='ReadValue'>"
 "              <arg type='s' name='address' direction='in'/>"
-"              <arg type='y' name='id' direction='in'/>"
+"              <arg type='u' name='id' direction='in'/>"
 "              <arg type='q' name='offset' direction='in'/>"
 "              <arg type='ay' name='Value' direction='out'/>"
 "       </method>"
 "       <method name='WriteValue'>"
 "              <arg type='s' name='address' direction='in'/>"
-"              <arg type='y' name='id' direction='in'/>"
+"              <arg type='u' name='id' direction='in'/>"
 "              <arg type='q' name='offset' direction='in'/>"
+"              <arg type='b' name='response_needed' direction='in'/>"
 "              <arg type='ay' name='value' direction='in'/>"
 "       </method>"
 "  </interface>"
@@ -189,13 +314,20 @@ static gchar *app_path = NULL;
 #define GATT_CHAR_INTERFACE            "org.bluez.GattCharacteristic1"
 #define GATT_DESC_INTERFACE            "org.bluez.GattDescriptor1"
 
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
 #define BT_HPS_OBJECT_PATH "/org/projectx/httpproxy"
 #define BT_HPS_INTERFACE_NAME "org.projectx.httpproxy_service"
 #define PROPERTIES_CHANGED "PropertiesChanged"
 #define BT_HPS_PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties"
 #endif
 
+#ifdef TIZEN_FEATURE_BT_OTP
+#define BT_OTP_OBJECT_PATH             "/org/projectx/otp"
+#define BT_OTP_INTERFACE_NAME          "org.projectx.otp_service"
+#define PROPERTIES_CHANGED             "PropertiesChanged"
+#define BT_OTP_PROPERTIES_INTERFACE    "org.freedesktop.DBus.Properties"
+#endif
+
 static GDBusProxy *manager_gproxy = NULL;
 
 static struct gatt_char_info *__bt_gatt_find_gatt_char_info(
@@ -234,7 +366,7 @@ static void __bt_gatt_close_gdbus_connection(void)
        BT_DBG("-");
 }
 
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
 static int __bt_send_event_to_hps(int event, GVariant *var)
 {
        GError *error = NULL;
@@ -259,7 +391,7 @@ static int __bt_send_event_to_hps(int event, GVariant *var)
                parameters = g_variant_new("(a{sv}as)", inner_builder, invalidated_builder);
                g_variant_builder_unref(invalidated_builder);
                g_variant_builder_unref(inner_builder);
-       } else if (BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED) {
+       } else if (event == BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED) {
                GVariantBuilder *inner_builder;
                GVariantBuilder *invalidated_builder;
 
@@ -273,6 +405,8 @@ static int __bt_send_event_to_hps(int event, GVariant *var)
                parameters = g_variant_new("(a{sv}as)", inner_builder, invalidated_builder);
                g_variant_builder_unref(invalidated_builder);
                g_variant_builder_unref(inner_builder);
+       } else {
+               g_varaiant_unref(var);
        }
 
        msg = g_dbus_message_new_signal(BT_HPS_OBJECT_PATH, BT_HPS_INTERFACE_NAME, PROPERTIES_CHANGED);
@@ -290,6 +424,76 @@ static int __bt_send_event_to_hps(int event, GVariant *var)
 }
 #endif
 
+#ifdef TIZEN_FEATURE_BT_OTP
+static int __bt_send_event_to_otp(int event, GVariant *var)
+{
+       GError *error = NULL;
+       GVariant *parameters = NULL;
+       GDBusMessage *msg = NULL;
+
+       BT_DBG(" ");
+
+       retv_if(g_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
+
+       if (event == BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED) {
+               GVariantBuilder *inner_builder;
+               GVariantBuilder *invalidated_builder;
+
+               BT_DBG("BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED");
+               inner_builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+
+               g_variant_builder_add(inner_builder, "{sv}", "WriteValue", var);
+
+               invalidated_builder = g_variant_builder_new(G_VARIANT_TYPE("as"));
+
+               parameters = g_variant_new("(a{sv}as)", inner_builder, invalidated_builder);
+               g_variant_builder_unref(invalidated_builder);
+               g_variant_builder_unref(inner_builder);
+       } else if (event == BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED) {
+               GVariantBuilder *inner_builder;
+               GVariantBuilder *invalidated_builder;
+
+               BT_DBG("BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED");
+               inner_builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+
+               g_variant_builder_add(inner_builder, "{sv}", "ReadValue", var);
+
+               invalidated_builder = g_variant_builder_new(G_VARIANT_TYPE("as"));
+
+               parameters = g_variant_new("(a{sv}as)", inner_builder, invalidated_builder);
+               g_variant_builder_unref(invalidated_builder);
+               g_variant_builder_unref(inner_builder);
+       } else if (event == BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_STATE_CHANGED) {
+               GVariantBuilder *inner_builder;
+               GVariantBuilder *invalidated_builder;
+
+               BT_DBG("BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_STATE_CHANGED");
+               inner_builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+
+               g_variant_builder_add(inner_builder, "{sv}", "NotificationStateChanged", var);
+
+               invalidated_builder = g_variant_builder_new(G_VARIANT_TYPE("as"));
+
+               parameters = g_variant_new("(a{sv}as)", inner_builder, invalidated_builder);
+               g_variant_builder_unref(invalidated_builder);
+               g_variant_builder_unref(inner_builder);
+       }
+
+       msg = g_dbus_message_new_signal(BT_OTP_OBJECT_PATH, BT_OTP_INTERFACE_NAME, PROPERTIES_CHANGED);
+       g_dbus_message_set_body(msg, parameters);
+       if (!g_dbus_connection_send_message(g_conn, msg, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 0, NULL)) {
+               if (error != NULL) {
+                       BT_ERR("D-Bus API failure: errCode[%x], \
+                                       message[%s]",
+                                       error->code, error->message);
+                       g_clear_error(&error);
+               }
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
+       return BLUETOOTH_ERROR_NONE;
+}
+#endif
+
 static void __bt_gatt_manager_method_call(GDBusConnection *connection,
                                        const gchar *sender,
                                        const gchar *object_path,
@@ -322,16 +526,17 @@ static void __bt_gatt_manager_method_call(GDBusConnection *connection,
                        GVariantBuilder *svc_builder = NULL;
                        GVariantBuilder *inner_builder = NULL;
 
-                       if (register_pending_cnt > 1) {
+                       if (register_pending_cnt > 1)
                                l1 = g_slist_nth(gatt_services, len - register_pending_cnt);
-                       } else {
+                       else
                                l1 = g_slist_last(gatt_services);
-                       }
+
                        register_pending_cnt--;
 
                        if (l1 == NULL) {
                                BT_ERR("gatt service list is NULL");
                                g_dbus_method_invocation_return_value(invocation, NULL);
+                               g_variant_builder_unref(builder);
                                return;
                        }
 
@@ -339,6 +544,7 @@ static void __bt_gatt_manager_method_call(GDBusConnection *connection,
                        if (serv_info == NULL) {
                                BT_ERR("service info value is NULL");
                                g_dbus_method_invocation_return_value(invocation, NULL);
+                               g_variant_builder_unref(builder);
                                return;
                        }
 
@@ -575,6 +781,7 @@ static void __bt_gatt_manager_method_call(GDBusConnection *connection,
                                                g_variant_new(
                                                "(a{oa{sa{sv}}})",
                                                builder));
+               g_variant_builder_unref(builder);
        }
 }
 
@@ -632,80 +839,82 @@ static void __bt_gatt_char_method_call(GDBusConnection *connection,
 
        if (g_strcmp0(method_name, "ReadValue") == 0) {
                gchar *addr = NULL;
-               guint8 req_id = 1;
+               guint req_id = 0;
                guint16 offset = 0;
                bt_gatt_read_req_t read_req = {0, };
                bt_user_info_t *user_info = NULL;
                struct gatt_req_info *req_info = NULL;
                struct gatt_service_info *svc_info = NULL;
-
-               BT_DBG("ReadValue");
-
-               g_variant_get(parameters, "(&syq)", &addr, &req_id, &offset);
+#if defined(TIZEN_FEATURE_BT_HPS) || defined(TIZEN_FEATURE_BT_OTP)
+               GVariant *param = NULL;
+#endif
 
                BT_DBG("Application path = %s", object_path);
+               BT_DBG("Sender = %s", sender);
 
-               BT_DBG("Remote Device address number = %s", addr);
-               BT_DBG("Request id = %d, Offset = %d", req_id, offset);
+               user_info = _bt_get_user_data(BT_COMMON);
+               if (user_info == NULL) {
+                       BT_INFO("No callback is set for %s", object_path);
+                       g_dbus_method_invocation_return_value(invocation, NULL);
+                       return;
+               }
 
-               BT_DBG("Sender = %s", sender);
+               svc_info = __bt_gatt_find_gatt_service_from_char(object_path);
+               if (svc_info == NULL) {
+                       BT_ERR("Coudn't find service for %s", object_path);
+                       g_dbus_method_invocation_return_value(invocation, NULL);
+                       return;
+               }
 
-               read_req.att_handle = g_strdup(object_path);
-               read_req.address = g_strdup(addr);
+               g_variant_get(parameters, "(&suq)", &addr, &req_id, &offset);
+               BT_DBG("Request id = %u, Offset = %u", req_id, offset);
+
+               read_req.att_handle = (char *)object_path;
+               read_req.address = addr;
                read_req.req_id = req_id;
                read_req.offset = offset;
-               svc_info = __bt_gatt_find_gatt_service_from_char(object_path);
-               if (svc_info != NULL) {
-                       read_req.service_handle = g_strdup(svc_info->serv_path);
-                       user_info = _bt_get_user_data(BT_COMMON);
-#ifdef HPS_FEATURE
-                       GVariant *param = NULL;
-#endif
+               read_req.service_handle = svc_info->serv_path;
 
-                       /* Store requets information */
-                       req_info = g_new0(struct gatt_req_info, 1);
-                       req_info->attr_path = g_strdup(object_path);
-                       req_info->svc_path = g_strdup(read_req.service_handle);
-                       req_info->request_id = req_id;
-                       req_info->offset = offset;
-                       req_info->context = invocation;
-                       gatt_requests = g_slist_append(gatt_requests, req_info);
+               /* Store requets information */
+               req_info = g_new0(struct gatt_req_info, 1);
+               req_info->attr_path = g_strdup(object_path);
+               req_info->svc_path = g_strdup(read_req.service_handle);
+               req_info->request_id = req_id;
+               req_info->offset = offset;
+               req_info->context = invocation;
+               gatt_requests = g_slist_append(gatt_requests, req_info);
 
-                       if (user_info != NULL) {
-                               _bt_common_event_cb(
-                                       BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED,
+               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED,
                                        BLUETOOTH_ERROR_NONE, &read_req,
                                        user_info->cb, user_info->user_data);
-                       }
-#ifdef HPS_FEATURE
-                       param = g_variant_new("(sssyq)",
-                                       read_req.att_handle,
-                                       read_req.service_handle,
-                                       read_req.address,
-                                       read_req.req_id,
-                                       read_req.offset);
-                       __bt_send_event_to_hps(BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED, param);
-#endif
-               }
 
-               if (read_req.att_handle)
-                       g_free(read_req.att_handle);
-               if (read_req.address)
-                       g_free(read_req.address);
-               if (read_req.service_handle)
-                       g_free(read_req.service_handle);
+#if defined(TIZEN_FEATURE_BT_HPS) || defined(TIZEN_FEATURE_BT_OTP)
+               param = g_variant_new("(sssyq)",
+                               read_req.att_handle,
+                               read_req.service_handle,
+                               read_req.address,
+                               read_req.req_id,
+                               read_req.offset);
+#ifdef TIZEN_FEATURE_BT_HPS
+               __bt_send_event_to_hps(BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED, param);
+#endif
+#ifdef TIZEN_FEATURE_BT_OTP
+               __bt_send_event_to_otp(BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED, param);
+#endif
+#endif
                return;
        } else if (g_strcmp0(method_name, "WriteValue") == 0) {
                GVariant *var = NULL;
                gchar *addr = NULL;
-               guint8 req_id = 0;
+               guint req_id = 0;
                guint16 offset = 0;
+               gboolean response_needed = FALSE;
                bt_gatt_value_change_t value_change = {0, };
                bt_user_info_t *user_info = NULL;
                int len = 0;
                struct gatt_service_info *svc_info = NULL;
                struct gatt_req_info *req_info = NULL;
-#ifdef HPS_FEATURE
+#if defined(TIZEN_FEATURE_BT_HPS) || defined(TIZEN_FEATURE_BT_OTP)
                GVariant *param = NULL;
 #endif
 
@@ -713,56 +922,69 @@ static void __bt_gatt_char_method_call(GDBusConnection *connection,
                BT_DBG("Application path = %s", object_path);
                BT_DBG("Sender = %s", sender);
 
-               g_variant_get(parameters, "(&syq@ay)", &addr, &req_id, &offset, &var);
+               g_variant_get(parameters, "(&suqb@ay)",
+                               &addr, &req_id, &offset, &response_needed, &var);
+               BT_DBG("Request id = %u, Offset = %u", req_id, offset);
+
+               user_info = _bt_get_user_data(BT_COMMON);
+               if (!user_info) {
+                       BT_INFO("No callback is set for %s", object_path);
+                       g_variant_unref(var);
+                       if (response_needed)
+                               g_dbus_method_invocation_return_value(invocation, NULL);
+                       else
+                               g_object_unref(invocation);
+                       return;
+               }
 
-               value_change.att_handle = g_strdup(object_path);
-               value_change.address = g_strdup(addr);
                svc_info = __bt_gatt_find_gatt_service_from_char(object_path);
                if (svc_info == NULL) {
+                       BT_ERR("Coudn't find service for %s", object_path);
                        g_variant_unref(var);
-                       g_dbus_method_invocation_return_value(invocation, NULL);
+                       if (response_needed)
+                               g_dbus_method_invocation_return_value(invocation, NULL);
+                       else
+                               g_object_unref(invocation);
                        return;
                }
 
-               value_change.service_handle = g_strdup(svc_info->serv_path);
+               value_change.att_handle = (char *)object_path;
+               value_change.address = addr;
+               value_change.service_handle = svc_info->serv_path;
                value_change.offset = offset;
                value_change.req_id = req_id;
+               value_change.response_needed = response_needed;
 
                len = g_variant_get_size(var);
                if (len > 0) {
                        char *data;
 
-                       value_change.att_value = (guint8 *)malloc(len);
-                       if (!value_change.att_value) {
-                               BT_ERR("att_value is NULL");
-                               g_variant_unref(var);
-                               g_dbus_method_invocation_return_value(invocation, NULL);
-                               return;
-                       }
+                       value_change.att_value = (guint8 *)g_malloc(len);
 
                        data = (char *)g_variant_get_data(var);
                        memcpy(value_change.att_value, data, len);
                }
-
                value_change.val_len = len;
 
-               /* Store requets information */
-               req_info = g_new0(struct gatt_req_info, 1);
-               req_info->attr_path = g_strdup(object_path);
-               req_info->svc_path = g_strdup(value_change.service_handle);
-               req_info->request_id = req_id;
-               req_info->offset = offset;
-               req_info->context = invocation;
-               gatt_requests = g_slist_append(gatt_requests, req_info);
-
-               user_info = _bt_get_user_data(BT_COMMON);
-               if (user_info != NULL) {
-                       _bt_common_event_cb(
-                               BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED,
-                               BLUETOOTH_ERROR_NONE, &value_change,
-                               user_info->cb, user_info->user_data);
+               if (response_needed) {
+                       /* Store requets information */
+                       req_info = g_new0(struct gatt_req_info, 1);
+                       req_info->attr_path = g_strdup(object_path);
+                       req_info->svc_path = g_strdup(value_change.service_handle);
+                       req_info->request_id = req_id;
+                       req_info->offset = offset;
+                       req_info->context = invocation;
+                       gatt_requests = g_slist_append(gatt_requests, req_info);
+               } else {
+                       g_object_unref(invocation);
                }
-#ifdef HPS_FEATURE
+
+               _bt_common_event_cb(
+                       BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED,
+                       BLUETOOTH_ERROR_NONE, &value_change,
+                       user_info->cb, user_info->user_data);
+
+#if defined(TIZEN_FEATURE_BT_HPS) || defined(TIZEN_FEATURE_BT_OTP)
                if (len > 0) {
                        gchar *svc_path;
                        svc_path = g_strdup(svc_info->serv_path);
@@ -773,54 +995,85 @@ static void __bt_gatt_char_method_call(GDBusConnection *connection,
                                        req_id,
                                        offset,
                                        var);
+#ifdef TIZEN_FEATURE_BT_HPS
                        __bt_send_event_to_hps(BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED, param);
+#endif
+#ifdef TIZEN_FEATURE_BT_OTP
+                       __bt_send_event_to_otp(BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED, param);
+#endif
                        if (svc_path)
                                g_free(svc_path);
                }
 #endif
+
+               g_free(value_change.att_value);
                g_variant_unref(var);
                return;
        } else if (g_strcmp0(method_name, "StartNotify") == 0) {
                bt_user_info_t *user_info = NULL;
                bt_gatt_char_notify_change_t notify_change = {0, };
+#if TIZEN_FEATURE_BT_OTP
+               GVariant *param = NULL;
+#endif
                BT_DBG("StartNotify");
                user_info = _bt_get_user_data(BT_COMMON);
                if (user_info != NULL) {
                        struct gatt_service_info *svc_info = NULL;
                        svc_info = __bt_gatt_find_gatt_service_from_char(object_path);
                        if (svc_info) {
-                               notify_change.service_handle = g_strdup(svc_info->serv_path);
-                               notify_change.att_handle = g_strdup(object_path);
+                               notify_change.service_handle = svc_info->serv_path;
+                               notify_change.att_handle = (char *)object_path;
                                notify_change.att_notify = TRUE;
                                _bt_common_event_cb(
                                        BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_STATE_CHANGED,
                                        BLUETOOTH_ERROR_NONE, &notify_change,
                                        user_info->cb, user_info->user_data);
+#if TIZEN_FEATURE_BT_OTP
+                               param = g_variant_new("(ssb)",
+                               notify_change.att_handle,
+                               notify_change.service_handle,
+                               notify_change.att_notify);
+                               __bt_send_event_to_otp(BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_STATE_CHANGED, param);
+#endif
                        }
                }
+               g_object_unref(invocation);
+               return;
        } else if (g_strcmp0(method_name, "StopNotify") == 0) {
                bt_user_info_t *user_info = NULL;
                bt_gatt_char_notify_change_t notify_change = {0, };
+#if TIZEN_FEATURE_BT_OTP
+               GVariant *param = NULL;
+#endif
                BT_DBG("StopNotify");
                user_info = _bt_get_user_data(BT_COMMON);
                if (user_info != NULL) {
                        struct gatt_service_info *svc_info = NULL;
                        svc_info = __bt_gatt_find_gatt_service_from_char(object_path);
                        if (svc_info) {
-                               notify_change.service_handle = g_strdup(svc_info->serv_path);
-                               notify_change.att_handle = g_strdup(object_path);
+                               notify_change.service_handle = svc_info->serv_path;
+                               notify_change.att_handle = (char *)object_path;
                                notify_change.att_notify = FALSE;
                                _bt_common_event_cb(
                                        BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_STATE_CHANGED,
                                        BLUETOOTH_ERROR_NONE, &notify_change,
                                        user_info->cb, user_info->user_data);
+#if TIZEN_FEATURE_BT_OTP
+                               param = g_variant_new("(ssb)",
+                               notify_change.att_handle,
+                               notify_change.service_handle,
+                               notify_change.att_notify);
+                               __bt_send_event_to_otp(BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_STATE_CHANGED, param);
+#endif
                        }
                }
+               g_object_unref(invocation);
+               return;
        } else if (g_strcmp0(method_name, "IndicateConfirm") == 0) {
                gchar *addr = NULL;
                bt_gatt_indicate_confirm_t confirm = {0, };
                bt_user_info_t *user_info = NULL;
-               gboolean complete = 0;
+               gboolean complete = FALSE;
                struct gatt_service_info *svc_info = NULL;
 
                BT_DBG("IndicateConfirm");
@@ -828,17 +1081,17 @@ static void __bt_gatt_char_method_call(GDBusConnection *connection,
                BT_DBG("Sender = %s", sender);
 
                g_variant_get(parameters, "(&sb)", &addr, &complete);
-
                BT_DBG("Remote Device address number = %s", addr);
-               confirm.att_handle = g_strdup(object_path);
-               confirm.address = g_strdup(addr);
+
+               confirm.att_handle = (char *)object_path;
+               confirm.address = addr;
                confirm.complete = complete;
 
                svc_info = __bt_gatt_find_gatt_service_from_char(object_path);
                if (svc_info != NULL) {
-                       confirm.service_handle = g_strdup(svc_info->serv_path);
-                       user_info = _bt_get_user_data(BT_COMMON);
+                       confirm.service_handle = svc_info->serv_path;
 
+                       user_info = _bt_get_user_data(BT_COMMON);
                        if (user_info != NULL) {
                                _bt_common_event_cb(
                                        BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_COMPLETED,
@@ -847,6 +1100,7 @@ static void __bt_gatt_char_method_call(GDBusConnection *connection,
                        }
                }
        }
+
        g_dbus_method_invocation_return_value(invocation, NULL);
 }
 
@@ -861,62 +1115,61 @@ static void __bt_gatt_desc_method_call(GDBusConnection *connection,
 {
        if (g_strcmp0(method_name, "ReadValue") == 0) {
                gchar *addr = NULL;
-               guint8 req_id = 1;
+               guint req_id = 0;
                guint16 offset = 0;
                bt_gatt_read_req_t read_req = {0, };
                bt_user_info_t *user_info = NULL;
                struct gatt_req_info *req_info = NULL;
                struct gatt_service_info *svc_info = NULL;
-               BT_DBG("ReadValue");
-
-               g_variant_get(parameters, "(&syq)", &addr, &req_id, &offset);
 
+               BT_DBG("ReadValue");
                BT_DBG("Application path = %s", object_path);
+               BT_DBG("Sender = %s", sender);
 
-               BT_DBG("Remote Device address number = %s", addr);
-               BT_DBG("Request id = %d, Offset = %d", req_id, offset);
+               user_info = _bt_get_user_data(BT_COMMON);
+               if (user_info == NULL) {
+                       BT_INFO("No callback is set for %s", object_path);
+                       g_dbus_method_invocation_return_value(invocation, NULL);
+                       return;
+               }
 
-               BT_DBG("Sender = %s", sender);
+               svc_info = __bt_gatt_find_gatt_service_from_desc(object_path);
+               if (svc_info == NULL) {
+                       BT_ERR("Coudn't find service for %s", object_path);
+                       g_dbus_method_invocation_return_value(invocation, NULL);
+                       return;
+               }
 
-               read_req.att_handle = g_strdup(object_path);
-               read_req.address = g_strdup(addr);
+               g_variant_get(parameters, "(&suq)", &addr, &req_id, &offset);
+               BT_DBG("Request id = %u, Offset = %u", req_id, offset);
+
+               read_req.att_handle = (char *)object_path;
+               read_req.address = addr;
                read_req.req_id = req_id;
                read_req.offset = offset;
-               svc_info = __bt_gatt_find_gatt_service_from_desc(object_path);
-               if (svc_info != NULL) {
-                       read_req.service_handle = g_strdup(svc_info->serv_path);
-                       user_info = _bt_get_user_data(BT_COMMON);
-
-                       /* Store requets information */
-                       req_info = g_new0(struct gatt_req_info, 1);
-                       req_info->attr_path = g_strdup(object_path);
-                       req_info->svc_path = g_strdup(read_req.service_handle);
-                       req_info->request_id = req_id;
-                       req_info->offset = offset;
-                       req_info->context = invocation;
-                       gatt_requests = g_slist_append(gatt_requests, req_info);
+               read_req.service_handle = svc_info->serv_path;
 
-                       if (user_info != NULL) {
-                               _bt_common_event_cb(
-                                       BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED,
-                                       BLUETOOTH_ERROR_NONE, &read_req,
-                                       user_info->cb, user_info->user_data);
-                       }
-               }
+               /* Store requets information */
+               req_info = g_new0(struct gatt_req_info, 1);
+               req_info->attr_path = g_strdup(object_path);
+               req_info->svc_path = g_strdup(read_req.service_handle);
+               req_info->request_id = req_id;
+               req_info->offset = offset;
+               req_info->context = invocation;
+               gatt_requests = g_slist_append(gatt_requests, req_info);
 
-               if (read_req.att_handle)
-                       g_free(read_req.att_handle);
-               if (read_req.address)
-                       g_free(read_req.address);
-               if (read_req.service_handle)
-                       g_free(read_req.service_handle);
+               _bt_common_event_cb(
+                               BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED,
+                               BLUETOOTH_ERROR_NONE, &read_req,
+                               user_info->cb, user_info->user_data);
 
                return;
        } else if (g_strcmp0(method_name, "WriteValue") == 0) {
                GVariant *var = NULL;
                gchar *addr = NULL;
-               guint8 req_id = 0;
+               guint req_id = 0;
                guint16 offset = 0;
+               gboolean response_needed = FALSE;
                bt_gatt_value_change_t value_change = {0, };
                bt_user_info_t *user_info = NULL;
                int len = 0;
@@ -927,58 +1180,72 @@ static void __bt_gatt_desc_method_call(GDBusConnection *connection,
                BT_DBG("Application path = %s", object_path);
                BT_DBG("Sender = %s", sender);
 
-               g_variant_get(parameters, "(&syq@ay)", &addr, &req_id, &offset, &var);
+               g_variant_get(parameters, "(&suqb@ay)",
+                               &addr, &req_id, &offset, &response_needed, &var);
+               BT_DBG("Request id = %u, Offset = %u", req_id, offset);
+
+               user_info = _bt_get_user_data(BT_COMMON);
+               if (user_info == NULL) {
+                       BT_INFO("No callback is set for %s", object_path);
+                       g_variant_unref(var);
+                       if (response_needed)
+                               g_dbus_method_invocation_return_value(invocation, NULL);
+                       else
+                               g_object_unref(invocation);
+                       return;
+               }
 
-               value_change.att_handle = g_strdup(object_path);
-               value_change.address = g_strdup(addr);
                svc_info = __bt_gatt_find_gatt_service_from_desc(object_path);
                if (svc_info == NULL) {
+                       BT_ERR("Coudn't find service for %s", object_path);
                        g_variant_unref(var);
-                       g_dbus_method_invocation_return_value(invocation, NULL);
+                       if (response_needed)
+                               g_dbus_method_invocation_return_value(invocation, NULL);
+                       else
+                               g_object_unref(invocation);
                        return;
                }
 
-               value_change.service_handle = g_strdup(svc_info->serv_path);
+               value_change.att_handle = (char *)object_path;
+               value_change.address = addr;
+               value_change.service_handle = svc_info->serv_path;
                value_change.offset = offset;
                value_change.req_id = req_id;
+               value_change.response_needed = response_needed;
 
                len = g_variant_get_size(var);
                if (len > 0) {
                        char *data;
 
-                       value_change.att_value = (guint8 *)malloc(len);
-                       if (!value_change.att_value) {
-                               BT_ERR("att_value is NULL");
-                               g_variant_unref(var);
-                               g_dbus_method_invocation_return_value(invocation, NULL);
-                               return;
-                       }
+                       value_change.att_value = (guint8 *)g_malloc(len);
+
                        data = (char *)g_variant_get_data(var);
                        memcpy(value_change.att_value, data, len);
                }
-               g_variant_unref(var);
-
                value_change.val_len = len;
 
-               /* Store requets information */
-               req_info = g_new0(struct gatt_req_info, 1);
-               req_info->attr_path = g_strdup(object_path);
-               req_info->svc_path = g_strdup(value_change.service_handle);
-               req_info->request_id = req_id;
-               req_info->offset = offset;
-               req_info->context = invocation;
-               gatt_requests = g_slist_append(gatt_requests, req_info);
-
-               user_info = _bt_get_user_data(BT_COMMON);
-               if (user_info != NULL) {
-                       _bt_common_event_cb(
-                               BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED,
-                               BLUETOOTH_ERROR_NONE, &value_change,
-                               user_info->cb, user_info->user_data);
+               if (response_needed) {
+                       /* Store requets information */
+                       req_info = g_new0(struct gatt_req_info, 1);
+                       req_info->attr_path = g_strdup(object_path);
+                       req_info->svc_path = g_strdup(value_change.service_handle);
+                       req_info->request_id = req_id;
+                       req_info->offset = offset;
+                       req_info->context = invocation;
+                       gatt_requests = g_slist_append(gatt_requests, req_info);
+               } else {
+                       g_object_unref(invocation);
                }
+
+               _bt_common_event_cb(
+                       BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED,
+                       BLUETOOTH_ERROR_NONE, &value_change,
+                       user_info->cb, user_info->user_data);
+
+               g_free(value_change.att_value);
+               g_variant_unref(var);
                return;
        }
-       g_dbus_method_invocation_return_value(invocation, NULL);
 }
 
 gboolean __bt_gatt_emit_interface_removed(gchar *object_path, gchar *interface)
@@ -1015,24 +1282,28 @@ static const GDBusInterfaceVTable desc_interface_vtable = {
        __bt_gatt_desc_method_call,
        NULL,
        NULL,
+       { 0 }
 };
 
 static const GDBusInterfaceVTable char_interface_vtable = {
        __bt_gatt_char_method_call,
        NULL,
        NULL,
+       { 0 }
 };
 
 static const GDBusInterfaceVTable serv_interface_vtable = {
        NULL,
        NULL,
        NULL,
+       { 0 }
 };
 
 static const GDBusInterfaceVTable manager_interface_vtable = {
        __bt_gatt_manager_method_call,
        NULL,
-       NULL
+       NULL,
+       { 0 }
 };
 
 static GDBusNodeInfo *__bt_gatt_create_method_node_info(
@@ -1134,9 +1405,8 @@ static struct gatt_req_info *__bt_gatt_find_request_info(guint request_id)
        for (l = gatt_requests; l != NULL; l = l->next) {
                struct gatt_req_info *req_info = l->data;
 
-               if (req_info && req_info->request_id == request_id) {
+               if (req_info && req_info->request_id == request_id)
                        return req_info;
-               }
        }
        BT_ERR("Gatt Request not found");
        return NULL;
@@ -1185,111 +1455,6 @@ static GDBusProxy *__bt_gatt_gdbus_get_manager_proxy(const gchar *service,
                                path, interface);
 }
 
-int bluetooth_gatt_convert_prop2string(
-                       bt_gatt_characteristic_property_t properties,
-                       char *char_properties[])
-{
-       int flag_count = 0;
-
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_BROADCAST) {
-               char_properties[flag_count] = g_strdup("broadcast");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ) {
-               char_properties[flag_count] = g_strdup("read");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE_NO_RESPONSE) {
-               char_properties[flag_count] = g_strdup("write-without-response");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE) {
-               char_properties[flag_count] = g_strdup("write");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_NOTIFY) {
-               char_properties[flag_count] = g_strdup("notify");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_INDICATE) {
-               char_properties[flag_count] = g_strdup("indicate");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_SIGNED_WRITE) {
-               char_properties[flag_count] = g_strdup("authenticated-signed-writes");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_RELIABLE_WRITE) {
-               char_properties[flag_count] = g_strdup("reliable-write");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITABLE_AUXILIARIES) {
-               char_properties[flag_count] = g_strdup("writable-auxiliaries");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_READ) {
-               char_properties[flag_count] = g_strdup("encrypt-read");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_WRITE) {
-               char_properties[flag_count] = g_strdup("encrypt-write");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_READ) {
-               char_properties[flag_count] = g_strdup("encrypt-authenticated-read");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_ENCRYPT_AUTHENTICATED_WRITE) {
-               char_properties[flag_count] = g_strdup("encrypt-authenticated-write");
-               flag_count++;
-       }
-
-       if (flag_count == 0) {
-               char_properties[flag_count] = g_strdup("read");
-               flag_count++;
-       }
-
-       return flag_count;
-}
-
-int bluetooth_gatt_convert_perm2string(
-                       bt_gatt_permission_t properties,
-                       char *char_properties[])
-{
-       int flag_count = 0;
-
-       if (properties & BLUETOOTH_GATT_PERMISSION_READ) {
-               char_properties[flag_count] = g_strdup("read");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_PERMISSION_WRITE) {
-               char_properties[flag_count] = g_strdup("write");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_READ) {
-               char_properties[flag_count] = g_strdup("encrypt-read");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_WRITE) {
-               char_properties[flag_count] = g_strdup("encrypt-write");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_AUTHENTICATED_READ) {
-               char_properties[flag_count] = g_strdup("encrypt-authenticated-read");
-               flag_count++;
-       }
-       if (properties & BLUETOOTH_GATT_PERMISSION_ENCRYPT_AUTHENTICATED_WRITE) {
-               char_properties[flag_count] = g_strdup("encrypt-authenticated-write");
-               flag_count++;
-       }
-
-       if (flag_count == 0) {
-               char_properties[flag_count] = g_strdup("read");
-               flag_count++;
-       }
-
-       return flag_count;
-}
 
 static void __bt_gatt_set_service_state(const char *service_path,
                        gboolean state)
@@ -1335,7 +1500,7 @@ void get_service_cb(GObject *object, GAsyncResult *res, gpointer user_data)
        int n_char = 1;
 
        BT_DBG(" ");
-       result = g_dbus_proxy_call_finish(manager_gproxy, res, &error);
+       result = g_dbus_proxy_call_finish(G_DBUS_PROXY(object), res, &error);
 
        if (result == NULL) {
                /* dBUS-RPC is failed */
@@ -1385,41 +1550,25 @@ void register_application_cb(GObject *object, GAsyncResult *res, gpointer user_d
 
        register_pending_cnt = 0;
 
-       result = g_dbus_proxy_call_finish(manager_gproxy, res, &error);
-
-       if (result == NULL) {
-               /* dBUS-RPC is failed */
-               BT_ERR("Dbus-RPC is failed\n");
-
-               if (error != NULL) {
-               /* dBUS gives error cause */
-                       BT_ERR("D-Bus API failure: errCode[%x], message[%s]\n",
-                                               error->code, error->message);
-                       g_clear_error(&error);
-               }
+       if (register_cancel) {
+               g_object_unref(register_cancel);
+               register_cancel = NULL;
        }
-}
-
-void unregister_application_cb(GObject *object, GAsyncResult *res,
-               gpointer user_data)
-{
-       BT_INFO("UnregisterApplication is completed");
-
-       GError *error = NULL;
-       GVariant *result;
 
-       result = g_dbus_proxy_call_finish(manager_gproxy, res, &error);
+       result = g_dbus_proxy_call_finish(G_DBUS_PROXY(object), res, &error);
 
        if (result == NULL) {
                /* dBUS-RPC is failed */
                BT_ERR("Dbus-RPC is failed\n");
 
                if (error != NULL) {
-                       /* dBUS gives error cause */
+               /* dBUS gives error cause */
                        BT_ERR("D-Bus API failure: errCode[%x], message[%s]\n",
-                                       error->code, error->message);
+                                               error->code, error->message);
                        g_clear_error(&error);
                }
+       } else {
+               g_variant_unref(result);
        }
 }
 
@@ -1438,6 +1587,9 @@ BT_EXPORT_API int bluetooth_gatt_unregister_application(void)
        GDBusProxy *proxy = NULL;
 
        if (is_server_started) {
+               GVariant *ret;
+               GError *err = NULL;
+
                proxy = __bt_gatt_gdbus_get_manager_proxy("org.bluez",
                                "/org/bluez/hci0", GATT_MNGR_INTERFACE);
 
@@ -1446,17 +1598,32 @@ BT_EXPORT_API int bluetooth_gatt_unregister_application(void)
 
                BT_INFO("UnregisterApplication");
 
+               is_server_started = false;
+
                /* Async Call to Unregister Service */
-               g_dbus_proxy_call(proxy,
+               ret = g_dbus_proxy_call_sync(proxy,
                                "UnregisterApplication",
                                g_variant_new("(o)",
                                        app_path),
                                G_DBUS_CALL_FLAGS_NONE, -1,
-                               NULL,
-                               (GAsyncReadyCallback) unregister_application_cb,
-                               NULL);
+                               NULL, &err);
+
+               if (ret == NULL) {
+                       /* dBUS-RPC is failed */
+                       BT_ERR("dBUS-RPC is failed");
+                       if (err != NULL) {
+                               /* dBUS gives error cause */
+                               BT_ERR("D-Bus API failure: errCode[%x], message[%s]",
+                               err->code, err->message);
+
+                               g_clear_error(&err);
+                       }
+                       return BLUETOOTH_ERROR_INTERNAL;
+               }
+               g_variant_unref(ret);
+
+               BT_INFO("UnregisterApplication is completed");
 
-               is_server_started = false;
                return BLUETOOTH_ERROR_NONE;
        }
 
@@ -1486,6 +1653,7 @@ static GDBusConnection *__bt_gatt_get_gdbus_connection(void)
                                        NULL, /* GDBusAuthObserver */
                                        NULL,
                                        &err);
+               g_free(address);
                if (!g_conn) {
                        if (err) {
                                BT_ERR("Unable to connect to dbus: %s", err->message);
@@ -1509,7 +1677,7 @@ static GDBusConnection *__bt_gatt_get_gdbus_connection(void)
                                        NULL, /* GDBusAuthObserver */
                                        NULL,
                                        &err);
-
+               g_free(address);
                if (!local_system_gconn) {
                        BT_ERR("Unable to connect to dbus: %s", err->message);
                        g_clear_error(&err);
@@ -1553,7 +1721,6 @@ BT_EXPORT_API int bluetooth_gatt_init(void)
        /* Register ObjectManager interface */
        node_info = __bt_gatt_create_method_node_info(
                                        manager_introspection_xml);
-
        if (node_info == NULL) {
                BT_ERR("failed to get node info");
                goto failed;
@@ -1567,7 +1734,7 @@ BT_EXPORT_API int bluetooth_gatt_init(void)
                                                        &manager_interface_vtable,
                                                        NULL, NULL, &error);
        }
-
+       g_dbus_node_info_unref(node_info);
        if (manager_id == 0) {
                BT_ERR("failed to register: %s", error->message);
                g_error_free(error);
@@ -1593,6 +1760,13 @@ failed:
 BT_EXPORT_API int bluetooth_gatt_deinit()
 {
        int ret = BLUETOOTH_ERROR_NONE;
+
+       if (register_cancel) {
+               g_cancellable_cancel(register_cancel);
+               g_object_unref(register_cancel);
+               register_cancel = NULL;
+       }
+
        /* Unown gdbus bus */
        if (owner_id) {
                /* remove/unregister all services */
@@ -1648,7 +1822,6 @@ BT_EXPORT_API int bluetooth_gatt_add_service(const char *svc_uuid,
 
        node_info = __bt_gatt_create_method_node_info(
                                        service_introspection_xml);
-
        if (node_info == NULL)
                return BLUETOOTH_ERROR_INTERNAL;
 
@@ -1659,6 +1832,7 @@ BT_EXPORT_API int bluetooth_gatt_add_service(const char *svc_uuid,
                                        node_info->interfaces[0],
                                        &serv_interface_vtable,
                                        NULL, NULL, &error);
+       g_dbus_node_info_unref(node_info);
 
        if (object_id == 0) {
                BT_ERR("failed to register: %s", error->message);
@@ -1705,6 +1879,12 @@ BT_EXPORT_API int bluetooth_gatt_add_service(const char *svc_uuid,
                                g_variant_new("(oa{sa{sv}})",
                                path, builder),
                                &error);
+       if (error != NULL) {
+               /* dbus gives error cause */
+               BT_ERR("d-bus api failure: errcode[%x], message[%s]",
+                               error->code, error->message);
+               g_clear_error(&error);
+       }
 
        new_service = TRUE;
 
@@ -1751,8 +1931,7 @@ BT_EXPORT_API int bluetooth_gatt_add_new_characteristic(
                return BLUETOOTH_ERROR_INVALID_PARAM;
 
        node_info = __bt_gatt_create_method_node_info(
-                                       characteristics_introspection_xml);
-
+                       characteristics_introspection_xml);
        if (node_info == NULL)
                return BLUETOOTH_ERROR_INTERNAL;
 
@@ -1760,9 +1939,10 @@ BT_EXPORT_API int bluetooth_gatt_add_new_characteristic(
        BT_DBG("gatt characteristic path is [%s]", path);
 
        object_id = g_dbus_connection_register_object(g_conn, path,
-                                       node_info->interfaces[0],
-                                       &char_interface_vtable,
-                                       NULL, NULL, &error);
+                       node_info->interfaces[0],
+                       &char_interface_vtable,
+                       NULL, NULL, &error);
+       g_dbus_node_info_unref(node_info);
 
        if (object_id == 0) {
                BT_ERR("failed to register: %s", error->message);
@@ -1789,9 +1969,9 @@ BT_EXPORT_API int bluetooth_gatt_add_new_characteristic(
        char_info->char_id = object_id;
        char_info->char_uuid = g_strdup(char_uuid);
 
-       for (i = 0; i < flag_count; i++) {
+       for (i = 0; i < flag_count; i++)
                char_info->char_flags[i] = char_flags[i];
-               }
+
 
        char_info->flags_length = flag_count;
 
@@ -1801,35 +1981,41 @@ BT_EXPORT_API int bluetooth_gatt_add_new_characteristic(
        inner_builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
 
        g_variant_builder_add(inner_builder, "{sv}", "UUID",
-                               g_variant_new("s", char_uuid));
+                       g_variant_new("s", char_uuid));
        g_variant_builder_add(inner_builder, "{sv}", "Service",
-                               g_variant_new("o", svc_path));
+                       g_variant_new("o", svc_path));
 
        builder2 = g_variant_builder_new(G_VARIANT_TYPE("as"));
 
-       for (i = 0; i < flag_count; i++) {
+       for (i = 0; i < flag_count; i++)
                g_variant_builder_add(builder2, "s", char_flags[i]);
-       }
 
        flags_val = g_variant_new("as", builder2);
        g_variant_builder_add(inner_builder, "{sv}", "Flags",
-                               flags_val);
+                       flags_val);
 
        builder3 = g_variant_builder_new(G_VARIANT_TYPE("ao"));
 
        g_variant_builder_add(inner_builder, "{sv}", "Descriptors",
-                               g_variant_new("ao", builder3));
+                       g_variant_new("ao", builder3));
 
        g_variant_builder_add(builder, "{sa{sv}}",
-                               GATT_CHAR_INTERFACE,
-                               inner_builder);
+                       GATT_CHAR_INTERFACE,
+                       inner_builder);
 
        g_dbus_connection_emit_signal(g_conn, NULL, "/",
-                               "org.freedesktop.Dbus.ObjectManager",
-                               "InterfacesAdded",
-                               g_variant_new("(oa{sa{sv}})",
+                       "org.freedesktop.Dbus.ObjectManager",
+                       "InterfacesAdded",
+                       g_variant_new("(oa{sa{sv}})",
                                path, builder),
-                               &error);
+                       &error);
+
+       if (error) {
+               /* dBUS gives error cause */
+               BT_ERR("Could not Emit Signal: errCode[%x], message[%s]",
+                               error->code, error->message);
+               g_clear_error(&error);
+       }
 
        *char_path = g_strdup(path);
 
@@ -1888,12 +2074,11 @@ BT_EXPORT_API int bluetooth_gatt_set_characteristic_value(
 
        builder1 = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
 
-       for (i = 0; i < value_length; i++) {
+       for (i = 0; i < value_length; i++)
                g_variant_builder_add(builder1, "y", char_value[i]);
-       }
 
        char_val = g_variant_new("ay", builder1);
-               g_variant_builder_add(inner_builder, "{sv}", "Value", char_val);
+       g_variant_builder_add(inner_builder, "{sv}", "Value", char_val);
 
        g_variant_builder_add(builder, "{sa{sv}}",
                        GATT_CHAR_INTERFACE,
@@ -1903,9 +2088,15 @@ BT_EXPORT_API int bluetooth_gatt_set_characteristic_value(
                        "org.freedesktop.Dbus.ObjectManager",
                        "InterfacesAdded",
                        g_variant_new("(oa{sa{sv}})",
-                       char_info->char_path, builder),
+                               char_info->char_path, builder),
                        &error);
 
+       if (error) {
+               /* dBUS gives error cause */
+               BT_ERR("Could not Emit Signal: errCode[%x], message[%s]",
+                               error->code, error->message);
+               g_clear_error(&error);
+       }
        g_variant_builder_unref(inner_builder);
        g_variant_builder_unref(builder);
        g_variant_builder_unref(builder1);
@@ -1955,7 +2146,6 @@ BT_EXPORT_API int bluetooth_gatt_add_descriptor(
 
        node_info = __bt_gatt_create_method_node_info(
                                        descriptor_introspection_xml);
-
        if (node_info == NULL) {
                g_strfreev(line_argv);
                g_free(serv_path);
@@ -1969,6 +2159,7 @@ BT_EXPORT_API int bluetooth_gatt_add_descriptor(
                                node_info->interfaces[0],
                                &desc_interface_vtable,
                                NULL, NULL, &error);
+       g_dbus_node_info_unref(node_info);
 
        if (object_id == 0) {
                BT_ERR("failed to register: %s", error->message);
@@ -1988,9 +2179,8 @@ BT_EXPORT_API int bluetooth_gatt_add_descriptor(
        desc_info->desc_id = object_id;
        desc_info->desc_uuid = g_strdup(desc_uuid);
 
-       for (i = 0; i < flag_count; i++) {
+       for (i = 0; i < flag_count; i++)
                desc_info->desc_flags[i] = desc_flags[i];
-               }
 
        desc_info->flags_length = flag_count;
 
@@ -2006,9 +2196,8 @@ BT_EXPORT_API int bluetooth_gatt_add_descriptor(
 
        builder2 = g_variant_builder_new(G_VARIANT_TYPE("as"));
 
-       for (i = 0; i < flag_count; i++) {
+       for (i = 0; i < flag_count; i++)
                g_variant_builder_add(builder2, "s", desc_flags[i]);
-       }
 
        flags_val = g_variant_new("as", builder2);
        g_variant_builder_add(inner_builder, "{sv}", "Flags",
@@ -2024,6 +2213,12 @@ BT_EXPORT_API int bluetooth_gatt_add_descriptor(
                                g_variant_new("(oa{sa{sv}})",
                                path, builder),
                                &error);
+       if (error) {
+               /* dBUS gives error cause */
+               BT_ERR("Could not Emit Signal: errCode[%x], message[%s]",
+                               error->code, error->message);
+               g_clear_error(&error);
+       }
 
        *desc_path = g_strdup(path);
 
@@ -2032,6 +2227,7 @@ BT_EXPORT_API int bluetooth_gatt_add_descriptor(
        g_strfreev(line_argv);
        g_variant_builder_unref(inner_builder);
        g_variant_builder_unref(builder);
+       g_variant_builder_unref(builder2);
 
        return BLUETOOTH_ERROR_NONE;
 }
@@ -2080,22 +2276,29 @@ BT_EXPORT_API int bluetooth_gatt_set_descriptor_value(
 
        builder1 = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
 
-       for (i = 0; i < value_length; i++) {
+       for (i = 0; i < value_length; i++)
                g_variant_builder_add(builder1, "y", desc_value[i]);
-       }
+
        desc_val = g_variant_new("ay", builder1);
        g_variant_builder_add(inner_builder, "{sv}", "Value", desc_val);
 
        g_variant_builder_add(builder, "{sa{sv}}",
-                               GATT_DESC_INTERFACE,
-                               inner_builder);
+                       GATT_DESC_INTERFACE,
+                       inner_builder);
 
        g_dbus_connection_emit_signal(g_conn, NULL, "/",
-                               "org.freedesktop.Dbus.ObjectManager",
-                               "InterfacesAdded",
-                               g_variant_new("(oa{sa{sv}})",
+                       "org.freedesktop.Dbus.ObjectManager",
+                       "InterfacesAdded",
+                       g_variant_new("(oa{sa{sv}})",
                                desc_info->desc_path, builder),
-                               &error);
+                       &error);
+
+       if (error != NULL) {
+               BT_ERR("D-Bus API failure: errCode[%x], \
+                               message[%s]",
+                               error->code, error->message);
+               g_clear_error(&error);
+       }
 
        g_variant_builder_unref(inner_builder);
        g_variant_builder_unref(builder);
@@ -2170,12 +2373,19 @@ BT_EXPORT_API int bluetooth_gatt_register_application(void)
 
                BT_INFO("RegisterApplication");
 
+               if (register_cancel) {
+                       g_cancellable_cancel(register_cancel);
+                       g_object_unref(register_cancel);
+               }
+
+               register_cancel = g_cancellable_new();
+
                g_dbus_proxy_call(proxy,
                                "RegisterApplication",
                                g_variant_new("(oa{sv})",
                                        app_path, NULL),
                                G_DBUS_CALL_FLAGS_NONE, -1,
-                               NULL,
+                               register_cancel,
                                (GAsyncReadyCallback) register_application_cb,
                                NULL);
 
@@ -2202,7 +2412,7 @@ BT_EXPORT_API int bluetooth_gatt_delete_services(void)
                        if (bluetooth_gatt_unregister_service(info->serv_path)
                                        != BLUETOOTH_ERROR_NONE) {
                                error = BLUETOOTH_ERROR_INTERNAL;
-                               BT_DBG(" Error in removing service %s \n",
+                               BT_ERR("Error in removing service %s \n",
                                                 info->serv_path);
                        }
                }
@@ -2235,6 +2445,7 @@ BT_EXPORT_API int bluetooth_gatt_update_characteristic(
        int i = 0;
        gchar **line_argv = NULL;
        gchar *serv_path = NULL;
+       const char *value = NULL;
 
        line_argv = g_strsplit_set(char_path, "/", 0);
        serv_path = g_strdup_printf("/%s/%s/%s", line_argv[1], line_argv[2], line_argv[3]);
@@ -2250,13 +2461,11 @@ BT_EXPORT_API int bluetooth_gatt_update_characteristic(
        invalidated_builder = g_variant_builder_new(G_VARIANT_TYPE("as"));
 
        inner_builder = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
-       for (i = 0; i < value_length; i++) {
+       for (i = 0; i < value_length; i++)
                g_variant_builder_add(inner_builder, "y", char_value[i]);
-       }
 
        update_value = g_variant_new("ay", inner_builder);
 
-       outer_builder = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
        g_variant_builder_add(outer_builder, "{sv}", "Value",
                                        update_value);
 
@@ -2294,11 +2503,21 @@ BT_EXPORT_API int bluetooth_gatt_update_characteristic(
 
                char_info->value_length = value_length;
 
-               char_info->char_value = (char *)realloc(char_info->char_value, value_length);
+               value = (char *)realloc(char_info->char_value, value_length);
+               if (value == NULL) {
+                       g_free(serv_path);
+                       g_strfreev(line_argv);
+                       g_variant_builder_unref(inner_builder);
+                       g_variant_builder_unref(outer_builder);
+                       g_variant_builder_unref(invalidated_builder);
+
+                       return BLUETOOTH_ERROR_MEMORY_ALLOCATION;
+               }
+
+               char_info->char_value = (char*)value;
                if (char_info->char_value) {
-                       for (i = 0; i < value_length; i++) {
+                       for (i = 0; i < value_length; i++)
                                char_info->char_value[i] = char_value[i];
-                       }
                }
        }
 
@@ -2372,7 +2591,7 @@ BT_EXPORT_API int bluetooth_gatt_unregister_service(const char *svc_path)
 
        err = __bt_gatt_unregister_service(svc_path);
        if (err != BLUETOOTH_ERROR_NONE) {
-               BT_DBG("Could not unregister application");
+               BT_ERR("Could not unregister application");
                return err;
        }
 
@@ -2432,9 +2651,8 @@ BT_EXPORT_API int bluetooth_gatt_unregister_service(const char *svc_path)
        }
 
        ret = g_dbus_connection_unregister_object(g_conn, svc_info->prop_id);
-       if (ret) {
+       if (ret)
                BT_DBG("Unregistered the service on properties interface");
-       }
 
        /* list remove & free */
        gatt_services = g_slist_remove(gatt_services, svc_info);
@@ -2442,11 +2660,10 @@ BT_EXPORT_API int bluetooth_gatt_unregister_service(const char *svc_path)
 
        new_service = FALSE;
 
-       if (gatt_services == NULL) {
+       if (gatt_services == NULL)
                serv_id = 1;
-       } else if (gatt_services->next == NULL) {
+       else if (gatt_services->next == NULL)
                serv_id--;
-       }
 
        return err;
 }
@@ -2463,37 +2680,18 @@ BT_EXPORT_API int bluetooth_gatt_send_response(int request_id, guint req_type,
        }
 
        req_info = __bt_gatt_find_request_info(request_id);
+       if (req_info == NULL) {
+               BT_ERR("Coundn't find request id [%d]", request_id);
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
 
-       if (req_info) {
-               if (resp_state != BLUETOOTH_ERROR_NONE) {
-                       g_dbus_method_invocation_return_dbus_error(req_info->context,
-                                               "org.bluez.Error.Failed", "Application Error");
-
-                       gatt_requests = g_slist_remove(gatt_requests, req_info);
-
-                       req_info->context = NULL;
-                       if (req_info->attr_path)
-                               g_free(req_info->attr_path);
-                       if (req_info->svc_path)
-                               g_free(req_info->svc_path);
-                       g_free(req_info);
+       if (resp_state != BLUETOOTH_ATT_ERROR_NONE) {
+               BT_ERR("resp_state is 0x%X", resp_state);
+               char err_msg[20] = { 0, };
+               g_snprintf(err_msg, sizeof(err_msg), "ATT error: 0x%02x", resp_state);
+               g_dbus_method_invocation_return_dbus_error(req_info->context,
+                                               "org.bluez.Error.Failed", err_msg);
 
-                       return BLUETOOTH_ERROR_NONE;
-               }
-               if (req_type == BLUETOOTH_GATT_ATT_REQUEST_TYPE_READ) {
-                       int i;
-                       GVariantBuilder *inner_builder = NULL;
-                       inner_builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
-                       if (value_length > 0 && value != NULL) {
-                               for (i = 0; i < value_length; i++)
-                                       g_variant_builder_add(inner_builder, "y", value[i]);
-                       }
-                       g_dbus_method_invocation_return_value(req_info->context,
-                                               g_variant_new("(ay)", inner_builder));
-                       g_variant_builder_unref(inner_builder);
-               } else {
-                       g_dbus_method_invocation_return_value(req_info->context, NULL);
-               }
                gatt_requests = g_slist_remove(gatt_requests, req_info);
 
                req_info->context = NULL;
@@ -2502,9 +2700,32 @@ BT_EXPORT_API int bluetooth_gatt_send_response(int request_id, guint req_type,
                if (req_info->svc_path)
                        g_free(req_info->svc_path);
                g_free(req_info);
+
+               return BLUETOOTH_ERROR_NONE;
+       }
+
+       if (req_type == BLUETOOTH_GATT_ATT_REQUEST_TYPE_READ) {
+               int i;
+               GVariantBuilder *inner_builder = NULL;
+               inner_builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
+               if (value_length > 0 && value != NULL) {
+                       for (i = 0; i < value_length; i++)
+                               g_variant_builder_add(inner_builder, "y", value[i]);
+               }
+               g_dbus_method_invocation_return_value(req_info->context,
+                               g_variant_new("(ay)", inner_builder));
+               g_variant_builder_unref(inner_builder);
        } else {
-               return BLUETOOTH_ERROR_INTERNAL;
+               g_dbus_method_invocation_return_value(req_info->context, NULL);
        }
+       gatt_requests = g_slist_remove(gatt_requests, req_info);
+
+       req_info->context = NULL;
+       if (req_info->attr_path)
+               g_free(req_info->attr_path);
+       if (req_info->svc_path)
+               g_free(req_info->svc_path);
+       g_free(req_info);
 
        return BLUETOOTH_ERROR_NONE;
 }
@@ -2573,3 +2794,352 @@ BT_EXPORT_API int bluetooth_gatt_server_set_notification(const char *char_path,
 
        return err;
 }
+
+
+#if 0
+BT_EXPORT_API int bluetooth_gatt_register_application(int instance_id)
+{
+       BT_INIT_PARAMS();
+
+       if (!is_server_started) {
+
+               if (_bt_check_privilege(BT_CHECK_PRIVILEGE, BT_GATT_REGISTER_APPLICATION)
+                               == BLUETOOTH_ERROR_PERMISSION_DEINED) {
+                       BT_ERR("Don't have aprivilege to use this API");
+                       return BLUETOOTH_ERROR_PERMISSION_DEINED;
+               }
+
+               BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+               g_array_append_vals(in_param1, &instance_id, sizeof(int));
+
+               ret = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_REGISTER_APPLICATION,
+                               in_param1, in_param2, in_param3, in_param4, &out_param);
+               BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+               if (ret != BLUETOOTH_ERROR_NONE) {
+                       BT_ERR("Register application failed");
+                       return ret;
+               }
+               is_server_started = true;
+
+               return BLUETOOTH_ERROR_NONE;
+       }
+
+       BT_INFO("Already RegisterApplication");
+       return BLUETOOTH_ERROR_NONE;
+}
+#endif
+
+BT_EXPORT_API int bluetooth_gatt_server_init(int *instance_id, gatt_server_cb_func_ptr callback_ptr,
+                                               void *user_data)
+{
+       int ret = BLUETOOTH_ERROR_NONE;
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       /* Register event handler for GATT */
+       ret = _bt_register_event(BT_GATT_SERVER_EVENT, (void *)callback_ptr, user_data);
+
+       if (ret != BLUETOOTH_ERROR_NONE &&
+                       ret != BLUETOOTH_ERROR_ALREADY_INITIALIZED) {
+               BT_ERR("Fail to init the event handler");
+               BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+               goto done;
+       }
+
+       ret = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_REGISTER,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       /* App ID -1 is invalid */
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_INFO("GATT Server Registration failed result [%d]", ret);
+               *instance_id = -1;
+       } else {
+               *instance_id = g_array_index(out_param, int, 0);
+               BT_INFO("GATT Server Registered successfully: App Instance ID [%d]", *instance_id);
+       }
+
+done:
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       BT_INFO("GATT Server instance ID obtained [%d]", *instance_id);
+       return ret;
+}
+
+BT_EXPORT_API int bluetooth_gatt_server_deinit(void)
+{
+       int ret;
+       BT_INFO("GATT Server Deinitialize");
+       /* Unregister the event */
+       ret = _bt_unregister_event(BT_GATT_SERVER_EVENT);
+
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Fail to deinit the event handler");
+               return ret;
+       }
+
+       _bt_set_user_data(BT_GATT_SERVER, NULL, NULL);
+
+       return ret;
+}
+
+BT_EXPORT_API int bluetooth_gatt_server_add_service(const char *svc_uuid, int type, int numhandles,
+               int instance_id, int *service_handle)
+{
+       BT_CHECK_ENABLED(return);
+       BT_CHECK_PARAMETER(svc_uuid, return);
+
+       int result;
+       char uuid[BT_GATT_ATT_UUID_LEN_MAX + 1];
+
+       g_strlcpy(uuid, svc_uuid, sizeof(uuid));
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, &type, sizeof(int));
+       g_array_append_vals(in_param2, &numhandles, sizeof(int));
+       g_array_append_vals(in_param3, uuid, BT_GATT_ATT_UUID_LEN_MAX + 1);
+       g_array_append_vals(in_param4, &instance_id, sizeof(int));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_ADD_SERVICE,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       /* ATT handle 0 is reserved, hence it can not be used by app.
+          It will be used to indicate error in regsitering attribute */
+       if (result != BLUETOOTH_ERROR_NONE)
+               *service_handle = 0;
+       else
+               *service_handle = g_array_index(out_param, int, 0);
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_gatt_server_add_new_characteristic(const char *char_uuid,
+               const bluetooth_gatt_server_attribute_params_t *param,
+                                               int *char_handle)
+{
+       BT_CHECK_ENABLED(return);
+       BT_CHECK_PARAMETER(char_uuid, return);
+       BT_CHECK_PARAMETER(param, return);
+
+       int result;
+       char uuid[BT_GATT_ATT_UUID_LEN_MAX + 1];
+       int flag_count = 0;
+       char *char_flags[NUMBER_OF_FLAGS];
+
+       g_strlcpy(uuid, char_uuid, sizeof(uuid));
+       flag_count = bluetooth_gatt_convert_prop2string(param->properties, char_flags);
+       BT_INFO("Flag count [%d]", flag_count);
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, param, sizeof(bluetooth_gatt_server_attribute_params_t));
+       g_array_append_vals(in_param2, uuid, BT_GATT_ATT_UUID_LEN_MAX + 1);
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_ADD_CHARACTERISTIC,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       /* ATT handle 0 is reserved, hence it can not be used by app.
+          It will be used to indicate error in regsitering attribute */
+       if (result != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("GATT Server Add characteristic failed.. result [%d]", result);
+               *char_handle = 0;
+       } else {
+               *char_handle = g_array_index(out_param, int, 0);
+               BT_DBG("GATT Server Add characteristic success result [%d] char chandle [%d]", result, *char_handle);
+       }
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_gatt_server_add_descriptor(const char *desc_uuid, bt_gatt_permission_t permissions,
+               int service_handle, int instance_id, int *descriptor_handle)
+{
+       BT_CHECK_ENABLED(return);
+       BT_CHECK_PARAMETER(desc_uuid, return);
+
+       int result;
+       char uuid[BT_GATT_ATT_UUID_LEN_MAX + 1];
+
+       g_strlcpy(uuid, desc_uuid, sizeof(uuid));
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, &service_handle, sizeof(int));
+       g_array_append_vals(in_param2, &instance_id, sizeof(int));
+       g_array_append_vals(in_param3, &permissions, sizeof(bt_gatt_permission_t));
+       g_array_append_vals(in_param4, uuid, BT_GATT_ATT_UUID_LEN_MAX + 1);
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_ADD_DESCRIPTOR,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       /* ATT handle 0 is reserved, hence it can not be used by app.
+          It will be used to indicate error in regsitering attribute */
+       if (result != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("GATT Server Add Descriptor failed.. result [%d] desc handle [%d]", result, *descriptor_handle);
+               *descriptor_handle = 0;
+       } else {
+               *descriptor_handle = g_array_index(out_param, int, 0);
+               BT_INFO("GATT Server Add Descriptor Successful.. result [%d] desc handle [%d]", result, *descriptor_handle);
+       }
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_gatt_server_start_service(int service_handle, int instance_id)
+{
+       BT_CHECK_ENABLED(return);
+       int result;
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, &service_handle, sizeof(int));
+       g_array_append_vals(in_param2, &instance_id, sizeof(int));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_START_SERVICE,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_gatt_server_send_response(const bluetooth_gatt_server_response_params_t *param,
+               const bluetooth_gatt_att_data_t *value)
+{
+       BT_CHECK_PARAMETER(param, return);
+       BT_CHECK_PARAMETER(value, return);
+       BT_CHECK_ENABLED(return);
+       int result;
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, value, sizeof(bluetooth_gatt_att_data_t));
+       g_array_append_vals(in_param2, param, sizeof(bluetooth_gatt_server_response_params_t));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_SEND_RESPONSE,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+
+}
+
+BT_EXPORT_API int bluetooth_gatt_server_send_indication(bluetooth_device_address_t *addr_hex,
+               const bluetooth_gatt_server_indication_params_t *param,
+               const bluetooth_gatt_att_data_t *att_value)
+{
+       BT_CHECK_PARAMETER(param, return);
+       BT_CHECK_PARAMETER(att_value, return);
+       BT_CHECK_ENABLED(return);
+       int result;
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, att_value, sizeof(bluetooth_gatt_att_data_t));
+       g_array_append_vals(in_param2, param, sizeof(bluetooth_gatt_server_indication_params_t));
+       g_array_append_vals(in_param3, addr_hex, sizeof(bluetooth_device_address_t));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_SEND_INDICATION,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_gatt_server_stop_service(int service_handle, int instance_id)
+{
+       BT_CHECK_ENABLED(return);
+       int result;
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, &service_handle, sizeof(int));
+       g_array_append_vals(in_param2, &instance_id, sizeof(int));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_STOP_SERVICE,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_gatt_server_delete_service(int service_handle, int instance_id)
+{
+       BT_CHECK_ENABLED(return);
+       int result;
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, &service_handle, sizeof(int));
+       g_array_append_vals(in_param2, &instance_id, sizeof(int));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_DELETE_SERVICE,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+/* Tizen Platform Specific */
+BT_EXPORT_API int bluetooth_gatt_server_update_characteristic(int instance_id,
+                               const bluetooth_gatt_server_update_value_t *value)
+{
+       BT_CHECK_ENABLED(return);
+       BT_CHECK_PARAMETER(value, return);
+       int result;
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, &instance_id, sizeof(int));
+       g_array_append_vals(in_param2, value, sizeof(bluetooth_gatt_server_update_value_t));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_UPDATE_VALUE,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_gatt_server_unregister(int instance_id)
+{
+       BT_CHECK_ENABLED(return);
+       int result;
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       g_array_append_vals(in_param1, &instance_id, sizeof(int));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_DEREGISTER,
+                       in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       if (result != BLUETOOTH_ERROR_NONE)
+               BT_INFO("GATT Server Unregistration failed result [%d]", result);
+       else
+               BT_INFO("GATT Server Unregistration successful");
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+       return result;
+}
+