Fix static analysis tool warnings
[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-event-handler.c
index 7bda552..c0f8016 100644 (file)
@@ -16,7 +16,6 @@
  */
 
 #include <string.h>
-#include <dbus/dbus.h>
 #include <glib.h>
 #include <dlog.h>
 #include <vconf.h>
@@ -71,6 +70,7 @@ static gboolean __bt_is_request_id_exist(int request_id)
                if (info == NULL)
                        continue;
 
+               BT_DBG("compare %d  with %d", info->request_id, request_id);
                if (info->request_id == request_id)
                        return TRUE;
        }
@@ -749,7 +749,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
        event_info = (bt_event_info_t *)user_data;
        ret_if(event_info == NULL);
 
-#ifdef GATT_NO_RELAY
        gboolean gatt_interface = FALSE;
 
        if (strcasecmp(interface_name, BT_GATT_CHARACTERISTIC_INTERFACE) == 0)
@@ -761,12 +760,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
        if (strcasecmp(interface_name, BT_EVENT_SERVICE) != 0 &&
                 gatt_interface == FALSE)
                return;
-#else
-       if (strcasecmp(object_path, BT_DEVICE_PATH) != 0)
-               return;
-       if (strcasecmp(interface_name, BT_EVENT_SERVICE) != 0)
-               return;
-#endif
 
        ret_if(signal_name == NULL);
 
@@ -812,11 +805,7 @@ void __bt_device_event_filter(GDBusConnection *connection,
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_ATT_MTU_CHANGED,
                                result, &att_mtu_info,
                                event_info->cb, event_info->user_data);
