[OTP] Add support for OACP Read
[platform/core/connectivity/bluetooth-frwk.git] / bt-otp / bt-otpserver.c
index b2c0f0d..48fce49 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2017 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.
@@ -26,6 +26,7 @@
 #include <langinfo.h>
 #include <inttypes.h>
 #include <errno.h>
+#include <gio/gunixfdlist.h>
 
 #include "bt-otpserver.h"
 #include "bluetooth-api.h"
 #define BT_ERR(fmt, arg...) SLOGE(fmt, ##arg)
 #define BT_DBG(fmt, arg...) SLOGD(fmt, ##arg)
 
+/* OTP object paths */
+char *otp_obj_path = NULL;
+char *otp_feature_obj_path = NULL;
+char *otp_object_name_obj_path = NULL;
+char *otp_object_type_obj_path = NULL;
+char *otp_object_size_obj_path = NULL;
+char *otp_object_first_created_obj_path = NULL;
+char *otp_object_last_modified_obj_path = NULL;
+char *otp_object_id_obj_path = NULL;
+char *otp_object_prop_obj_path = NULL;
+char *otp_oacp_obj_path = NULL;
+char *otp_olcp_obj_path = NULL;
+char *otp_oacp_desc_obj_path = NULL;
+char *otp_olcp_desc_obj_path = NULL;
+
 static GMainLoop *main_loop;
 GDBusNodeInfo *otp_node_info = NULL;
 static GDBusConnection *conn;
 static GDBusConnection *g_conn;
 
 static int property_sub_id = -1;
+static int adapter_sub_id = -1;
+static int device_sub_id = -1;
 static guint g_owner_id = 0;
 
+struct otp_char_info {
+       gchar *char_path;
+       gchar *char_value;
+       int value_length;
+};
+
+struct indicate_info {
+       uint8_t resp_opcode;
+       uint8_t req_opcode;
+       uint8_t result_code;
+       uint8_t *resp_param;
+};
+
+/* Object metadata */
+struct object_metadata {
+       gchar *name;
+       gchar *type;
+       uint32_t curr_size;
+       uint32_t alloc_size;
+       time_t first_created;
+       time_t last_modified;
+       uint64_t id;
+       uint32_t props;
+};
+
+struct oacp_operation {
+       char *remote_address;
+       uint32_t offset;
+       uint32_t length;
+       uint8_t opcode;
+       uint8_t mode;
+       int fd;
+};
+
+static struct object_metadata *selected_object = NULL;
+static uint64_t object_id = OBJECT_START_ID;
+static GSList *otp_object_list = NULL;
+static GSList *otp_char_list = NULL;
+static guint obj_curr_index;
+static int adv_handle = 0;
+static gboolean OACP_indicate = FALSE;
+static gboolean OLCP_indicate = FALSE;
 char *directory = NULL;
+gboolean mutiple_obj_support = false;
+static gboolean otc_connection_status = FALSE;
+struct oacp_operation *oacp_read = NULL;
 
 static const gchar otp_introspection_xml[] =
 "<node name='/'>"
@@ -58,17 +121,64 @@ static const gchar otp_introspection_xml[] =
 "              <method name='disable'>"
 "                      <arg type='i' name='status' direction='out'/>"
 "              </method>"
+"     <method name='NewConnection'>"
+"          <arg type='o' name='object' direction='in'/>"
+"          <arg type='h' name='fd' direction='in'/>"
+"     </method>"
 "      </interface>"
 "</node>";
 
 void _bt_otp_deinit_event_receiver(void);
 void _bt_otp_unregister_interface(void);
+void update_obj_metadata_charc_value(struct object_metadata *object);
+void _bt_convert_device_path_to_address(const char *device_path,
+                                               char *device_address);
+
+static void delete_all_objects(void)
+{
+       GSList *tmp = NULL;
+       for (tmp = otp_object_list; tmp != NULL; tmp = tmp->next) {
+               if (tmp->data) {
+                       struct object_metadata *obj_info = tmp->data;
+                       if (obj_info->name)
+                               g_free(obj_info->name);
+                       if (obj_info->type)
+                               g_free(obj_info->type);
+                       otp_object_list = g_slist_delete_link(otp_object_list, tmp->data);
+               }
+       }
+       g_slist_free(otp_object_list);
+       otp_object_list = NULL;
+}
+
+static void delete_all_characterisitc(void)
+{
+       GSList *tmp = NULL;
+       for (tmp = otp_char_list; tmp != NULL; tmp = tmp->next) {
+               if (tmp->data) {
+                       struct otp_char_info *char_info = tmp->data;
+                       if (char_info->char_path)
+                               g_free(char_info->char_path);
+                       if (char_info->char_value)
+                               g_free(char_info->char_value);
+                       otp_char_list = g_slist_delete_link(otp_char_list, tmp->data);
+               }
+       }
+       g_slist_free(otp_char_list);
+       otp_char_list = NULL;
+}
 
 void _bt_otp_exit(void)
 {
        int ret;
        BT_DBG("");
 
+       if (otp_char_list)
+               delete_all_characterisitc();
+
+       if (otp_object_list)
+               delete_all_objects();
+
        ret = bluetooth_gatt_deinit();
        if (ret != BLUETOOTH_ERROR_NONE)
                BT_ERR("Failed to Deinit GATT %d", ret);
@@ -77,11 +187,364 @@ void _bt_otp_exit(void)
 
        _bt_otp_unregister_interface();
 
+       /* TODO: Advertising is not getting stopped by this API.
+        * This is because OTP_SERVER_DEINIT dbus call is blocking
+        * BT_SET_ADVERTISING_DATA dbus call. But now advertisment
+        * is stopped because of terminated process logic.
+        */
+       ret = bluetooth_set_advertising(adv_handle, FALSE);
+       if (ret != BLUETOOTH_ERROR_NONE)
+               BT_ERR("Failed to stop ADV %d", ret);
+
        if (main_loop != NULL) {
                g_main_loop_quit(main_loop);
        }
 }
 