-#ifdef GATT_NO_RELAY
        } else if (strcasecmp(signal_name, BT_GATT_BLUEZ_CHAR_VAL_CHANGED) == 0) {
-#else
-       } else if (strcasecmp(signal_name, BT_GATT_CHAR_VAL_CHANGED) == 0) {
-#endif
                const char *char_handle = NULL;
                int len = 0;
                const char * value = NULL;
@@ -1058,7 +1047,7 @@ void __bt_device_event_filter(GDBusConnection *connection,
                BT_DBG("BT_LE_DATA_LENGTH_CHANGED");
 
                g_variant_get(parameters, "(i&sqqqq)", &result, &address,
-                               tx_octets, tx_time, rx_octets, rx_time);
+                               &tx_octets, &tx_time, &rx_octets, &rx_time);
 
                params.max_tx_octets = tx_octets;
                params.max_tx_time = tx_time;
@@ -1597,7 +1586,7 @@ void __bt_avrcp_control_event_filter(GDBusConnection *connection,
                metadata.genre = genre;
                metadata.total_tracks = total_tracks;
                metadata.number = number;
-               metadata.duration = (int64_t)duration;
+               metadata.duration = duration;
 
                _bt_avrcp_event_cb(BLUETOOTH_EVENT_AVRCP_TRACK_CHANGED,
                                result, &metadata,
@@ -1976,6 +1965,333 @@ void __bt_opp_server_event_filter(GDBusConnection *connection,
        }
 }
 
+void __bt_map_client_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)
+{
+       BT_DBG("Entered __bt_map_client_event_filter");
+       bt_event_info_t *event_info;
+       int result = BLUETOOTH_ERROR_NONE;
+       event_info = (bt_event_info_t *)user_data;
+       ret_if(event_info == NULL);
+
+       if (strcasecmp(object_path, BT_MAP_CLIENT_PATH) != 0)
+               return;
+       if (strcasecmp(interface_name, BT_EVENT_SERVICE) != 0)
+               return;
+
+       ret_if(signal_name == NULL);
+
+       if (strcasecmp(signal_name, BT_MAP_CONNECTED) == 0) {
+               const char *address = NULL;
+               int request_id = 0;
+               bluetooth_device_address_t dev_address = { {0} };
+
+               g_variant_get(parameters, "(i&si)", &result,
+                                               &address, &request_id);
+
+               if (__bt_is_request_id_exist(request_id) == FALSE) {
+                       BT_ERR("Different request id!");
+                       return;
+               }
+
+               _bt_convert_addr_string_to_type(dev_address.addr,
+                                               address);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_MAP_CONNECTED,
+                               result, &dev_address,
+                               event_info->cb, event_info->user_data);
+
+               if (result != BLUETOOTH_ERROR_NONE)
+                       __bt_remove_push_request_id(request_id);
+       } else if (strcasecmp(signal_name, BT_MAP_DISCONNECTED) == 0) {
+               const char *address = NULL;
+               int request_id = 0;
+               bluetooth_device_address_t dev_address = { {0} };
+
+               g_variant_get(parameters, "(i&si)", &result, &address,
+                               &request_id);
+
+               if (__bt_is_request_id_exist(request_id) == FALSE) {
+                       BT_ERR("Different request id!");
+                       return;
+               }
+
+               _bt_convert_addr_string_to_type(dev_address.addr,
+                               address);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_MAP_DISCONNECTED,
+                               result, &dev_address,
+                               event_info->cb, event_info->user_data);
+
+               __bt_remove_push_request_id(request_id);
+       } else if (strcasecmp(signal_name, BT_MAP_LIST_FOLDERS_COMPLETE) == 0) {
+               int request_id = 0;
+               GVariant* folder_list_var = NULL;
+
+               g_variant_get(parameters, "(iiv)", &result, &request_id, &folder_list_var);
+               if (__bt_is_request_id_exist(request_id) == FALSE) {
+                       BT_ERR("Different request id!");
+                       return;
+               }
+
+               GVariantIter* iter;
+
+               bt_map_client_folders_s folders_struct = {0,};
+               g_variant_get(folder_list_var, "(aa{sv})", &iter);
+
+               folders_struct.size = g_variant_iter_n_children(iter);
+               folders_struct.names = (char**) g_malloc0(folders_struct.size * sizeof(*(folders_struct.names)));
+               BT_DBG("g_variant_iter_n_children: %d", folders_struct.size);
+               GVariantIter* res = NULL;
+               int i = 0;
+               while (g_variant_iter_loop(iter, "a{sv}", &res)) {
+                       char* key = NULL;
+                       GVariant* value = NULL;
+                       while (g_variant_iter_loop(res, "{sv}", &key, &value)) {
+                               char* string_value = NULL;
+                               g_variant_get(value, "s", &string_value);
+                               BT_DBG("got folder name: %s", string_value);
+                               folders_struct.names[i] = strdup(string_value);
+                       }
+                       ++i;
+               }
+               _bt_common_event_cb(BLUETOOTH_EVENT_MAP_LIST_FOLDERS_COMPLETE,
+                               result, &folders_struct,
+                               event_info->cb, event_info->user_data);
+
+               __bt_remove_push_request_id(request_id);
+
+               // freeing resources
+               while (--i >= 0) {
+                       free(folders_struct.names[i]);
+                       folders_struct.names[i] = NULL;
+               }
+               g_free(folders_struct.names);
+
+               g_variant_unref(folder_list_var);
+
+       } else if (strcasecmp(signal_name, BT_MAP_FILTER_FIELDS_COMPLETE) == 0) {
+               BT_DBG("BT_MAP_LIST_FOLDERS_COMPLETE");
+
+               GVariant *value;
+               int request_id = 0;
+               int i = 0;
+               bt_map_list_filter_fields_info_t fields_info = {0,};
+
+               g_variant_get(parameters, "(ivi)", &result, &value, &request_id);
+
+               if (__bt_is_request_id_exist(request_id) == FALSE) {
+                       BT_ERR("Different request id!");
+                       return;
+               }
+
+               if (value) {
+                       GVariantIter *iter = NULL;
+                       g_variant_get(value, "(as)", &iter);
+                       fields_info.size  = g_variant_iter_n_children(iter);
+                       char* field = NULL;
+
+                       fields_info.fields = g_malloc0(fields_info.size * sizeof(char*));
+                       while (g_variant_iter_loop(iter, "s", &field)) {
+                               fields_info.fields[i] = strdup(field);
+                               i++;
+                       }
+               }
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_MAP_LIST_FILTER_FIELD_COMPLETE,
+                               request_id, &fields_info,
+                               event_info->cb, event_info->user_data);
+
+               while (--i >= 0) {
+                       free(fields_info.fields[i]);
+                       fields_info.fields[i] = NULL;
+               }
+               g_free(fields_info.fields);
+
+               __bt_remove_push_request_id(request_id);
+               g_variant_unref(value);
+       } else if (strcasecmp(signal_name, BT_MAP_LIST_MESSAGES_COMPLETE) == 0) {
+               int request_id = 0;
+               GVariant* messages_list_var = NULL;
+               g_variant_get(parameters, "(iiv)", &result, &request_id, &messages_list_var);
+               if (__bt_is_request_id_exist(request_id) == FALSE) {
+                       BT_ERR("Different request id!");
+                       return;
+               }
+
+               bt_map_client_message_items_s messages_struct = {0,};
+
+               GVariantIter* iter;
+               g_variant_get(messages_list_var, "(a{oa{sv}})", &iter);
+               messages_struct.size = g_variant_iter_n_children(iter);
+               messages_struct.message_items = (bt_map_client_message_item_t*)
+                       g_malloc(messages_struct.size * sizeof(*(messages_struct.message_items)));
+               BT_DBG("g_variant_iter_n_children: %d", messages_struct.size);
+
+               char *object = NULL;
+               GVariantIter *properites = NULL;
+               int i = 0;
+               while (g_variant_iter_loop(iter, "{oa{sv}}", &object, &properites)) {
+                       messages_struct.message_items[i].message_object = strdup(object);
+                       BT_DBG("Message found: %s", messages_struct.message_items[i].message_object);
+                       messages_struct.message_items[i].folder = NULL;
+                       messages_struct.message_items[i].subject = NULL;
+                       messages_struct.message_items[i].timestamp = NULL;
+                       messages_struct.message_items[i].sender = NULL;
+                       messages_struct.message_items[i].sender_address = NULL;
+                       messages_struct.message_items[i].reply_to = NULL;
+                       messages_struct.message_items[i].recipient = NULL;
+                       messages_struct.message_items[i].recipient_address = NULL;
+                       messages_struct.message_items[i].type = NULL;
+                       messages_struct.message_items[i].size = -1;
+                       messages_struct.message_items[i].is_text = -1;
+                       messages_struct.message_items[i].status = NULL;
+                       messages_struct.message_items[i].attachment_size = -1;
+                       messages_struct.message_items[i].is_priority = -1;
+                       messages_struct.message_items[i].is_read = -1;
+                       messages_struct.message_items[i].is_sent = -1;
+                       messages_struct.message_items[i].is_protected = -1;
+                       char *key = NULL;
+                       GVariant *value = NULL;
+                       while (g_variant_iter_loop(properites, "{sv}", &key, &value)) {
+                               char *value_string = NULL;
+                               uint64_t value_int = -1;
+                               bool value_bool = false;
+                               if (strcmp(key, "Folder") == 0) {
+                                       g_variant_get(value, "s", &value_string);
+                                       messages_struct.message_items[i].folder = strdup(value_string);
+                                       BT_DBG("  Folder: %s", value_string);
+                               } else if (strcmp(key, "Subject") == 0) {
+                                       g_variant_get(value, "s", &value_string);
+                                       messages_struct.message_items[i].subject = strdup(value_string);
+                                       BT_DBG("  Subject: %s", value_string);
+                               } else if (strcmp(key, "Timestamp") == 0) {
+                                       g_variant_get(value, "s", &value_string);
+                                       messages_struct.message_items[i].timestamp = strdup(value_string);
+                                       BT_DBG("  Timestamp: %s", value_string);
+                               } else if (strcmp(key, "Sender") == 0) {
+                                       g_variant_get(value, "s", &value_string);
+                                       messages_struct.message_items[i].sender = strdup(value_string);
+                                       BT_DBG("  Sender: %s", value_string);
+                               } else if (strcmp(key, "SenderAddress") == 0) {
+                                       g_variant_get(value, "s", &value_string);
+                                       messages_struct.message_items[i].sender_address = strdup(value_string);
+                                       BT_DBG("  SenderAddress: %s", value_string);
+                               } else if (strcmp(key, "ReplyTo") == 0) {
+                                       g_variant_get(value, "s", &value_string);
+                                       messages_struct.message_items[i].reply_to = strdup(value_string);
+                                       BT_DBG("  ReplyTo: %s", value_string);
+                               } else if (strcmp(key, "Recipient") == 0) {
+                                       g_variant_get(value, "s", &value_string);
+                                       messages_struct.message_items[i].recipient = strdup(value_string);
+                                       BT_DBG("  Recipient: %s", value_string);
+                               } else if (strcmp(key, "RecipientAddress") == 0) {
+                                       g_variant_get(value, "s", &value_string);
+                                       messages_struct.message_items[i].recipient_address = strdup(value_string);
+                                       BT_DBG("  RecipientAddress: %s", value_string);
+                               } else if (strcmp(key, "Type") == 0) {
+                                       g_variant_get(value, "s", &value_string);
+                                       messages_struct.message_items[i].type = strdup(value_string);
+                                       BT_DBG("  Type: %s", value_string);
+                               } else if (strcmp(key, "Size") == 0) {
+                                       g_variant_get(value, "t", &value_int);
+                                       messages_struct.message_items[i].size = value_int;
+                                       BT_DBG("  Size: %d", value_int);
+                               } else if (strcmp(key, "Text") == 0) {
+                                       g_variant_get(value, "b", &value_bool);
+                                       messages_struct.message_items[i].is_text = value_bool ? 1 : 0;
+                                       BT_DBG("  Text: %s", value_bool ? "true" : "false");
+                               } else if (strcmp(key, "Status") == 0) {
+                                       g_variant_get(value, "s", &value_string);
+                                       messages_struct.message_items[i].status = strdup(value_string);
+                                       BT_DBG("  Status: %s", value_string);
+                               } else if (strcmp(key, "AttachmentSize") == 0) {
+                                       g_variant_get(value, "t", &value_int);
+                                       messages_struct.message_items[i].attachment_size = value_int;
+                                       BT_DBG("  AttachmentSize: %d", value_int);
+                               } else if (strcmp(key, "Priority") == 0) {
+                                       g_variant_get(value, "b", &value_bool);
+                                       messages_struct.message_items[i].is_priority = value_bool ? 1 : 0;
+                                       BT_DBG("  Priority: %s", value_bool ? "true" : "false");
+                               } else if (strcmp(key, "Read") == 0) {
+                                       g_variant_get(value, "b", &value_bool);
+                                       messages_struct.message_items[i].is_read = value_bool ? 1 : 0;
+                                       BT_DBG("  Read: %s", value_bool ? "true" : "false");
+                               } else if (strcmp(key, "Sent") == 0) {
+                                       g_variant_get(value, "b", &value_bool);
+                                       messages_struct.message_items[i].is_sent = value_bool ? 1 : 0;
+                                       BT_DBG("  Sent: %s", value_bool ? "true" : "false");
+                               } else if (strcmp(key, "Protected") == 0) {
+                                       g_variant_get(value, "b", &value_bool);
+                                       messages_struct.message_items[i].is_protected = value_bool ? 1 : 0;
+                                       BT_DBG("  Protected: %s", value_bool ? "true" : "false");
+                               }
+                       }
+                       ++i;
+               }
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_MAP_LIST_MESSAGES_COMPLETE,
+                               result, &messages_struct,
+                               event_info->cb, event_info->user_data);
+
+               __bt_remove_push_request_id(request_id);
+
+               while (--i >= 0) {
+                       free(messages_struct.message_items[i].folder);
+                       free(messages_struct.message_items[i].subject);
+                       free(messages_struct.message_items[i].timestamp);
+                       free(messages_struct.message_items[i].sender);
+                       free(messages_struct.message_items[i].sender_address);
+                       free(messages_struct.message_items[i].reply_to);
+                       free(messages_struct.message_items[i].recipient);
+                       free(messages_struct.message_items[i].recipient_address);
+                       free(messages_struct.message_items[i].type);
+                       free(messages_struct.message_items[i].status);
+               }
+               g_free(messages_struct.message_items);
+
+               g_variant_unref(messages_list_var);
+       } else if (strcasecmp(signal_name, BT_MAP_GET_MESSAGE_COMPLETE) == 0) {
+               BT_DBG("BT_MAP_GET_MESSAGE_COMPLETE");
+               int request_id = 0;
+
+               g_variant_get(parameters, "(ii)", &result, &request_id);
+               if (__bt_is_request_id_exist(request_id) == FALSE) {
+                       BT_ERR("Different request id!");
+                       return;
+               }
+
+               // currently there is no result value passed from here, just passing NULL
+               void* some_result_value = NULL;
+               _bt_common_event_cb(BLUETOOTH_EVENT_MAP_GET_MESSAGE_COMPLETE,
+                               result, some_result_value, event_info->cb, event_info->user_data);
+
+               __bt_remove_push_request_id(request_id);
+       } else if (strcasecmp(signal_name, BT_MAP_PUSH_MESSAGE_COMPLETE) == 0) {
+               BT_DBG("BT_MAP_PUSH_MESSAGE_COMPLETE");
+               int request_id = 0;
+
+               g_variant_get(parameters, "(ii)", &result, &request_id);
+               if (__bt_is_request_id_exist(request_id) == FALSE) {
+                       BT_ERR("Different request id!");
+                       return;
+               }
+
+               // currently there is no result value passed from here, just passing NULL
+               void* some_result_value = NULL;
+               _bt_common_event_cb(BLUETOOTH_EVENT_MAP_PUSH_MESSAGE_COMPLETE,
+                               result, some_result_value, event_info->cb, event_info->user_data);
+
+               __bt_remove_push_request_id(request_id);
+       }
+
+}
+
 void __bt_pbap_client_event_filter(GDBusConnection *connection,
                                                 const gchar *sender_name,
                                                 const gchar *object_path,
@@ -2548,6 +2864,314 @@ void __bt_hf_agent_event_filter(GDBusConnection *connection,
        BT_DBG("-\n");
 }
 
+static void __bt_tds_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)
+{
+       bt_event_info_t *event_info;
+       event_info = (bt_event_info_t *)user_data;
+       int result = BLUETOOTH_ERROR_NONE;
+
+       ret_if(event_info == NULL);
+
+       if (strcasecmp(object_path, BT_TDS_PATH) != 0)
+               return;
+       if (strcasecmp(interface_name, BT_EVENT_SERVICE) != 0)
+               return;
+
+       ret_if(signal_name == NULL);
+
+       BT_DBG("+");
+
+       if (strcasecmp(signal_name, BT_TDS_ACTIVATION_REQUESTED) == 0) {
+               bluetooth_tds_activation_req_t act_req;
+               const char *address = NULL;
+               char *buffer = NULL;
+               int transport = 0;
+               GVariant *byte_var;
+
+               g_variant_get(parameters, "(&si@ay)", &address,
+                               &transport, &byte_var);
+
+               memset(&act_req, 0x00, sizeof(bluetooth_tds_activation_req_t));
+
+               act_req.transport = transport;
+
+               act_req.tds_data.length = g_variant_get_size(byte_var);
+               if (act_req.tds_data.length > BLUETOOTH_TDS_DATA_LENGTH_MAX) {
+                       BT_INFO("tds data length > BLUETOOTH_TDS_DATA_LENGTH_MAX");
+                       act_req.tds_data.length = BLUETOOTH_TDS_DATA_LENGTH_MAX;
+               }
+               buffer = (char *) g_variant_get_data(byte_var);
+               memcpy(act_req.tds_data.data, buffer, act_req.tds_data.length);
+
+               _bt_convert_addr_string_to_type(act_req.rem_addr.addr, address);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_TDS_ACTIVATION_REQUESTED,
+                               BLUETOOTH_ERROR_NONE, &act_req,
+                               event_info->cb, event_info->user_data);
+       } else if (strcasecmp(signal_name, BT_TDS_TRANSPORT_DATA_RECEIVED) == 0) {
+               BT_DBG("TDS Complete Block Data received");
+               const char *address = NULL;
+               char *data;
+               int data_len = 0;
+               int k;
+               GVariant *var = NULL;
+               bluetooth_tds_transport_data_info_t *info = NULL;
+
+               /* Extract data from DBUS params */
+               g_variant_get(parameters, "(i&sn@ay)", &result, &address, &data_len, &var);
+               data = (char *)g_variant_get_data(var);
+
+               BT_DBG("Address [%s]", address);
+               BT_DBG("Data len [%d]", data_len);
+
+               /* DEBUG */
+               for (k = 0; k < data_len ; k++)
+                       BT_DBG("Data[%d] [0x%x]", k, data[k]);
+
+               if (data_len == 0) {
+                       BT_ERR("No data");
+                       g_variant_unref(var);
+                       return;
+               }
+
+               info = g_malloc0(sizeof(bluetooth_tds_transport_data_info_t));
+               info->data_length = data_len;
+               info->data = g_memdup(data, data_len);
+
+               _bt_convert_addr_string_to_type(info->device_address.addr,
+                               address);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_TDS_TRANSPORT_DATA_RECEIVED,
+                               result, info,
+                               event_info->cb, event_info->user_data);
+
+               if (info->data) {
+                       g_free(info->data);
+                       g_free(info);
+               }
+
+               g_variant_unref(var);
+       } else if (strcasecmp(signal_name, BT_TDS_ACTIVATION_RESULT) == 0) {
+               BT_DBG("TDS Control point Activation result");
+               const char *address = NULL;
+               bluetooth_device_address_t dev_address = { {0} };
+
+               /* Extract data from DBUS params */
+               g_variant_get(parameters, "(i&s)", &result, &address);
+               BT_DBG("Address [%s]", address);
+               BT_DBG("Result  [%d]", result);
+
+               _bt_convert_addr_string_to_type(dev_address.addr,
+                               address);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_TDS_ACTIVATION_RESULT,
+                               result, &dev_address,
+                               event_info->cb, event_info->user_data);
+       } else if (strcasecmp(signal_name, BT_TDS_ACTIVATION_INDICATION) == 0) {
+               BT_DBG("TDS Control point Indication Response");
+               bluetooth_tds_indication_res_t ind_res;
+               const char *address = NULL;
+               char *buffer = NULL;
+               GVariant *byte_var = NULL;
+
+               g_variant_get(parameters, "(&s@ay)", &address, &byte_var);
+
+               memset(&ind_res, 0x00, sizeof(bluetooth_tds_indication_res_t));
+
+               ind_res.tds_data.length = g_variant_get_size(byte_var);
+
+               buffer = (char *) g_variant_get_data(byte_var);
+               memcpy(ind_res.tds_data.data, buffer, ind_res.tds_data.length);
+
+               _bt_convert_addr_string_to_type(ind_res.rem_addr.addr, address);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_TDS_ACTIVATION_INDICATION,
+                               BLUETOOTH_ERROR_NONE,  &ind_res,
+                               event_info->cb, event_info->user_data);
+
+               g_variant_unref(byte_var);
+       } else if (strcasecmp(signal_name, BT_TDS_CONTROL_POINT_ENABLED) == 0) {
+               BT_DBG("TDS Control point Enabled event");
+               const char *address = NULL;
+               bluetooth_device_address_t dev_address = { {0} };
+
+               /* Extract data from DBUS params */
+               g_variant_get(parameters, "(i&s)", &result, &address);
+               BT_DBG("Address [%s]", address);
+               BT_DBG("Result  [%d]", result);
+
+               _bt_convert_addr_string_to_type(dev_address.addr,
+                               address);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_TDS_CONTROL_POINT_ENABLED,
+                               result, &dev_address,
+                               event_info->cb, event_info->user_data);
+       }
+
+       BT_DBG("-");
+}
+
+static void __bt_otp_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)
+{
+       bt_event_info_t *event_info;
+       event_info = (bt_event_info_t *)user_data;
+       int result = BLUETOOTH_ERROR_NONE;
+
+       ret_if(event_info == NULL);
+
+       if (strcasecmp(object_path, BT_OTP_PATH) != 0)
+               return;
+       if (strcasecmp(interface_name, BT_EVENT_SERVICE) != 0)
+               return;
+
+       ret_if(signal_name == NULL);
+
+       BT_DBG("+");
+
+       if (strcasecmp(signal_name, BT_OTP_SERVER_STATE_CHANGED) == 0) {
+               BT_DBG("OTP Server State Changed Event");
+               bool status = FALSE;
+
+               /* Extract data from DBUS params */
+               g_variant_get(parameters, "(ib)", &result, &status);
+               BT_DBG("Result [%d]", result);
+               BT_DBG("Status  [%s]", status ? "enabled" : "disabled");
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_OTP_SERVER_STATE_CHANGED,
+                               result, &status, event_info->cb, event_info->user_data);
+       } else if (strcasecmp(signal_name, BT_OTP_READ_CHAR_VAL) == 0) {
+               BT_DBG("OTP Read Data received");
+               const char *handle = NULL;
+               char *data;
+               int data_len = 0;
+               GVariant *var = NULL;
+               bluetooth_otp_resp_info_t *info = NULL;
+
+               /* Extract data from DBUS params */
+               g_variant_get(parameters, "(i&sn@ay)", &result, &handle, &data_len, &var);
+               data = (char *)g_variant_get_data(var);
+
+               BT_DBG("Handle [%s]", handle);
+               BT_DBG("Data len [%d]", data_len);
+
+               if (data_len == 0) {
+                       BT_ERR("No data");
+                       if (var)
+                               g_variant_unref(var);
+                       return;
+               }
+
+               info = g_malloc0(sizeof(bluetooth_otp_resp_info_t));
+               info->data_length = data_len;
+               info->data = g_memdup(data, data_len);
+               info->handle = g_strdup(handle);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_OTP_READ_CHAR_VAL,
+                               result, info,
+                               event_info->cb, event_info->user_data);
+
+               if (info->handle) {
+                       g_free(info->handle);
+               }
+
+               if (info->data) {
+                       g_free(info->data);
+                       g_free(info);
+               }
+               if (var)
+                       g_variant_unref(var);
+       } else if (strcasecmp(signal_name, BT_OTP_NOTIFICATION_ENABLED) == 0) {
+               BT_DBG("OTP Notification Enabled event");
+               char *handle = NULL;
+
+               /* Extract data from DBUS params */
+               g_variant_get(parameters, "(i&s)", &result, &handle);
+               BT_DBG("Handle [%s]", handle);
+               BT_DBG("Result  [%d]", result);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_OTP_NOTIFICATION_ENABLED,
+                               result, handle,
+                               event_info->cb, event_info->user_data);
+       } else if (strcasecmp(signal_name, BT_OTP_WRITE_CHAR_VAL) == 0) {
+               BT_DBG("OTP Control point Activation result");
+               char *handle = NULL;
+
+               /* Extract data from DBUS params */
+               g_variant_get(parameters, "(i&s)", &result, &handle);
+               BT_DBG("Handle [%s]", handle);
+               BT_DBG("Result  [%d]", result);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_OTP_WRITE_CHAR_VAL,
+                               result, handle,
+                               event_info->cb, event_info->user_data);
+       } else if (strcasecmp(signal_name, BT_OTP_INDICATION) == 0) {
+               BT_DBG("OTP Control point Indication Response");
+               bluetooth_otp_resp_info_t *ind_res = NULL;
+               char *buffer = NULL;
+               GVariant *byte_var = NULL;
+               char *handle = NULL;
+
+               g_variant_get(parameters, "(i&s@ay)", &result, &handle, &byte_var);
+
+               ind_res = g_malloc0(sizeof(bluetooth_otp_resp_info_t));
+               ind_res->data_length = g_variant_get_size(byte_var);
+               buffer = (char *)g_variant_get_data(byte_var);
+               ind_res->data = g_memdup(buffer, ind_res->data_length);
+               ind_res->handle = g_strdup(handle);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_OTP_INDICATION,
+                               result,  ind_res,
+                               event_info->cb, event_info->user_data);
+
+               if (ind_res->handle) {
+                       g_free(ind_res->handle);
+               }
+
+               if (ind_res->data) {
+                       g_free(ind_res->data);
+                       g_free(ind_res);
+               }
+               if (byte_var)
+                       g_variant_unref(byte_var);
+       }  else if (strcasecmp(signal_name, BT_OTC_STATE_CHANGED) == 0) {
+               BT_DBG("OTC State Changed");
+               char *address = NULL;
+               int fd = -1;
+               gboolean connected = FALSE;
+               bluetooth_otc_info_t *otc_info = NULL;
+
+               /* Extract data from DBUS params */
+               g_variant_get(parameters, "(ib&sn)", &result, &connected, &address, &fd);
+               BT_DBG("Result  [%d]", result);
+               BT_DBG("Address [%s]", address);
+               BT_DBG("Connected [%d]", connected);
+               BT_DBG("Fd  [%d]", fd);
+
+               otc_info = g_malloc0(sizeof(bluetooth_otc_info_t));
+               otc_info->fd = fd;
+               otc_info->connected = connected;
+               otc_info->address = g_strdup(address);
+
+               _bt_common_event_cb(BLUETOOTH_EVENT_OTC_STATE_CHANGED,
+                               result, otc_info,
+                               event_info->cb, event_info->user_data);
+       }
+
+       BT_DBG("-");
+}
+
 static void __bt_remove_all_events(void)
 {
        bt_event_info_t *info;
@@ -2731,6 +3355,10 @@ int _bt_register_event(int event_type, void *event_cb, void *user_data)
                event_func = __bt_opp_server_event_filter;
                path = BT_OPP_SERVER_PATH;
                break;
+       case BT_MAP_CLIENT_EVENT:
+               event_func = __bt_map_client_event_filter;
+               path = BT_MAP_CLIENT_PATH;
+               break;
        case BT_PBAP_CLIENT_EVENT:
                event_func = __bt_pbap_client_event_filter;
                path = BT_PBAP_CLIENT_PATH;
@@ -2759,14 +3387,22 @@ int _bt_register_event(int event_type, void *event_cb, void *user_data)
                event_func = __bt_hid_device_event_filter;
                path = BT_HID_DEVICE_PATH;
                break;
-#ifdef GATT_NO_RELAY
        case BT_GATT_BLUEZ_EVENT:
                BT_DBG("BT_GATT_BLUEZ_EVENT");
                event_func = __bt_device_event_filter;
                interface = BT_GATT_CHARACTERISTIC_INTERFACE;
                path = NULL;
                break;
-#endif
+       case BT_TDS_EVENT:
+               BT_DBG("BT_TDS_EVENT");
+               event_func = __bt_tds_event_filter;
+               path = BT_TDS_PATH;
+               break;
+       case BT_OTP_EVENT:
+               BT_DBG("BT_OTP_EVENT");
+               event_func = __bt_otp_event_filter;
+               path = BT_OTP_PATH;
+               break;
        default:
                BT_ERR("Unknown event");
                return BLUETOOTH_ERROR_INTERNAL;
@@ -2867,7 +3503,7 @@ void _bt_register_name_owner_changed(void)
                return;
        }
        owner_sig_id = g_dbus_connection_signal_subscribe(connection_type,
-                               NULL, DBUS_INTERFACE_DBUS,
+                               NULL, BT_EVENT_FREEDESKTOP,
                                BT_NAME_OWNER_CHANGED, NULL, NULL, 0,
                                __bt_name_owner_changed, NULL, NULL);
 }