+static void _bt_otp_set_char_value(const char *obj_path,
+                               const char *value, int value_length)
+{
+       GSList *tmp = NULL;
+
+       if (!value)
+               return;
+       for (tmp = otp_char_list; tmp != NULL; tmp = tmp->next) {
+               if (tmp->data) {
+                       struct otp_char_info *char_info = tmp->data;
+                       if (!g_strcmp0(char_info->char_path, obj_path)) {
+                               char_info->char_value = g_try_realloc(char_info->char_value, value_length);
+                               if (char_info->char_value) {
+                                       memcpy(char_info->char_value, value, value_length);
+                                       char_info->value_length = value_length;
+                               }
+                               return;
+                       }
+               }
+       }
+       return;
+}
+
+int add_new_characteristic(const char *char_uuid, bt_gatt_permission_t perms,
+               bt_gatt_characteristic_property_t props, char **obj_path)
+{
+       int ret = BLUETOOTH_ERROR_NONE;
+       struct otp_char_info *char_info = NULL;
+
+       ret = bluetooth_gatt_add_new_characteristic(otp_obj_path,
+                                       char_uuid, perms, props, obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Failed to add new char %d", ret);
+               return ret;
+       }
+
+       char_info = g_new0(struct otp_char_info, 1);
+       char_info->char_path = g_strdup(*obj_path);
+       otp_char_list = g_slist_append(otp_char_list, char_info);
+
+       return ret;
+}
+
+static char *_otp_convert_uuid_to_uuid128(const char *uuid)
+{
+       int len;
+       char *uuid128;
+
+       len = strlen(uuid);
+
+       switch (len) {
+       case 4:
+               /* UUID 16bits */
+               uuid128 = g_strdup_printf("0000%s-0000-1000-8000-00805f9b34fb",
+                                                                       uuid);
+               break;
+
+       case 8:
+               /* UUID 32bits */
+               uuid128 = g_strdup_printf("%s-0000-1000-8000-00805f9b34fb",
+                                                                       uuid);
+               break;
+
+       case 36:
+               /* UUID 128bits */
+               uuid128 = strdup(uuid);
+               break;
+
+       default:
+               return NULL;
+       }
+
+       return uuid128;
+}
+
+int _bt_otp_prepare_ots(void)
+{
+       BT_DBG("+");
+       int ret = BLUETOOTH_ERROR_NONE;
+       char *service_uuid;
+       char *char_uuid;
+       char *desc_uuid;
+       bt_gatt_characteristic_property_t props;
+       bt_gatt_permission_t perms;
+       char supp_feat[OTP_FEATURE_LENGTH] = { 0x08, 0x00, 0x00, 0x00,
+                                               0x80, 0x00, 0x00, 0x00 };
+
+       ret = bluetooth_gatt_init();
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Failed to Init GATT %d", ret);
+               goto fail;
+       }
+
+       service_uuid = _otp_convert_uuid_to_uuid128(OTP_UUID);
+       ret = bluetooth_gatt_add_service(service_uuid, &otp_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Failed to add service %d", ret);
+               goto fail;
+       }
+
+       /* Characteristic OTP Feature */
+       props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ;
+       perms = BLUETOOTH_GATT_PERMISSION_READ;
+       char_uuid = _otp_convert_uuid_to_uuid128(OTP_FEATURE_UUID);
+       ret = add_new_characteristic(char_uuid, perms, props,
+                                               &otp_feature_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE)
+               goto fail;
+
+       ret = bluetooth_gatt_set_characteristic_value(otp_feature_obj_path,
+                                               supp_feat, OTP_FEATURE_LENGTH);
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Failed to set char value %d", ret);
+               return ret;
+       }
+
+       _bt_otp_set_char_value(otp_feature_obj_path, supp_feat,
+                                               OTP_FEATURE_LENGTH);
+
+       /* Characteristic Object Name */
+       props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ;
+       perms = BLUETOOTH_GATT_PERMISSION_READ;
+       char_uuid = _otp_convert_uuid_to_uuid128(OTP_OBJECT_NAME_UUID);
+       ret = add_new_characteristic(char_uuid, perms, props,
+                                       &otp_object_name_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE)
+               goto fail;
+
+       /* Characteristic Object Type */
+       props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ;
+       perms = BLUETOOTH_GATT_PERMISSION_READ;
+       char_uuid = _otp_convert_uuid_to_uuid128(OTP_OBJECT_TYPE_UUID);
+       ret = add_new_characteristic(char_uuid, perms, props,
+                                       &otp_object_type_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE)
+               goto fail;
+
+       /* Characteristic Object Size */
+       props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ;
+       perms = BLUETOOTH_GATT_PERMISSION_READ;
+       char_uuid = _otp_convert_uuid_to_uuid128(OTP_OBJECT_SIZE_UUID);
+       ret = add_new_characteristic(char_uuid, perms, props,
+                                       &otp_object_size_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE)
+               goto fail;
+
+       /* Characteristic Object First-Created */
+       props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ |
+               BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE;
+       perms = BLUETOOTH_GATT_PERMISSION_READ |
+               BLUETOOTH_GATT_PERMISSION_WRITE;
+       char_uuid = _otp_convert_uuid_to_uuid128(OTP_OBJECT_FIRST_CREATED_UUID);
+       ret = add_new_characteristic(char_uuid, perms, props,
+                                       &otp_object_first_created_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE)
+               goto fail;
+
+       /* Characteristic Object Last-Modified */
+       props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ |
+               BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE;
+       perms = BLUETOOTH_GATT_PERMISSION_READ |
+               BLUETOOTH_GATT_PERMISSION_WRITE;
+       char_uuid = _otp_convert_uuid_to_uuid128(OTP_OBJECT_LAST_MODIFIED_UUID);
+       ret = add_new_characteristic(char_uuid, perms, props,
+                               &otp_object_last_modified_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE)
+               goto fail;
+
+       /* Object ID is mandatory for mutiple object server */
+       if (mutiple_obj_support) {
+               /* Characteristic Object ID */
+               props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ;
+               perms = BLUETOOTH_GATT_PERMISSION_READ;
+               char_uuid = _otp_convert_uuid_to_uuid128(OTP_OBJECT_ID_UUID);
+               ret = add_new_characteristic(char_uuid, perms, props,
+                                               &otp_object_id_obj_path);
+               if (ret != BLUETOOTH_ERROR_NONE)
+                       goto fail;
+       }
+
+       /* Characteristic Object Properties */
+       props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_READ;
+       perms = BLUETOOTH_GATT_PERMISSION_READ;
+       char_uuid = _otp_convert_uuid_to_uuid128(OTP_OBJECT_PROP_UUID);
+       ret = add_new_characteristic(char_uuid, perms, props,
+                                       &otp_object_prop_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE)
+               goto fail;
+
+       /* Characteristic OACP */
+       props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE |
+               BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_INDICATE;
+       perms = BLUETOOTH_GATT_PERMISSION_WRITE;
+       char_uuid = _otp_convert_uuid_to_uuid128(OTP_OACP_UUID);
+       ret = add_new_characteristic(char_uuid, perms, props,
+                                               &otp_oacp_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE)
+               goto fail;
+
+       /* CCCD for OACP */
+       desc_uuid = _otp_convert_uuid_to_uuid128(OTP_CP_CCC_DESC_UUID);
+       perms = BLUETOOTH_GATT_PERMISSION_READ |
+               BLUETOOTH_GATT_PERMISSION_WRITE;
+       ret = bluetooth_gatt_add_descriptor(otp_oacp_obj_path, desc_uuid,
+                                               perms, &otp_oacp_desc_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Failed to add new char descriptor %d", ret);
+               goto fail;
+       }
+
+       /* OLCP Characteristics is not required
+        * for single object server
+        */
+       if (mutiple_obj_support) {
+               /* Characteristic OLCP */
+               props = BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_WRITE |
+                       BLUETOOTH_GATT_CHARACTERISTIC_PROPERTY_INDICATE;
+               perms = BLUETOOTH_GATT_PERMISSION_WRITE;
+               char_uuid = _otp_convert_uuid_to_uuid128(OTP_OLCP_UUID);
+               ret = add_new_characteristic(char_uuid, perms, props,
+                                                       &otp_olcp_obj_path);
+               if (ret != BLUETOOTH_ERROR_NONE)
+                       goto fail;
+
+               /* CCCD for OLCP */
+               desc_uuid = _otp_convert_uuid_to_uuid128(OTP_CP_CCC_DESC_UUID);
+               perms = BLUETOOTH_GATT_PERMISSION_READ |
+                       BLUETOOTH_GATT_PERMISSION_WRITE;
+               ret = bluetooth_gatt_add_descriptor(otp_olcp_obj_path, desc_uuid,
+                                                       perms, &otp_olcp_desc_obj_path);
+               if (ret != BLUETOOTH_ERROR_NONE) {
+                       BT_ERR("Failed to add new char descriptor %d", ret);
+                       goto fail;
+               }
+       }
+
+       /* Register service */
+       ret = bluetooth_gatt_register_service(otp_obj_path);
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Failed to register service %d", ret);
+               goto fail;
+       }
+
+       /* Register Application */
+       ret = bluetooth_gatt_register_application();
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Failed to register application %d", ret);
+               goto fail;
+       }
+
+       BT_DBG("-");
+       return ret;
+
+fail:
+       delete_all_characterisitc();
+       return ret;
+}
+
+int _bt_otp_set_advertising_data(void)
+{
+       int ret;
+       BT_DBG("");
+
+       /* OTP UUID */
+       guint8 data[4]  = {0x03, 0x02, 0x25, 0x18};
+       bluetooth_advertising_data_t adv;
+
+       BT_DBG("%x %x %x %x", data[0], data[1], data[2], data[3]);
+       memcpy(adv.data, data, sizeof(data));
+       ret = bluetooth_set_advertising_data(adv_handle, &adv, sizeof(data));
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Failed to set ADV data %d", ret);
+               return ret;
+       }
+
+       ret = bluetooth_set_advertising(adv_handle, TRUE);
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("Failed to set ADV %d", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+void _bt_otp_start_write_on_fd()
+{
+       char buf[BT_L2CAP_BUFFER_LEN];
+       int written = 0;
+       int read = 0;
+       FILE *fp;
+       char file_path[BT_FILE_PATH_MAX_LEN] = {0, };
+       int length;
+
+       if (!selected_object) {
+               BT_DBG("Object not selected");
+               goto fail;
+       }
+
+       snprintf(file_path, sizeof(file_path), "%s%s",
+                                       directory, selected_object->name);
+       BT_DBG("file_path = [%s]", file_path);
+
+       fp = fopen(file_path, "r");
+       if (!fp) {
+               BT_DBG("fopen() failed : %s", strerror(errno));
+               goto fail;
+       }
+
+       BT_DBG("length [%d]", oacp_read->length);
+       length = oacp_read->length;
+       if (length > BT_L2CAP_BUFFER_LEN) {
+               int offset = oacp_read->offset;
+               int len = 0;
+               int written_len = 0;
+
+               while (length > 0) {
+                       if (length < BT_L2CAP_BUFFER_LEN)
+                               len = length;
+                       else
+                               len = BT_L2CAP_BUFFER_LEN;
+
+                       fseek(fp, offset, SEEK_SET);
+                       read = fread(buf, 1, len, fp);
+
+                       written = write(oacp_read->fd, buf, len);
+                       BT_DBG("read [%d], Written [%d], len [%d], offset [%d], length [%d], written_len [%d]",
+                                                                               read, written, len, offset, length, written_len);
+                       length -= len;
+                       offset += len;
+                       written_len += len;
+               }
+       } else {
+               read = fread(buf, 1, length, fp);
+               written = write(oacp_read->fd, buf, oacp_read->length);
+               BT_DBG("read [%d], Written [%d]", read, written);
+       }
+
+       fclose(fp);
+fail:
+       g_free(oacp_read->remote_address);
+       g_free(oacp_read);
+       oacp_read = NULL;
+}
+
 static void _bt_otp_method(GDBusConnection *connection,
                const gchar *sender,
                const gchar *object_path,
@@ -101,7 +564,10 @@ static void _bt_otp_method(GDBusConnection *connection,
                GDir *dir = NULL;
                GError *error = NULL;
                const gchar *filename = NULL;
-               GSList *list = NULL;
+               char absolute_path[ABSOLUTE_PATH_MAX_LENGTH];
+               GSList *list = NULL, *l = NULL;
+               struct stat st;
+               struct object_metadata *object = NULL;
 
                g_variant_get(parameters, "(s)", &directory);
                BT_DBG("Directory = [%s]", directory);
@@ -118,17 +584,116 @@ static void _bt_otp_method(GDBusConnection *connection,
                        list = g_slist_append(list, (gpointer) filename);
                }
 
-               /* TODO: Extract metadata from these objects and cache it in internal structure */
+               g_dir_close(dir);
+
+               if (!list) {
+                       BT_DBG("No object found in given directory");
+                       status = BLUETOOTH_ERROR_NO_OBJECTS_FOUND;
+                       goto fail;
+               }
+
+               if (g_slist_length(list) > 1)
+                       mutiple_obj_support = true;
 
-               /* TODO: Expose all OTS Characteristics via RegisterApplication */
+               for (l = list; l != NULL; l = l->next) {
+                       if (!l->data) continue;
+                       snprintf(absolute_path, sizeof(absolute_path), "%s%s", directory,
+                                                       (char *)l->data);
 
-               /* TODO: Advertise with OTS_UUID */
+                       BT_INFO("filename: %s, absoulte_path: %s",
+                                       (char *)l->data, absolute_path);
+
+                       if (stat(absolute_path, &st) == -1) {
+                               BT_INFO("stat failed: (%d)\n", errno);
+                               continue;
+                       }
+
+                       object = g_new0(struct object_metadata, 1);
+
+                       object->name = g_strdup((const gchar *)l->data);
+                       object->type = _otp_convert_uuid_to_uuid128(UNSUPPORTED_OBJECT_TYPE_UUID);
+                       object->first_created = st.st_ctime;
+                       object->last_modified = st.st_ctime;
+                       object->curr_size = (uint32_t) st.st_size;
+                       object->alloc_size = (uint32_t) st.st_size;
+                       object->id = object_id;
+                       object->props = OBJECT_READ;
+
+                       otp_object_list = g_slist_append(otp_object_list,
+                                                               object);
+
+                       object_id++;
+               }
+
+               BT_DBG("preparing");
+               if (_bt_otp_prepare_ots() != BLUETOOTH_ERROR_NONE) {
+                       BT_ERR("Fail to prepare OTP Proxy");
+                       status = BLUETOOTH_ERROR_INTERNAL;
+                       goto fail;
+               }
+
+               /* If single object is supported, make that as
+                * selected object and update the metadata for the same.
+                */
+               if (!mutiple_obj_support) {
+                       BT_INFO("Server supports single object");
+                       selected_object = (struct object_metadata *) g_slist_nth_data(otp_object_list, 0);
+                       if (selected_object)
+                               update_obj_metadata_charc_value(selected_object);
+               }
+
+               BT_DBG("advertsing");
+               if (_bt_otp_set_advertising_data() != BLUETOOTH_ERROR_NONE) {
+                       BT_ERR("Fail to set advertising data");
+                       status = BLUETOOTH_ERROR_INTERNAL;
+                       goto fail;
+               }
 fail:
-               g_dbus_method_invocation_return_value(invocation, g_variant_new("(i)", status));
+               g_dbus_method_invocation_return_value(invocation,
+                                               g_variant_new("(i)", status));
 
        } else if (g_strcmp0(method_name, "disable") == 0) {
-               g_dbus_method_invocation_return_value(invocation, g_variant_new("(i)", status));
+               g_dbus_method_invocation_return_value(invocation,
+                                               g_variant_new("(i)", status));
                _bt_otp_exit();
+
+       } else if (g_strcmp0(method_name, "NewConnection") == 0) {
+               int index;
+               GDBusMessage *msg;
+               GUnixFDList *fd_list;
+               char *dev_path;
+               char address[BT_ADDRESS_STRING_SIZE] = { 0 };
+               int fd;
+
+               g_variant_get(parameters, "(oh)", &dev_path, &index);
+
+               msg = g_dbus_method_invocation_get_message(invocation);
+               fd_list = g_dbus_message_get_unix_fd_list(msg);
+               if (fd_list == NULL) {
+                       BT_ERR("fd_list is NULL");
+                       return;
+               }
+
+               fd = g_unix_fd_list_get(fd_list, index, NULL);
+               if (fd == -1) {
+                       BT_ERR("Invalid fd return");
+                       return;
+               }
+
+               _bt_convert_device_path_to_address(dev_path, address);
+
+               BT_INFO("OTC Connected fd: %d, address %s", fd, address);
+               if (!oacp_read) {
+                       /* OTC Connected, but no on going request */
+                       goto done;
+               }
+               oacp_read->fd = fd;
+               otc_connection_status = TRUE;
+
+               if (oacp_read->opcode == OACP_READ)
+                       _bt_otp_start_write_on_fd();
+done:
+               g_dbus_method_invocation_return_value(invocation, NULL);
        }
        BT_DBG("-");
 }
@@ -139,7 +704,8 @@ static const GDBusInterfaceVTable otp_method_table = {
        NULL,
 };
 
-static void _bt_otp_on_bus_acquired(GDBusConnection *connection, const gchar *name, gpointer user_data)
+static void _bt_otp_on_bus_acquired(GDBusConnection *connection,
+                               const gchar *name, gpointer user_data)
 {
        guint object_id;
        GError *error = NULL;
@@ -148,7 +714,8 @@ static void _bt_otp_on_bus_acquired(GDBusConnection *connection, const gchar *na
 
        g_conn = connection;
 
-       object_id = g_dbus_connection_register_object(connection, BT_OTP_OBJECT_PATH,
+       object_id = g_dbus_connection_register_object(connection,
+                                               BT_OTP_OBJECT_PATH,
                                                otp_node_info->interfaces[0],
                                                &otp_method_table,
                                                NULL, NULL, &error);
@@ -194,7 +761,9 @@ int _bt_otp_register_interface(void)
        owner_id = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                BT_OTP_SERVICE_NAME,
                                G_BUS_NAME_OWNER_FLAGS_NONE,
-                               _bt_otp_on_bus_acquired, _bt_otp_on_name_acquired, _bt_otp_on_name_lost,
+                               _bt_otp_on_bus_acquired,
+                               _bt_otp_on_name_acquired,
+                               _bt_otp_on_name_lost,
                                NULL, NULL);
        g_owner_id = owner_id;
        BT_DBG("owner_id is [%d]\n", owner_id);
@@ -216,6 +785,590 @@ void _bt_otp_unregister_interface(void)
        return;
 }
 
+void _bt_convert_device_path_to_address(const char *device_path,
+                                               char *device_address)
+{
+       char address[BT_ADDRESS_STRING_SIZE] = { 0 };
+       char *dev_addr;
+
+       dev_addr = strstr(device_path, "dev_");
+       if (dev_addr != NULL) {
+               char *pos = NULL;
+               dev_addr += 4;
+               g_strlcpy(address, dev_addr, sizeof(address));
+
+               while ((pos = strchr(address, '_')) != NULL)
+                       *pos = ':';
+
+               g_strlcpy(device_address, address, BT_ADDRESS_STRING_SIZE);
+       }
+}
+
+static char *__bt_extract_device_path(GVariantIter *iter, char *address)
+{
+       char *object_path = NULL;
+       char device_address[BT_ADDRESS_STRING_SIZE] = { 0 };
+
+       /* Parse the signature: oa{sa{sv}}} */
+       while (g_variant_iter_loop(iter, "{&oa{sa{sv}}}", &object_path,
+                       NULL)) {
+               if (!object_path) {
+                       BT_ERR("Unable to get object path");
+                       return NULL;
+               }
+               _bt_convert_device_path_to_address(object_path, device_address);
+               if (g_strcmp0(address, device_address) == 0)
+                       return g_strdup(object_path);
+
+       }
+
+       BT_ERR("Unable to get object path");
+       return NULL;
+}
+
+char *_bt_otp_get_device_object_path(char *address)
+{
+       GError *err = NULL;
+       GDBusProxy *proxy = NULL;
+       GVariant *result = NULL;
+       GVariantIter *iter = NULL;
+       char *object_path = NULL;
+
+       proxy =  g_dbus_proxy_new_sync(conn,
+                       G_DBUS_PROXY_FLAGS_NONE, NULL,
+                       BT_BLUEZ_NAME,
+                       BT_MANAGER_PATH,
+                       BT_MANAGER_INTERFACE,
+                       NULL, &err);
+
+       if (!proxy) {
+               BT_ERR("Unable to create proxy: %s", err->message);
+               goto fail;
+       }
+
+       result = g_dbus_proxy_call_sync(proxy, "GetManagedObjects", NULL,
+                       G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+       if (!result) {
+               if (err != NULL)
+                       BT_ERR("Fail to get GetManagedObjects (Error: %s)", err->message);
+               else
+                       BT_ERR("Fail to get GetManagedObjects");
+
+               goto fail;
+       }
+
+       g_variant_get(result, "(a{oa{sa{sv}}})", &iter);
+       object_path = __bt_extract_device_path(iter, address);
+
+       g_variant_unref(result);
+       g_variant_iter_free(iter);
+
+fail:
+       if (err)
+               g_clear_error(&err);
+
+       if (proxy)
+               g_object_unref(proxy);
+
+       return object_path;
+}
+
+int _bt_otp_open_otc_and_listen(char *address)
+{
+       char *object_path;
+       GDBusProxy *device_proxy = NULL;
+       GVariant *result = NULL;
+       GError *error = NULL;
+       int ret = BLUETOOTH_ERROR_NONE;
+
+       object_path = _bt_otp_get_device_object_path(address);
+       if (object_path == NULL) {
+               ret = BLUETOOTH_ERROR_NOT_PAIRED;
+               goto fail;
+       }
+
+       device_proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
+                                       NULL, BT_BLUEZ_NAME, object_path,
+                                       BT_DEVICE_INTERFACE,  NULL, NULL);
+       if (device_proxy == NULL) {
+               ret = BLUETOOTH_ERROR_INTERNAL;
+               goto fail;
+       }
+
+
+       result = g_dbus_proxy_call_sync(device_proxy, "ListenOtc",
+                               NULL,
+                               G_DBUS_CALL_FLAGS_NONE,
+                               -1,
+                               NULL,
+                               &error);
+       if (result == NULL) {
+               if (error != NULL) {
+                       BT_ERR("Error occured in Proxy call [%s]\n", error->message);
+                       g_error_free(error);
+               }
+               ret = BLUETOOTH_ERROR_INTERNAL;
+       }
+fail:
+       if (object_path)
+               g_free(object_path);
+       if (result)
+               g_variant_unref(result);
+       if (device_proxy)
+               g_object_unref(device_proxy);
+       return ret;
+}
+
+int _bt_otp_oacp_write_cb(char *value, int len, int offset,
+                                                       char *remote_addr, struct indicate_info *info)
+{
+       int ret = OACP_SUCCESS;
+       int app_err = BLUETOOTH_ERROR_NONE;
+       int opcode = value[0];
+       uint32_t object_offset, length;
+
+       BT_INFO("OACP Opcode 0x%d", opcode);
+
+       if (!otp_object_list) {
+               ret = OACP_INVALID_OBJ;
+               goto fail;
+       }
+
+       switch (opcode) {
+       case OACP_CREATE:
+               ret = OACP_OPCODE_NOT_SUPPORTED;
+               break;
+       case OACP_DELETE:
+               ret = OACP_OPCODE_NOT_SUPPORTED;
+               break;
+       case OACP_CALC_CHECKSUM:
+               ret = OACP_OPCODE_NOT_SUPPORTED;
+               break;
+       case OACP_EXECUTE:
+               ret = OACP_OPCODE_NOT_SUPPORTED;
+               break;
+       case OACP_READ:
+               object_offset = (uint32_t)(value[4] & 0xFF) << 24 |
+                               (uint32_t)(value[3] & 0xFF) << 16 |
+                               (uint32_t)(value[2] & 0xFF) << 8  |
+                               (uint32_t)(value[1] & 0xFF);
+               length = (uint32_t)(value[8] & 0xFF) << 24 |
+                       (uint32_t)(value[7] & 0xFF) << 16 |
+                       (uint32_t)(value[6] & 0xFF) << 8  |
+                       (uint32_t)(value[5] & 0xFF);
+
+               BT_INFO("Offset = %lu, Length = %lu", object_offset, length);
+
+               if (oacp_read && otc_connection_status) {
+                       /* Read operation already going on. */
+                       ret = OACP_OBJECT_LOCKED;
+                       goto fail;
+               }
+               oacp_read = g_malloc0(sizeof(struct oacp_operation));
+               oacp_read->offset = object_offset;
+               oacp_read->length = length;
+               oacp_read->remote_address = g_strdup(remote_addr);
+               oacp_read->opcode = OACP_READ;
+
+               app_err = _bt_otp_open_otc_and_listen(remote_addr);
+               if (app_err != BLUETOOTH_ERROR_NONE) {
+                       ret = OACP_OPERATION_FAILED;
+                       g_free(oacp_read->remote_address);
+                       g_free(oacp_read);
+                       oacp_read = NULL;
+                       goto fail;
+               }
+               ret = OACP_SUCCESS;
+               break;
+       case OACP_WRITE:
+               ret = OACP_OPCODE_NOT_SUPPORTED;
+               break;
+       case OACP_ABORT:
+               ret = OACP_OPCODE_NOT_SUPPORTED;
+               break;
+       default:
+               ret = OACP_OPCODE_NOT_SUPPORTED;
+               break;
+       }
+fail:
+       info->resp_opcode = OACP_RESPONSE;
+       info->req_opcode = opcode;
+       info->result_code = ret;
+       info->resp_param = NULL;
+       return app_err;
+}
+
+void convert_to_hex(struct object_metadata *object, char *type, char *value)
+{
+       struct tm fc_tm;
+
+       BT_DBG("type : %s", type);
+
+       memset(value, 0, 8);
+
+       if (!g_strcmp0(type, "size")) {
+
+               value[3] = (object->curr_size >> 24) & 0xFF;
+               value[2] = (object->curr_size >> 16) & 0xFF;
+               value[1] = (object->curr_size >> 8) & 0xFF;
+               value[0] = object->curr_size & 0xFF;
+
+               value[7] = (object->alloc_size >> 24) & 0xFF;
+               value[6] = (object->alloc_size >> 16) & 0xFF;
+               value[5] = (object->alloc_size >> 8) & 0xFF;
+               value[4] = object->alloc_size & 0xFF;
+
+       } else if (!g_strcmp0(type, "date")) {
+
+               localtime_r(&(object->first_created), &fc_tm);
+
+               value[1] = ((fc_tm.tm_year+1900) >> 8) & 0xFF;
+               value[0] = (fc_tm.tm_year+1900) & 0xFF;
+               value[2] = (fc_tm.tm_mon+1) & 0xFF;
+               value[3] = fc_tm.tm_mday & 0xFF;
+               value[4] = fc_tm.tm_hour & 0xFF;
+               value[5] = fc_tm.tm_min & 0xFF;
+               value[6] = fc_tm.tm_sec & 0xFF;
+
+       } else if (!g_strcmp0(type, "id")) {
+
+               value[5] = (object->id >> 48) & 0xFF;
+               value[4] = (object->id >> 32) & 0xFF;
+               value[3] = (object->id >> 24) & 0xFF;
+               value[2] = (object->id >> 16) & 0xFF;
+               value[1] = (object->id >> 8) & 0xFF;
+               value[0] = object->id & 0xFF;
+
+       } else if (!g_strcmp0(type, "props")) {
+               value[3] = (object->props >> 24) & 0xFF;
+               value[2] = (object->props >> 16) & 0xFF;
+               value[1] = (object->props >> 8) & 0xFF;
+               value[0] = object->props & 0xFF;
+       }
+}
+
+void update_obj_metadata_charc_value(struct object_metadata *object)
+{
+       /* Value can be of maximum eight bytes */
+       char value[8];
+
+       _bt_otp_set_char_value(otp_object_name_obj_path, object->name,
+                                                       strlen(object->name));
+       _bt_otp_set_char_value(otp_object_type_obj_path, object->type,
+                                                       strlen(object->type));
+
+       convert_to_hex(object, "size", value);
+       _bt_otp_set_char_value(otp_object_size_obj_path, value, 8);
+
+       convert_to_hex(object, "date", value);
+       _bt_otp_set_char_value(otp_object_first_created_obj_path, value, 7);
+       _bt_otp_set_char_value(otp_object_last_modified_obj_path, value, 7);
+
+       /* Object ID is optonal for single object server */
+       if (mutiple_obj_support) {
+               convert_to_hex(object, "id", value);
+               _bt_otp_set_char_value(otp_object_id_obj_path, value, 6);
+       }
+
+       convert_to_hex(object, "props", value);
+       _bt_otp_set_char_value(otp_object_prop_obj_path, value, 4);
+}
+
+int _bt_otp_olcp_write_cb(char *value, int len, int offset,
+                                       struct indicate_info *info)
+{
+       int ret = OLCP_SUCCESS;
+       int opcode = value[0];
+       struct object_metadata *object;
+
+       BT_INFO("OLCP Opcode 0x%d", opcode);
+
+       if (!otp_object_list) {
+               ret = OLCP_NO_OBJ;
+               goto fail;
+       }
+
+       switch (opcode) {
+       case OLCP_FIRST: {
+               object = (struct object_metadata *) g_slist_nth_data(otp_object_list, 0);
+               if (!object) {
+                       ret = OLCP_OUT_OF_BOUNDS;
+                       goto fail;
+               }
+               update_obj_metadata_charc_value(object);
+               selected_object = object;
+               obj_curr_index = 0;
+       } break;
+       case OLCP_LAST: {
+               len = g_slist_length(otp_object_list);
+               object = (struct object_metadata *) g_slist_nth_data(otp_object_list, len-1);
+               if (!object) {
+                       ret = OLCP_OUT_OF_BOUNDS;
+                       goto fail;
+               }
+               update_obj_metadata_charc_value(object);
+               selected_object = object;
+               obj_curr_index = len-1;
+       } break;
+       case OLCP_PREVIOUS: {
+               if (obj_curr_index == 0) {
+                       ret = OLCP_OUT_OF_BOUNDS;
+                       goto fail;
+               }
+               object = (struct object_metadata *) g_slist_nth_data(otp_object_list, obj_curr_index-1);
+               if (!object) {
+                       ret = OLCP_OUT_OF_BOUNDS;
+                       goto fail;
+               }
+               update_obj_metadata_charc_value(object);
+               selected_object = object;
+               obj_curr_index -= 1;
+       } break;
+       case OLCP_NEXT: {
+               object = (struct object_metadata *) g_slist_nth_data(otp_object_list, obj_curr_index+1);
+               if (!object) {
+                       ret = OLCP_OUT_OF_BOUNDS;
+                       goto fail;
+               }
+               update_obj_metadata_charc_value(object);
+               selected_object = object;
+               obj_curr_index += 1;
+       } break;
+       case OLCP_GOTO:
+       case OLCP_ORDER:
+       case OLCP_REQ_NO_OBJ:
+       case OLCP_CLEAR_MARKING:
+       default:
+               ret = OLCP_OPCODE_NOT_SUPPORTED;
+               break;
+       }
+fail:
+       info->resp_opcode = OLCP_RESPONSE;
+       info->req_opcode = opcode;
+       info->result_code = ret;
+       info->resp_param = NULL;
+       return BLUETOOTH_ERROR_NONE;
+}
+
+static struct otp_char_info *otp_get_char_value(const char *path)
+{
+       GSList *tmp = NULL;
+
+       for (tmp = otp_char_list; tmp != NULL; tmp = tmp->next) {
+               if (tmp->data) {
+                       struct otp_char_info *char_info = tmp->data;
+                       if (!g_strcmp0(char_info->char_path, path))
+                               return char_info;
+               }
+       }
+
+       return NULL;
+}
+
+int _bt_otp_read_cb(const char *obj_path, char **value, int *len)
+{
+       struct otp_char_info *info = NULL;
+
+       if (!obj_path) {
+               BT_ERR("Wrong Obj path");
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
+
+       if (g_strcmp0(obj_path, otp_feature_obj_path)) {
+               if (!selected_object) {
+                       return BLUETOOTH_ERROR_OBJECT_NOT_SELECTED;
+               }
+       }
+
+       info = otp_get_char_value(obj_path);
+       if (info) {
+               if (info->char_value == NULL || info->value_length == 0)
+                       return BLUETOOTH_ERROR_INTERNAL;
+
+               *len = info->value_length;
+               *value = (char *)malloc(sizeof(char)*(*len));
+               memcpy(*value, info->char_value, *len);
+
+               return BLUETOOTH_ERROR_NONE;
+       } else {
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
+}
+
+static void _otp_convert_address_to_hex(bluetooth_device_address_t *addr_hex,
+                                                       const char *addr_str)
+{
+       int i = 0;
+       unsigned int addr[BLUETOOTH_ADDRESS_LENGTH] = { 0, };
+
+       if (addr_str == NULL || addr_str[0] == '\0')
+               return;
+
+       i = sscanf(addr_str, "%X:%X:%X:%X:%X:%X", &addr[0], &addr[1],
+                               &addr[2], &addr[3], &addr[4], &addr[5]);
+       if (i != BLUETOOTH_ADDRESS_LENGTH)
+               BT_ERR("Invalid format string - [%s]", addr_str);
+
+       for (i = 0; i < BLUETOOTH_ADDRESS_LENGTH; i++)
+               addr_hex->addr[i] = (unsigned char)addr[i];
+}
+
+static void _bt_otp_send_indication(const char *obj_path,
+                               struct indicate_info *info,
+                               bluetooth_device_address_t *remote_address)
+{
+       int ret = BLUETOOTH_ERROR_NONE;
+       char value[7] = {0x00};
+
+       BT_DBG("");
+
+       value[0] = info->resp_opcode & 0xFF;
+       value[1] = info->req_opcode & 0xFF;
+       value[2] = info->result_code & 0xFF;
+       if (info->resp_param) {
+               value[6] = (info->resp_param[3] >> 24) & 0xFF;
+               value[5] = (info->resp_param[4] >> 16) & 0xFF;
+               value[4] = (info->resp_param[5] >> 8) & 0xFF;
+               value[3] = info->resp_param[6] & 0xFF;
+       }
+
+       BT_DBG("Opcode: %d", value[1]);
+
+       /* Store the status value */
+       _bt_otp_set_char_value(obj_path, value, 7);
+
+       /* Send indication */
+       ret = bluetooth_gatt_server_set_notification(obj_path, remote_address);
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("_bt_otp_send_control_point_indication failed");
+               return;
+       }
+       ret = bluetooth_gatt_update_characteristic(obj_path, value, 7);
+       if (ret != BLUETOOTH_ERROR_NONE) {
+               BT_ERR("_bt_otp_send_control_point_indication failed");
+               return;
+       }
+}
+
+void _bt_otp_gatt_char_property_changed_event(GVariant *msg,
+                               const char *path)
+{
+       int result = BLUETOOTH_ERROR_NONE;
+       GVariantIter value_iter;
+       const char *property = NULL;
+       const char *char_path = NULL;
+       const char *svc_handle = NULL;
+       GVariant *var = NULL;
+       GVariant *val = NULL;
+       g_variant_iter_init(&value_iter, msg);
+
+       while ((g_variant_iter_loop(&value_iter, "{sv}", &property, &var))) {
+
+               if (property == NULL) {
+                       BT_ERR("Property NULL");
+                       return;
+               }
+
+               if (!g_strcmp0(property, "WriteValue")) {
+                       int len = 0;
+                       BT_INFO("WriteValue");
+                       BT_INFO("Type '%s'\n", g_variant_get_type_string(var));
+
+                       if (var) {
+                               bluetooth_device_address_t addr_hex = { {0,} };
+                               gchar *addr = NULL;
+                               guint8 req_id = 1;
+                               guint16 offset = 0;
+                               char *value = NULL;
+                               struct indicate_info info;
+                               g_variant_get(var, "(&s&s&syq@ay)",
+                                               &char_path, &svc_handle,
+                                               &addr, &req_id, &offset, &val);
+
+                               len = g_variant_get_size(val);
+
+                               BT_DBG("Len = %d, BT_ADDR = %s", len, addr);
+
+                               value = (char *) g_variant_get_data(val);
+                               _otp_convert_address_to_hex(&addr_hex, addr);
+
+                               if (len != 0) {
+                                       if (!g_strcmp0(char_path, otp_oacp_obj_path)) {
+                                               result = _bt_otp_oacp_write_cb(value, len, offset, addr, &info);
+                                       } else if (!g_strcmp0(char_path, otp_olcp_obj_path)) {
+                                               result = _bt_otp_olcp_write_cb(value, len, offset, &info);
+                                       } else {
+                                               BT_ERR("Wrong Object Path %s", char_path);
+                                               result = BLUETOOTH_ERROR_INTERNAL;
+                                       }
+                                       bluetooth_gatt_send_response(req_id,
+                                       BLUETOOTH_GATT_ATT_REQUEST_TYPE_WRITE,
+                                                       result, 0, NULL, 0);
+
+                                       /* Send indication for CPs */
+                                       if (!g_strcmp0(char_path, otp_oacp_obj_path)) {
+                                               if (OACP_indicate) {
+                                                       _bt_otp_send_indication(char_path, &info, &addr_hex);
+                                               }
+                                       } else if (!g_strcmp0(char_path, otp_olcp_obj_path)) {
+                                               if (OLCP_indicate) {
+                                                       _bt_otp_send_indication(char_path, &info, &addr_hex);
+                                               }
+                                       }
+                               } else {
+                                       BT_ERR("Array Len 0");
+                               }
+                       } else {
+                               BT_ERR("var==NULL");
+                       }
+               } else if (!g_strcmp0(property, "ReadValue")) {
+                       gchar *addr = NULL;
+                       guint8 req_id = 1;
+                       guint16 offset = 0;
+                       char *value = NULL;
+                       int len = 0;
+                       result = BLUETOOTH_ERROR_NONE;
+
+                       BT_INFO("ReadValue");
+                       BT_INFO("Type '%s'\n", g_variant_get_type_string(var));
+
+                       g_variant_get(var, "(&s&s&syq)", &char_path,
+                                       &svc_handle, &addr, &req_id, &offset);
+
+                       result = _bt_otp_read_cb(char_path, &value, &len);
+
+                       if (result != BLUETOOTH_ERROR_NONE) {
+                               BT_ERR("ReadValue failed %s", char_path);
+                               bluetooth_gatt_send_response(req_id,
+                               BLUETOOTH_GATT_ATT_REQUEST_TYPE_READ,
+                                               result, offset, NULL, 0);
+                       } else {
+                               bluetooth_gatt_send_response(req_id,
+                               BLUETOOTH_GATT_ATT_REQUEST_TYPE_READ,
+                                               result, offset, value, len);
+                               if (value)
+                                       g_free(value);
+                       }
+               } else if (!g_strcmp0(property, "NotificationStateChanged")) {
+                       gboolean indicate = FALSE;
+
+                       g_variant_get(var, "(&s&sb)", &char_path,
+                                               &svc_handle, &indicate);
+
+                       BT_INFO("%s : [%s]", property,
+                               indicate ? "StartNotify" : "StopNotify");
+                       BT_INFO("Type '%s'\n", g_variant_get_type_string(var));
+
+                       if (!g_strcmp0(char_path, otp_oacp_obj_path)) {
+                               OACP_indicate = indicate;
+                       } else if (!g_strcmp0(char_path, otp_olcp_obj_path)) {
+                               OLCP_indicate = indicate;
+                       }
+               }
+       }
+       return;
+}
+
 void _bt_otp_property_event_filter(GDBusConnection *connection,
                                        const gchar *sender_name,
                                        const gchar *object_path,
@@ -234,7 +1387,57 @@ void _bt_otp_property_event_filter(GDBusConnection *connection,
        if (g_strcmp0(signal_name, PROPERTIES_CHANGED) == 0) {
 
                g_variant_get(parameters, "(@a{sv}@as)", &value, NULL);
-               /* TODO: Handle READ/WRITE request from client */
+               _bt_otp_gatt_char_property_changed_event(value, object_path);
+       }
+}
+
+void _bt_otp_adapter_event_filter(GDBusConnection *connection,
+                                       const gchar *sender_name,
+                                       const gchar *object_path,
+                                       const gchar *interface_name,
+                                       const gchar *signal_name,
+                                       GVariant *parameters,
+                                       gpointer user_data)
+{
+       if (signal_name == NULL) {
+               BT_ERR("Wrong Signal");
+               return;
+       }
+
+       BT_INFO("Interface %s, Signal %s", interface_name, signal_name);
+
+       if (g_strcmp0(interface_name, BT_OTP_INTERFACE_NAME) == 0) {
+               if (strcasecmp(signal_name, BLE_DISABLED) == 0) {
+                       _bt_otp_exit();
+               }
+       }
+}
+
+void _bt_otc_disconnected_cb(GDBusConnection *connection,
+                                       const gchar *sender_name,
+                                       const gchar *object_path,
+                                       const gchar *interface_name,
+                                       const gchar *signal_name,
+                                       GVariant *parameters,
+                                       gpointer user_data)
+{
+       if (signal_name == NULL) {
+               BT_ERR("Wrong Signal");
+               return;
+       }
+
+       BT_INFO("Interface %s, Signal %s", interface_name, signal_name);
+
+       if (g_strcmp0(interface_name, BT_DEVICE_INTERFACE) == 0) {
+               if (strcasecmp(signal_name, OTC_DISCONNECTED) == 0) {
+                       BT_DBG("OTC Channel Disconnected dev_path[%s]",
+                                                                                       object_path);
+                       otc_connection_status = FALSE;
+                       if (oacp_read) {
+                               g_free(oacp_read->remote_address);
+                               g_free(oacp_read);
+                       }
+               }
        }
 }
 
@@ -246,17 +1449,33 @@ int _bt_otp_init_event_receiver()
        if (conn == NULL) {
                conn =  g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
                if (error != NULL) {
-                       BT_ERR("ERROR: Can't get on system bus [%s]", error->message);
+                       BT_ERR("ERROR: Can't get on system bus [%s]",
+                                                       error->message);
                        g_clear_error(&error);
                }
        }
 
        property_sub_id = g_dbus_connection_signal_subscribe(conn,
-               NULL, BT_OTP_INTERFACE_NAME,
-               PROPERTIES_CHANGED, BT_OTP_OBJECT_PATH, NULL, 0,
-               _bt_otp_property_event_filter,
-               NULL, NULL);
-       BT_DBG("property_sub_id = %d", property_sub_id);
+                               NULL,
+                               BT_OTP_INTERFACE_NAME,
+                               PROPERTIES_CHANGED,
+                               BT_OTP_OBJECT_PATH, NULL, 0,
+                               _bt_otp_property_event_filter,
+                               NULL, NULL);
+
+       adapter_sub_id = g_dbus_connection_signal_subscribe(conn,
+                               NULL,
+                               BT_OTP_INTERFACE_NAME,
+                               BLE_DISABLED,
+                               BT_OTP_OBJECT_PATH, NULL, 0,
+                               _bt_otp_adapter_event_filter,
+                               NULL, NULL);
+
+       device_sub_id = g_dbus_connection_signal_subscribe(conn,
+                                       NULL, BT_DEVICE_INTERFACE,
+                                       OTC_DISCONNECTED, NULL, NULL, 0,
+                                       _bt_otc_disconnected_cb,
+                                       NULL, NULL);
 
        BT_DBG("-");
        return 0;
@@ -267,6 +1486,8 @@ void _bt_otp_deinit_event_receiver(void)
        BT_DBG("+");
 
        g_dbus_connection_signal_unsubscribe(conn, property_sub_id);
+       g_dbus_connection_signal_unsubscribe(conn, adapter_sub_id);
+       g_dbus_connection_signal_unsubscribe(conn, device_sub_id);
        conn = NULL;
 
        BT_DBG("-");