X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-event-handler.c;h=0827627a673c4e1654ae135f8ed3ffe428adb916;hb=8a4d6b041afca0b8e0bdc8c3336a3d7d563988fa;hp=f1cb9671f3ffea2cbcc0e0ed08d1ed6c542182a0;hpb=2526bd7df935a0330d8ad5b5649f9935035ef652;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c index f1cb967..0827627 100644 --- a/bt-api/bt-event-handler.c +++ b/bt-api/bt-event-handler.c @@ -26,10 +26,15 @@ #include "bt-internal-types.h" #include "bluetooth-media-control.h" +#ifndef GATT_DIRECT +#include "bluetooth-gatt-server-api.h" +#endif + #include "bt-common.h" #include "bt-event-handler.h" #include "bt-gatt-client.h" #include "bt-request-sender.h" +#include "bt-gatt-server.h" #define PROFILE_SUPPORTED 0x3 /* This corresponds to binary 0b11*/ #define BT_RELIABLE_DISABLE_TIME 300 /* 300 ms */ @@ -257,7 +262,7 @@ static bluetooth_device_info_t *__bt_get_device_info_in_message(GVariant *parame GVariant *manufacturer_var = NULL; const char *manufacturer_data = NULL; - g_variant_get(parameters, "(isunsbub@asn@ay)", &result, &address, + g_variant_get(parameters, "(i&sun&sbub@asn@ay)", &result, &address, &dev_class, &rssi, &name, &paired, &connected, &trust, &string_var, &manufacturer_data_len, &manufacturer_var); @@ -375,12 +380,26 @@ gboolean __bt_reliable_disable_cb(gpointer user_data) _bt_rfcomm_server_free_all(); #endif - _bluetooth_hid_free_hid_info(); + _bt_hid_free_hid_info(); BT_DBG("-"); return FALSE; } +static void __bt_fill_garray_from_variant(GVariant *var, GArray *param) +{ + char *data; + int size; + + size = g_variant_get_size(var); + if (size > 0) { + data = (char *)g_variant_get_data(var); + if (data) + param = g_array_append_vals(param, data, size); + + } +} + void __bt_adapter_event_filter(GDBusConnection *connection, const gchar *sender_name, const gchar *object_path, @@ -417,6 +436,77 @@ void __bt_adapter_event_filter(GDBusConnection *connection, disable_timer_id = g_timeout_add(BT_RELIABLE_DISABLE_TIME, (GSourceFunc)__bt_reliable_disable_cb, event_info); + } else if (strcasecmp(signal_name, BT_DISABLED_BATTERY_DATA) == 0) { + BT_INFO("BT_DISABLED_BATTERY_DATA"); + + int result; + GVariant *param = NULL; + GArray *dbus_data = NULL; + bt_battery_dbus_data_t *info = NULL; + bt_battery_data *data = NULL; + + g_variant_get(parameters, "(iv)", &result, ¶m); + + if (!param) { + result = BLUETOOTH_ERROR_INTERNAL; + BT_ERR("No data reveived"); + _bt_common_event_cb(BLUETOOTH_EVENT_DISABLED_BATTERY_DATA, + result, data, + event_info->cb, event_info->user_data); + return; + } + + dbus_data = g_array_new(TRUE, TRUE, sizeof(gchar)); + + if (dbus_data == NULL) { + BT_ERR("g_array_new failed"); + g_variant_unref(param); + return; + } + __bt_fill_garray_from_variant(param, dbus_data); + g_variant_unref(param); + + info = &g_array_index(dbus_data, bt_battery_dbus_data_t, 0); + + data = g_new0(bt_battery_data, 1); + + data->session_start_time = info->session_start_time; + data->session_end_time = info->session_end_time; + data->session_scan_time = info->session_scan_time; + data->session_connected_time = info->session_connected_time; + data->atm_list = NULL; + + BT_INFO("Received battery data in bt-api: %ld %ld %d %d.", + data->session_start_time, data->session_end_time, + data->session_scan_time, data->session_connected_time); + + /*Copying app wise details*/ + int n = NUM_APP_MAX < info->num_app ? NUM_APP_MAX : info->num_app; //Maximum NUM_APP_MAX details will be fetched + + for (int i = 0; i < n; i++) { + bt_battery_app_data *app_data = NULL; + app_data = g_malloc0(sizeof(bt_battery_app_data)); + memcpy(app_data, &(info->app_data[i]), sizeof(bt_battery_app_data)); + data->atm_list = g_slist_append(data->atm_list, app_data); + } + + if (data->atm_list == NULL) { + BT_INFO("No app data transaction in this session"); + } + else { + BT_INFO("App-wise data transaction details:"); + for (GSList *l = data->atm_list; l != NULL; l = g_slist_next(l)) { + bt_battery_app_data *t = (bt_battery_app_data *)(l->data); + BT_DBG("%ld %ld %d %d %u", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes, t->time); + } + } + + _bt_common_event_cb(BLUETOOTH_EVENT_DISABLED_BATTERY_DATA, + result, data, + event_info->cb, event_info->user_data); + g_slist_free(data->atm_list); + g_free(data); + g_array_free(dbus_data, TRUE); } else if (strcasecmp(signal_name, BT_DISCOVERABLE_MODE_CHANGED) == 0) { int mode = 0; @@ -608,34 +698,41 @@ void __bt_adapter_event_filter(GDBusConnection *connection, const char *address = NULL; const char *name = NULL; const char *str_passkey = NULL; + bool incoming = false; bluetooth_authentication_request_info_t auth_info; memset(&auth_info, 0x00, sizeof(bluetooth_authentication_request_info_t)); - g_variant_get(parameters, "(i&s&s&s)", &result, &address, &name, &str_passkey); + g_variant_get(parameters, "(b&s&s&s)", &incoming, &address, &name, &str_passkey); g_strlcpy(auth_info.device_name.name, name, BLUETOOTH_DEVICE_NAME_LENGTH_MAX + 1); _bt_convert_addr_string_to_type(auth_info.device_address.addr, address); g_strlcpy(auth_info.str_passkey, str_passkey, strlen(str_passkey)+1); + auth_info.incoming = incoming; + BT_INFO("BLUETOOTH_EVENT_KEYBOARD_PASSKEY_DISPLAY"); _bt_common_event_cb(BLUETOOTH_EVENT_KEYBOARD_PASSKEY_DISPLAY, result, &auth_info, event_info->cb, event_info->user_data); } else if (strcasecmp(signal_name, BT_PIN_REQ_RECEIVED) == 0) { const char *address = NULL; const char *name = NULL; + bool incoming = false; bluetooth_authentication_request_info_t auth_info; memset(&auth_info, 0x00, sizeof(bluetooth_authentication_request_info_t)); - g_variant_get(parameters, "(i&s&s)", &result, &address, &name); + g_variant_get(parameters, "(b&s&s)", &incoming, &address, &name); g_strlcpy(auth_info.device_name.name, name, BLUETOOTH_DEVICE_NAME_LENGTH_MAX + 1); _bt_convert_addr_string_to_type(auth_info.device_address.addr, address); + auth_info.incoming = incoming; + + BT_INFO("BLUETOOTH_EVENT_PIN_REQUEST"); _bt_common_event_cb(BLUETOOTH_EVENT_PIN_REQUEST, result, &auth_info, @@ -643,16 +740,20 @@ void __bt_adapter_event_filter(GDBusConnection *connection, } else if (strcasecmp(signal_name, BT_PASSKEY_REQ_RECEIVED) == 0) { const char *address = NULL; const char *name = NULL; + bool incoming = false; bluetooth_authentication_request_info_t auth_info; memset(&auth_info, 0x00, sizeof(bluetooth_authentication_request_info_t)); - g_variant_get(parameters, "(i&s&s)", &result, &address, &name); + g_variant_get(parameters, "(b&s&s)", &incoming, &address, &name); g_strlcpy(auth_info.device_name.name, name, BLUETOOTH_DEVICE_NAME_LENGTH_MAX + 1); _bt_convert_addr_string_to_type(auth_info.device_address.addr, address); + auth_info.incoming = incoming; + + BT_INFO("BLUETOOTH_EVENT_PASSKEY_REQUEST"); _bt_common_event_cb(BLUETOOTH_EVENT_PASSKEY_REQUEST, result, &auth_info, @@ -661,17 +762,21 @@ void __bt_adapter_event_filter(GDBusConnection *connection, const char *address = NULL; const char *name = NULL; const char *str_passkey = NULL; + bool incoming = false; bluetooth_authentication_request_info_t auth_info; memset(&auth_info, 0x00, sizeof(bluetooth_authentication_request_info_t)); - g_variant_get(parameters, "(i&s&s&s)", &result, &address, &name, &str_passkey); + g_variant_get(parameters, "(b&s&s&s)", &incoming, &address, &name, &str_passkey); g_strlcpy(auth_info.device_name.name, name, BLUETOOTH_DEVICE_NAME_LENGTH_MAX + 1); _bt_convert_addr_string_to_type(auth_info.device_address.addr, address); g_strlcpy(auth_info.str_passkey, str_passkey, strlen(str_passkey)+1); + auth_info.incoming = incoming; + + BT_INFO("BLUETOOTH_EVENT_PASSKEY_CONFIRM_REQUEST"); _bt_common_event_cb(BLUETOOTH_EVENT_PASSKEY_CONFIRM_REQUEST, result, &auth_info, @@ -714,6 +819,7 @@ void __bt_adapter_le_event_filter(GDBusConnection *connection, BLUETOOTH_ERROR_NONE, NULL, event_info->cb, event_info->user_data); } else if (strcasecmp(signal_name, BT_LE_DISCOVERY_FINISHED) == 0) { + _bt_set_le_scan_status(FALSE); g_variant_get(parameters, "(i)", &result); _bt_common_event_cb(BLUETOOTH_EVENT_LE_DISCOVERY_FINISHED, result, NULL, @@ -749,6 +855,7 @@ 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) @@ -760,9 +867,60 @@ 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); +#ifdef TIZEN_GATT_CLIENT + if (strcasecmp(signal_name, BT_GATT_SERVER_CONNECTED) == 0) { + const char *address = NULL; + bluetooth_device_address_t dev_address = { {0} }; + BT_DBG("BT_GATT_SERVER_CONNECTED"); + g_variant_get(parameters, "(i&s)", &result, &address); + + _bt_convert_addr_string_to_type(dev_address.addr, address); + BT_DBG("Sending Event to Framework"); + _bt_common_event_cb(BLUETOOTH_EVENT_GATT_SERVER_CONNECTED, + result, &dev_address, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_SERVER_DISCONNECTED) == 0) { + const char *address = NULL; + bluetooth_device_address_t dev_address = { {0} }; + BT_DBG("BT_GATT_SERVER_DISCONNECTED"); + g_variant_get(parameters, "(i&s)", &result, &address); + + _bt_convert_addr_string_to_type(dev_address.addr, address); + BT_DBG("Sending Event to Framework"); + _bt_common_event_cb(BLUETOOTH_EVENT_GATT_SERVER_DISCONNECTED, + result, &dev_address, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_CLIENT_CONNECTED) == 0) { + const char *address = NULL; + bluetooth_device_address_t dev_address = { {0} }; + BT_DBG("BT_GATT_CLIENT_CONNECTED"); + g_variant_get(parameters, "(i&s)", &result, &address); + + _bt_convert_addr_string_to_type(dev_address.addr, address); + BT_DBG("Sending Event to Framework"); + _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CLIENT_CONNECTED, + result, &dev_address, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_CLIENT_DISCONNECTED) == 0) { + const char *address = NULL; + bluetooth_device_address_t dev_address = { {0} }; + BT_DBG("BT_GATT_CLIENT_DISCONNECTED"); + g_variant_get(parameters, "(i&s)", &result, &address); + _bt_convert_addr_string_to_type(dev_address.addr, address); + BT_DBG("Sending Event to Framework"); + _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CLIENT_DISCONNECTED, + result, &dev_address, + event_info->cb, event_info->user_data); +#else if (strcasecmp(signal_name, BT_GATT_CONNECTED) == 0) { const char *address = NULL; bluetooth_device_address_t dev_address = { {0} }; @@ -770,6 +928,7 @@ void __bt_device_event_filter(GDBusConnection *connection, g_variant_get(parameters, "(i&s)", &result, &address); _bt_convert_addr_string_to_type(dev_address.addr, address); + BT_DBG("Sending Event to Framework"); _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CONNECTED, result, &dev_address, event_info->cb, event_info->user_data); @@ -780,9 +939,11 @@ void __bt_device_event_filter(GDBusConnection *connection, g_variant_get(parameters, "(i&s)", &result, &address); _bt_convert_addr_string_to_type(dev_address.addr, address); + BT_DBG("Sending Event to Framework"); _bt_common_event_cb(BLUETOOTH_EVENT_GATT_DISCONNECTED, result, &dev_address, event_info->cb, event_info->user_data); +#endif } else if (strcasecmp(signal_name, BT_GATT_REQ_ATT_MTU_CHANGED) == 0) { const char *address = NULL; bluetooth_device_address_t dev_address = { {0} }; @@ -791,6 +952,7 @@ void __bt_device_event_filter(GDBusConnection *connection, guint8 status; BT_DBG("BT_GATT_REQ_ATT_MTU_CHANGED"); g_variant_get(parameters, "(i&sqy)", &result, &address, &mtu, &status); + BT_DBG("Result [%d] Address [%s] MTU [%d] status [%d]", result, address, mtu, status); _bt_convert_addr_string_to_type(dev_address.addr, address); @@ -805,12 +967,17 @@ 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; GVariant *char_value_var = NULL; bt_gatt_char_value_t char_val = { 0, }; + BT_DBG("BT_GATT_CHAR_VAL_CHANGED"); g_variant_get(parameters, "(i&s@ay)", &result, &char_handle, &char_value_var); @@ -852,6 +1019,7 @@ void __bt_device_event_filter(GDBusConnection *connection, conn_info.addr_type = addr_type; conn_info.disc_reason = 0; + BT_DBG("Sending Event to Framework"); _bt_common_event_cb(BLUETOOTH_EVENT_DEVICE_CONNECTED, result, &conn_info, event_info->cb, event_info->user_data); @@ -861,8 +1029,9 @@ void __bt_device_event_filter(GDBusConnection *connection, unsigned char addr_type; bt_connection_info_t conn_info; bluetooth_device_address_t dev_address = { {0} }; + int rssi; BT_DBG("BT_DEVICE_DISCONNECTED"); - g_variant_get(parameters, "(i&sy)", &result, &address, &addr_type); + g_variant_get(parameters, "(i&syi)", &result, &address, &addr_type, &rssi); _bt_convert_addr_string_to_type(dev_address.addr, address); @@ -875,6 +1044,8 @@ void __bt_device_event_filter(GDBusConnection *connection, conn_info.addr_type = addr_type; conn_info.disc_reason = result; + conn_info.rssi = rssi; + BT_DBG("Sending Event to Framework, disconnect reason [0x%x]", result); _bt_common_event_cb(BLUETOOTH_EVENT_DEVICE_DISCONNECTED, result, &conn_info, event_info->cb, event_info->user_data); @@ -1284,10 +1455,10 @@ void __bt_hid_device_event_filter(GDBusConnection *connection, address); int ctrl = -1, intr = -1; _bt_hid_device_get_fd(address, &ctrl, &intr); - if (ctrl != -1 && intr != -1) { - new_hid_connection(NULL, ctrl, &dev_address); - new_hid_connection(NULL, intr, &dev_address); - } + if (ctrl != -1 && intr != -1) + _bt_hid_new_connection(&dev_address, ctrl, intr); + else + BT_ERR("fd is invalid.(ctrl=%d, intr=%d)", ctrl, intr); } else if (strcasecmp(signal_name, BT_INPUT_HID_DEVICE_DISCONNECTED) == 0) { const char *address = NULL; g_variant_get(parameters, "(i&s)", &result, &address); @@ -1483,6 +1654,13 @@ void __bt_avrcp_event_filter(GDBusConnection *connection, _bt_avrcp_event_cb(BLUETOOTH_EVENT_AVRCP_SETTING_SCAN_STATUS, result, &status, event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_MEDIA_DELAY_CHANGE) == 0) { + unsigned int delay; + + g_variant_get(parameters, "(u)", &delay); + _bt_avrcp_event_cb(BLUETOOTH_EVENT_AVRCP_DELAY_CHANGED, + result, &delay, + event_info->cb, event_info->user_data); } } @@ -1566,24 +1744,23 @@ void __bt_avrcp_control_event_filter(GDBusConnection *connection, event_info->cb, event_info->user_data); } else if (strcasecmp(signal_name, BT_MEDIA_TRACK_CHANGE) == 0) { media_metadata_attributes_t metadata; - const char *title; - const char *artist; - const char *album; - const char *genre; + GVariant *title = NULL; + GVariant *artist = NULL; + GVariant *album = NULL; + GVariant *genre = NULL; + unsigned int total_tracks; unsigned int number; unsigned int duration; - g_variant_get(parameters, "(&s&s&s&suuu)", &title, - &artist, &album, &genre, - &total_tracks, &number, - &duration); - memset(&metadata, 0x00, sizeof(media_metadata_attributes_t)); + g_variant_get(parameters, "(@ay@ay@ay@ayuuu)", + &title, &artist, &album, &genre, + &total_tracks, &number, &duration); - metadata.title = title; - metadata.artist = artist; - metadata.album = album; - metadata.genre = genre; + metadata.title = g_variant_get_bytestring(title); + metadata.artist = g_variant_get_bytestring(artist); + metadata.album = g_variant_get_bytestring(album); + metadata.genre = g_variant_get_bytestring(genre); metadata.total_tracks = total_tracks; metadata.number = number; metadata.duration = duration; @@ -1591,6 +1768,11 @@ void __bt_avrcp_control_event_filter(GDBusConnection *connection, _bt_avrcp_event_cb(BLUETOOTH_EVENT_AVRCP_TRACK_CHANGED, result, &metadata, event_info->cb, event_info->user_data); + + g_variant_unref(title); + g_variant_unref(artist); + g_variant_unref(album); + g_variant_unref(genre); } } @@ -2046,7 +2228,7 @@ void __bt_map_client_event_filter(GDBusConnection *connection, 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); + BT_DBG("g_variant_iter_n_children: %lli", (long long int)folders_struct.size); GVariantIter* res = NULL; int i = 0; while (g_variant_iter_loop(iter, "a{sv}", &res)) { @@ -2131,7 +2313,7 @@ void __bt_map_client_event_filter(GDBusConnection *connection, 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); + BT_DBG("g_variant_iter_n_children: %lli", (long long int)messages_struct.size); char *object = NULL; GVariantIter *properites = NULL; @@ -2201,7 +2383,7 @@ void __bt_map_client_event_filter(GDBusConnection *connection, } 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); + BT_DBG(" Size: %llu", (unsigned long long int)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; @@ -2213,7 +2395,7 @@ void __bt_map_client_event_filter(GDBusConnection *connection, } 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); + BT_DBG(" AttachmentSize: %llu", (unsigned long long int)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; @@ -2399,7 +2581,7 @@ void __bt_pbap_client_event_filter(GDBusConnection *connection, for (i = 0; i < count; i++) BT_DBG("%s", list[i]); - BT_DBG("address: %s, result: %d, count: %d, success: %d", + BT_DBG("address: %s, result: %d, count: %zd, success: %d", address, result, count, success); _bt_convert_addr_string_to_type(vc_list.btaddr.addr, @@ -2607,16 +2789,30 @@ void __bt_rfcomm_server_event_filter(GDBusConnection *connection, bluetooth_rfcomm_connection_request_t req_ind; char *address = NULL; char *uuid = NULL; + int socket_fd = 0; +#ifdef TIZEN_FEATURE_BT_RFCOMM_DIRECT char *name = NULL; char *path = NULL; - int socket_fd = 0; g_variant_get(parameters, "(i&s&s&s&sn)", &result, &address, &uuid, &name, &path, &socket_fd); if (_check_uuid_path(path, uuid) == FALSE) return; +#else + gboolean auto_accept = FALSE; + + g_variant_get(parameters, "(i&s&s)", &result, &address, &uuid); + socket_fd = _get_rfcomm_server_id(uuid, &auto_accept); + if (0 > socket_fd) + return; + _bt_rfcomm_server_set_pending_conn(socket_fd, address); + if (auto_accept) { + bluetooth_rfcomm_accept_connection(socket_fd); + return; + } +#endif memset(&req_ind, 0x00, sizeof(bluetooth_rfcomm_connection_request_t)); _bt_convert_addr_string_to_type(req_ind.device_addr.addr, address); @@ -2667,14 +2863,13 @@ void __bt_hf_agent_event_filter(GDBusConnection *connection, GVariant *parameters, gpointer user_data) { - BT_DBG("+\n"); + BT_DBG("+"); bt_event_info_t *event_info; int result = BLUETOOTH_ERROR_NONE; event_info = (bt_event_info_t *)user_data; ret_if(event_info == NULL); - BT_DBG("+\n"); if (strcasecmp(object_path, BT_HF_AGENT_PATH) != 0) return; if (strcasecmp(interface_name, BT_HF_SERVICE_INTERFACE) != 0) @@ -2686,14 +2881,14 @@ void __bt_hf_agent_event_filter(GDBusConnection *connection, if (strcasecmp(signal_name, "Connected") == 0) { char *address = NULL; - g_variant_get(parameters, "(s)", &address); + g_variant_get(parameters, "(&s)", &address); _bt_hf_event_cb(BLUETOOTH_EVENT_HF_CONNECTED, result, address, event_info->cb, event_info->user_data); } else if (strcasecmp(signal_name, "Disconnected") == 0) { char *address = NULL; - g_variant_get(parameters, "(s)", &address); + g_variant_get(parameters, "(&s)", &address); _bt_hf_event_cb(BLUETOOTH_EVENT_HF_DISCONNECTED, result, address, event_info->cb, event_info->user_data); @@ -2861,7 +3056,7 @@ void __bt_hf_agent_event_filter(GDBusConnection *connection, event_info->cb, event_info->user_data); } } - BT_DBG("-\n"); + BT_DBG("-"); } static void __bt_tds_event_filter(GDBusConnection *connection, @@ -2928,35 +3123,36 @@ static void __bt_tds_event_filter(GDBusConnection *connection, 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); + if (data) { + 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]); + /* 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; - } + 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); + 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_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); + _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); + 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"); @@ -3063,6 +3259,10 @@ static void __bt_otp_event_filter(GDBusConnection *connection, /* Extract data from DBUS params */ g_variant_get(parameters, "(i&sn@ay)", &result, &handle, &data_len, &var); + if (!var) { + BT_ERR("No data"); + return; + } data = (char *)g_variant_get_data(var); BT_DBG("Handle [%s]", handle); @@ -3084,16 +3284,14 @@ static void __bt_otp_event_filter(GDBusConnection *connection, result, info, event_info->cb, event_info->user_data); - if (info->handle) { + if (info->handle) g_free(info->handle); - } if (info->data) { g_free(info->data); g_free(info); } - if (var) - g_variant_unref(var); + g_variant_unref(var); } else if (strcasecmp(signal_name, BT_OTP_NOTIFICATION_ENABLED) == 0) { BT_DBG("OTP Notification Enabled event"); char *handle = NULL; @@ -3126,6 +3324,10 @@ static void __bt_otp_event_filter(GDBusConnection *connection, char *handle = NULL; g_variant_get(parameters, "(i&s@ay)", &result, &handle, &byte_var); + if (!byte_var) { + BT_ERR("No Indication data from Server"); + return; + } ind_res = g_malloc0(sizeof(bluetooth_otp_resp_info_t)); ind_res->data_length = g_variant_get_size(byte_var); @@ -3137,16 +3339,14 @@ static void __bt_otp_event_filter(GDBusConnection *connection, result, ind_res, event_info->cb, event_info->user_data); - if (ind_res->handle) { + 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); + g_variant_unref(byte_var); } else if (strcasecmp(signal_name, BT_OTC_STATE_CHANGED) == 0) { BT_DBG("OTC State Changed"); char *address = NULL; @@ -3174,6 +3374,68 @@ static void __bt_otp_event_filter(GDBusConnection *connection, BT_DBG("-"); } +void __bt_hdp_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; + int result = BLUETOOTH_ERROR_NONE; + + BT_DBG("+"); + event_info = (bt_event_info_t *)user_data; + ret_if(event_info == NULL); + + if (strcasecmp(object_path, BT_HDP_DEVICE_PATH) != 0) + return; + if (strcasecmp(interface_name, BT_EVENT_SERVICE) != 0) + return; + + ret_if(signal_name == NULL); + + if (strcasecmp(signal_name, BT_HDP_CONNECTED) == 0) { + const char *address = NULL; + char *app_handle = NULL; + bt_hdp_connected_t conn_info; + + g_variant_get(parameters, "(i&s&sui)", &result, + &address, &app_handle, + &(conn_info.channel_id), &(conn_info.type)); + + conn_info.app_handle = app_handle; + + BT_DBG("address: %s, app_handle: %s, ch_id: %d, ch_type: %d", + address, conn_info.app_handle, conn_info.channel_id, conn_info.type); + _bt_convert_addr_string_to_type(conn_info.device_address.addr, address); + + if (BLUETOOTH_ERROR_NONE == result) + result = _bt_hdp_app_acquire_fd(&conn_info); + + _bt_common_event_cb(BLUETOOTH_EVENT_HDP_CONNECTED, + result, &conn_info, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_HDP_DISCONNECTED) == 0) { + const char *address = NULL; + bt_hdp_disconnected_t disconn_info; + + g_variant_get(parameters, "(i&su)", &result, + &address, &(disconn_info.channel_id)); + + BT_DBG("address: %s", address); + _bt_convert_addr_string_to_type(disconn_info.device_address.addr, address); + + _bt_hdp_app_remove_obj_info(disconn_info.channel_id); + _bt_common_event_cb(BLUETOOTH_EVENT_HDP_DISCONNECTED, + result, &disconn_info, + event_info->cb, event_info->user_data); + } + + BT_DBG("-"); +} + static void __bt_remove_all_events(void) { bt_event_info_t *info; @@ -3300,6 +3562,480 @@ static void __bt_event_data_free(void *data) g_free(cb_data); } +#ifdef TIZEN_GATT_CLIENT +static void __bt_gatt_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("GATT Client event handler Entry >>"); + + 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(signal_name, BT_GATT_CHAR_VAL_CHANGED) == 0) { /* Done */ + /* Event: BLUETOOTH_EVENT_GATT_CHAR_VAL_CHANGED */ + BT_INFO("GATT Client event[BT_GATT_CHAR_VAL_CHANGED]"); + bt_gatt_char_property_t char_prop; + const char *address = NULL; + GVariant *data_var = NULL; + GVariant *svc_uuid_var = NULL; + int svc_inst; + GVariant *char_uuid_var = NULL; + int svc_uuid_len = 0; + int char_uuid_len = 0; + unsigned int i; + + memset(&char_prop, 0x00, sizeof(bt_gatt_char_property_t)); + + /* Extract data from DBUS params */ + g_variant_get(parameters, "(i&sn@ayin@ayin@ay)", + &result, + &address, + &svc_uuid_len, + &svc_uuid_var, + &svc_inst, + &char_uuid_len, + &char_uuid_var, + &char_prop.prop.instance_id, + &char_prop.val_len, + &data_var); + g_strlcpy(char_prop.address, address, BT_ADDRESS_STRING_SIZE); + + BT_INFO("GATT Client Char value changed in remote Server [%s]", address); + BT_INFO("GATT Client Char Val len: [%d]", char_prop.val_len); + + if (char_prop.val_len > 0) { + /* Copy Data */ + memcpy(&char_prop.value, g_variant_get_data(data_var), char_prop.val_len); + } + + memcpy(&char_prop.prop.uuid, g_variant_get_data(char_uuid_var), 16); + + /* Copy SVC data */ + memcpy(&char_prop.svc_prop.uuid, g_variant_get_data(svc_uuid_var), 16); + char_prop.svc_prop.instance_id = svc_inst; + + /* DEBUG */ + for (i = 0; i < char_prop.val_len; i++) + BT_INFO("Data[%d] = [0x%x]", i, char_prop.value[i]); + + _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_CHAR_VAL_CHANGED, + result, &char_prop, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_CLIENT_READ_CHAR) == 0) { /* Done */ + /* Event: BLUETOOTH_EVENT_GATT_READ_CHAR */ + BT_INFO("GATT Client event[BT_GATT_CLIENT_READ_CHAR]"); + bt_gatt_char_property_t char_prop; + const char *address = NULL; + GVariant *data_var = NULL; + GVariant *svc_uuid_var = NULL; + int svc_inst = 0; + GVariant *char_uuid_var = NULL; + int svc_uuid_len = 0; + int char_uuid_len = 0; + unsigned int i; + + memset(&char_prop, 0x00, sizeof(bt_gatt_char_property_t)); + + /* Extract data from DBUS params */ + g_variant_get(parameters, "(i&sn@ayin@ayin@ay)", + &result, + &address, + &svc_uuid_len, + &svc_uuid_var, + &svc_inst, + &char_uuid_len, + &char_uuid_var, + &char_prop.prop.instance_id, + &char_prop.val_len, + &data_var); + g_strlcpy(char_prop.address, address, BT_ADDRESS_STRING_SIZE); + + BT_INFO("GATT Client Read Callback from [%s] svc inst [%d] char val len [%d] char inst [%d]", + address, svc_inst, char_prop.val_len, char_prop.prop.instance_id); + + if (char_prop.val_len > 0) { + BT_INFO("Get the read data"); + /* Copy Data */ + memcpy(&char_prop.value, g_variant_get_data(data_var), char_prop.val_len); + } + + memcpy(&char_prop.prop.uuid, g_variant_get_data(char_uuid_var), 16); + + /* Copy Svc Data */ + memcpy(&char_prop.svc_prop.uuid, g_variant_get_data(svc_uuid_var), 16); + char_prop.svc_prop.instance_id = svc_inst; + + /* DEBUG */ + for (i = 0; i < char_prop.val_len; i++) + BT_INFO("Data[%d] = [0x%x]", i, char_prop.value[i]); + + _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_READ_CHAR, + result, &char_prop, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_CLIENT_WRITE_CHAR) == 0) { /* Done */ + /* Event: BLUETOOTH_EVENT_GATT_WRITE_CHAR */ + BT_INFO("GATT Client event[BT_GATT_CLIENT_WRITE_CHAR]"); + bt_gatt_char_property_t char_prop; + const char *address = NULL; + GVariant *svc_uuid_var = NULL; + int svc_inst = 0; + GVariant *char_uuid_var = NULL; + int svc_uuid_len = 0; + int char_uuid_len = 0; + + memset(&char_prop, 0x00, sizeof(bt_gatt_char_property_t)); + + /* Extract data from DBUS params */ + g_variant_get(parameters, "(i&sn@ayin@ayi)", + &result, + &address, + &svc_uuid_len, + &svc_uuid_var, + &svc_inst, + &char_uuid_len, + &char_uuid_var, + &char_prop.prop.instance_id); + + g_strlcpy(char_prop.address, address, BT_ADDRESS_STRING_SIZE); + + BT_DBG("GATT Client Char Write Done in remote Server [%s]", address); + + /* Copy Data */ + memcpy(&char_prop.prop.uuid, g_variant_get_data(char_uuid_var), 16); + + /* Copy Svc Data */ + memcpy(&char_prop.svc_prop.uuid, g_variant_get_data(svc_uuid_var), 16); + char_prop.svc_prop.instance_id = svc_inst; + + _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_WRITE_CHAR, + result, &char_prop, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_CLIENT_READ_DESC) == 0) { /* Done */ + /* Event: BLUETOOTH_EVENT_GATT_READ_DESC */ + BT_INFO("GATT Client event[BT_GATT_CLIENT_READ_DESC]"); + bt_gatt_char_descriptor_property_t desc_prop; + const char *address = NULL; + GVariant *data_var = NULL; + GVariant *svc_uuid_var = NULL; + int svc_inst = 0; + GVariant *char_uuid_var = NULL; + int char_inst = 0; + GVariant *desc_uuid_var = NULL; + int svc_uuid_len = 0; + int char_uuid_len = 0; + int desc_uuid_len = 0; + unsigned int i; + + memset(&desc_prop, 0x00, sizeof(bt_gatt_char_descriptor_property_t)); + + /* Extract data from DBUS params */ + g_variant_get(parameters, "(i&sn@ayin@ayin@ayin@ay)", + &result, + &address, + &svc_uuid_len, + &svc_uuid_var, + &svc_inst, + &char_uuid_len, + &char_uuid_var, + &char_inst, + &desc_uuid_len, + &desc_uuid_var, + &desc_prop.prop.instance_id, + &desc_prop.val_len, + &data_var); + g_strlcpy(desc_prop.address, address, BT_ADDRESS_STRING_SIZE); + + BT_DBG("GATT Client Read Descriptor Callback from [%s]", address); + BT_DBG("GATT Client Descriptor Val len: [%d]", desc_prop.val_len); + + /* Copy Data */ + if (desc_prop.val_len > 0) { + BT_INFO("Get the desc read data"); + memcpy(&desc_prop.value, g_variant_get_data(data_var), desc_prop.val_len); + } + + memcpy(&desc_prop.prop.uuid, g_variant_get_data(desc_uuid_var), 16); + + /* Copy Char Data */ + memcpy(&desc_prop.char_prop.uuid, g_variant_get_data(char_uuid_var), 16); + desc_prop.char_prop.instance_id = char_inst; + + /* Copy Svc Data */ + memcpy(&desc_prop.svc_prop.uuid, g_variant_get_data(svc_uuid_var), 16); + desc_prop.svc_prop.instance_id = svc_inst; + + /* DEBUG */ + for (i = 0; i < desc_prop.val_len; i++) + BT_INFO("Data[%d] = [0x%x]", i, desc_prop.value[i]); + + _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_READ_DESC, + result, &desc_prop, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_CLIENT_WRITE_DESC) == 0) { /* Done */ + /* Event: BLUETOOTH_EVENT_GATT_WRITE_DESC */ + BT_INFO("GATT Client event[BT_GATT_CLIENT_WRITE_DESC]"); + bt_gatt_char_descriptor_property_t desc_prop; + const char *address = NULL; + GVariant *svc_uuid_var = NULL; + int svc_inst = 0; + GVariant *char_uuid_var = NULL; + int char_inst; + GVariant *desc_uuid_var = NULL; + int svc_uuid_len = 0; + int char_uuid_len = 0; + int desc_uuid_len = 0; + + memset(&desc_prop, 0x00, sizeof(bt_gatt_char_descriptor_property_t)); + + /* Extract data from DBUS params */ + g_variant_get(parameters, "(i&sn@ayin@ayin@ayi)", + &result, + &address, + &svc_uuid_len, + &svc_uuid_var, + &svc_inst, + &char_uuid_len, + &char_uuid_var, + &char_inst, + &desc_uuid_len, + &desc_uuid_var, + &desc_prop.prop.instance_id); + + g_strlcpy(desc_prop.address, address, BT_ADDRESS_STRING_SIZE); + + BT_INFO("GATT Client Write Descriptor Callback from [%s]", address); + BT_INFO("GATT Client Descriptor Val len: [%d]", desc_prop.val_len); + + /* Copy Data */ + memcpy(&desc_prop.prop.uuid, g_variant_get_data(desc_uuid_var), 16); + + /* Copy Char Data */ + memcpy(&desc_prop.char_prop.uuid, g_variant_get_data(char_uuid_var), 16); + desc_prop.char_prop.instance_id = char_inst; + + /* Copy Svc Data */ + memcpy(&desc_prop.svc_prop.uuid, g_variant_get_data(svc_uuid_var), 16); + desc_prop.svc_prop.instance_id = svc_inst; + + _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_WRITE_DESC, + result, &desc_prop, + event_info->cb, event_info->user_data); + } + + BT_DBG("GATT Client event handler Exit <<"); +} + +#endif + + +#ifndef GATT_DIRECT +static void __bt_gatt_server_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_INFO("GATT Server event handler Entry >>"); + + bt_event_info_t *event_info; + int result = BLUETOOTH_ERROR_NONE; + + event_info = (bt_event_info_t *)user_data; + ret_if(event_info == NULL); +#ifdef TIZEN_GATT_CLIENT + if (strcasecmp(signal_name, BT_GATT_VALUE_CHANGED) == 0) { +#else + if (strcasecmp(signal_name, BT_GATT_CONNECTED) == 0) { + const char *address = NULL; + bluetooth_device_address_t dev_address = { {0} }; + BT_DBG("BT_GATT_CONNECTED"); + g_variant_get(parameters, "(i&s)", &result, &address); + + _bt_convert_addr_string_to_type(dev_address.addr, address); + _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_CONNECTED, + result, &dev_address, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_DISCONNECTED) == 0) { + const char *address = NULL; + bluetooth_device_address_t dev_address = { {0} }; + BT_DBG("BT_GATT_DISCONNECTED"); + g_variant_get(parameters, "(i&s)", &result, &address); + + _bt_convert_addr_string_to_type(dev_address.addr, address); + _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_DISCONNECTED, + result, &dev_address, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_VALUE_CHANGED) == 0) { +#endif + BT_INFO("GATT Server event[BT_GATT_SERVER_WRITE_REQUESTED]"); + const char *address = NULL; + GVariant *data_var = NULL; + int i; + bluetooth_device_address_t dev_address = { {0} }; + + bluetooth_gatt_server_write_requested_info_t write_info; + memset(&write_info, 0x00, sizeof(bluetooth_gatt_server_write_requested_info_t)); + + /* Extract data from DBUS params */ + g_variant_get(parameters, "(iiiiiibb&sn@ay)", + &result, + &write_info.connection_id, + &write_info.request_id, + &write_info.attribute_handle, + &write_info.offset, + &write_info.length, + &write_info.need_resp, + &write_info.is_prep_write, + &address, + &write_info.length, + &data_var); + + _bt_convert_addr_string_to_type(dev_address.addr, + address); + + BT_DBG("GATT Server Write From Remote Client [%s]", address); + BT_DBG("GATT Server Write len: [%d]", write_info.length); + BT_DBG("GATT Server Conn ID: [%d]", write_info.connection_id); + BT_DBG("GATT Server Req ID: [%d]", write_info.request_id); + BT_DBG("GATT Server att handle:[%d]", write_info.attribute_handle); + BT_DBG("GATT Server Offset: [%d]", write_info.offset); + BT_DBG("GATT Server Need Resp: [%d]", write_info.need_resp); + BT_DBG("GATT Server Is Prep: [%d]", write_info.is_prep_write); + + /* Copy Data */ + memcpy(&write_info.data.data, g_variant_get_data(data_var), write_info.length); + + memcpy(write_info.device_address.addr, + dev_address.addr, + BLUETOOTH_ADDRESS_LENGTH); + + /* DEBUG */ + for (i = 0; i < write_info.length; i++) + BT_DBG("Data[%d] = [0x%x]", i, write_info.data.data[i]); + + _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_SERVER_VALUE_CHANGED, + BLUETOOTH_ERROR_NONE, &write_info, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_SERVER_READ_REQ) == 0) { + const char *address = NULL; + bluetooth_device_address_t dev_address = { {0} }; + bluetooth_gatt_server_read_requested_info_t read_info; + + memset(&read_info, 0x00, sizeof(bluetooth_gatt_server_read_requested_info_t)); + + /* Extract data from DBUS params */ + g_variant_get(parameters, "(iiiiib&s)", &result, + &read_info.connection_id, &read_info.request_id, + &read_info.attribute_handle, &read_info.offset, + &read_info.is_long, &address); + + _bt_convert_addr_string_to_type(dev_address.addr, + address); + /* Copy Data */ + memcpy(read_info.device_address.addr, + dev_address.addr, + BLUETOOTH_ADDRESS_LENGTH); + + _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_SERVER_READ_REQUESTED, + result, &read_info, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_SERVER_ACQUIRE_WRITE) == 0) { + + bluetooth_gatt_server_send_acquire_write_response(parameters); + + } else if (strcasecmp(signal_name, BT_GATT_SERVER_ACQUIRE_NOTIFICATION) == 0) { + + bluetooth_gatt_server_send_acquire_notify_response(parameters, event_info); + + } else if (strcasecmp(signal_name, BT_GATT_SERVER_NOTIFICATION_COMPLETED) == 0) { + const char *address = NULL; + bluetooth_device_address_t dev_address = { {0} }; + bluetooth_gatt_server_indicate_confirmed_info_t info; + memset(&info, 0x00, sizeof(bluetooth_gatt_server_indicate_confirmed_info_t)); + + BT_INFO("GATT Server event[BT_GATT_SERVER_NOTIFICATION_COMPLETED]"); + /* Extract data from DBUS params */ + g_variant_get(parameters, "(i&sib)", &result, &address, &info.handle, &info.completed); + + _bt_convert_addr_string_to_type(dev_address.addr, + address); + /* Copy Data */ + memcpy(info.device_address.addr, + dev_address.addr, + BLUETOOTH_ADDRESS_LENGTH); + + BT_INFO("GATT Server: Indicate confirmed Handle: [%d] address [%s] completed [%d] result [%d]", + info.handle, address, info.completed, result); + + + _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_COMPLETED, + result, &info, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_SERVER_NOTIFICATION_CHANGED) == 0) { + const char *address = NULL; + bluetooth_device_address_t dev_address = { {0} }; + bluetooth_gatt_server_notification_changed_t info; + memset(&info, 0x00, sizeof(bluetooth_gatt_server_notification_changed_t)); + + BT_INFO("GATT Server event[BT_GATT_SERVER_NOTIFICATION_CHANGED]"); + /* Extract data from DBUS params */ + g_variant_get(parameters, "(i&sib)", &result, &address, &info.handle, &info.notification); + + _bt_convert_addr_string_to_type(dev_address.addr, + address); + /* Copy Data */ + memcpy(info.device_address.addr, + dev_address.addr, + BLUETOOTH_ADDRESS_LENGTH); + + BT_INFO("GATT Server: Notification Enabled?? Handle: [%d] address [%s] Is Enabled [%d] result [%d]", + info.handle, address, info.notification, result); + + if (info.notification == FALSE) + cleanup_gatt_acquire_fd(info.handle); + + _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_SERVER_NOTIFICATION_STATE_CHANGED, + result, &info, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_GATT_SERVER_ATT_MTU_CHANGED) == 0) { + const char *address = NULL; + bluetooth_device_address_t dev_address = { {0} }; + bluetooth_le_att_mtu_info_t att_mtu_info; + guint16 mtu; + guint8 status; + BT_DBG("BT_GATT_SERVER_ATT_MTU_CHANGED"); + g_variant_get(parameters, "(i&sqy)", &result, &address, &mtu, &status); + + _bt_convert_addr_string_to_type(dev_address.addr, address); + + memset(&att_mtu_info, 0x00, sizeof(bluetooth_le_att_mtu_info_t)); + memcpy(att_mtu_info.device_address.addr, + dev_address.addr, + BLUETOOTH_ADDRESS_LENGTH); + + att_mtu_info.mtu = mtu; + att_mtu_info.status = status; + + _bt_common_event_cb(BLUETOOTH_EVENT_GATT_SERVER_ATT_MTU_CHANGED, + result, &att_mtu_info, + event_info->cb, event_info->user_data); + } + + + BT_INFO("GATT Server event handler Exit <<"); +} +#endif + int _bt_register_event(int event_type, void *event_cb, void *user_data) { GDBusConnection *connection_type; @@ -3389,12 +4125,14 @@ 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; @@ -3405,12 +4143,30 @@ int _bt_register_event(int event_type, void *event_cb, void *user_data) event_func = __bt_otp_event_filter; path = BT_OTP_PATH; break; + case BT_HDP_EVENT: + BT_DBG("BT_HDP_EVENT"); + event_func = __bt_hdp_event_filter; + path = BT_HDP_DEVICE_PATH; + break; +#ifndef GATT_DIRECT + case BT_GATT_SERVER_EVENT: + event_func = __bt_gatt_server_event_filter; + path = BT_GATT_SERVER_PATH; + break; +#endif + +#ifdef TIZEN_GATT_CLIENT + case BT_GATT_CLIENT_EVENT: + event_func = __bt_gatt_client_event_filter; + path = BT_GATT_CLIENT_PATH; + break; +#endif default: BT_ERR("Unknown event"); return BLUETOOTH_ERROR_INTERNAL; } - connection_type = _bt_gdbus_get_system_gconn(); + connection_type = _bt_get_system_private_conn(); if (connection_type == NULL) return BLUETOOTH_ERROR_INTERNAL; @@ -3451,7 +4207,7 @@ int _bt_unregister_event(int event_type) return BLUETOOTH_ERROR_INTERNAL; } - connection_type = _bt_gdbus_get_system_gconn(); + connection_type = _bt_get_system_private_conn(); event_list = g_slist_remove(event_list, (void *)cb_data); @@ -3499,7 +4255,7 @@ void _bt_register_name_owner_changed(void) { GDBusConnection *connection_type; - connection_type = _bt_gdbus_get_system_gconn(); + connection_type = _bt_get_system_private_conn(); if (connection_type == NULL) { BT_ERR("Unable to get the bus"); return; @@ -3514,7 +4270,7 @@ void _bt_unregister_name_owner_changed(void) { GDBusConnection *connection_type; - connection_type = _bt_gdbus_get_system_gconn(); + connection_type = _bt_get_system_private_conn(); if (connection_type != NULL && owner_sig_id > 0) { g_dbus_connection_signal_unsubscribe(connection_type, owner_sig_id); @@ -3522,6 +4278,46 @@ void _bt_unregister_name_owner_changed(void) } } +static void __bt_gatt_get_uuid_from_path(char *path, char **service_uuid) +{ + GDBusProxy *proxy = NULL; + GError *err = NULL; + GDBusConnection *g_conn; + GVariant *ret = NULL; + GVariant *value = NULL; + + g_conn = _bt_get_system_private_conn(); + ret_if(g_conn == NULL); + + proxy = g_dbus_proxy_new_sync(g_conn, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, + BT_BLUEZ_NAME, + path, + BT_PROPERTIES_INTERFACE, + NULL, &err); + + ret_if(proxy == NULL); + + ret = g_dbus_proxy_call_sync(proxy, "Get", + g_variant_new("(ss)", GATT_SERV_INTERFACE, "UUID"), + G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err); + if (err) { + BT_ERR("DBus Error : %s", err->message); + g_clear_error(&err); + } else { + g_variant_get(ret, "(v)", &value); + *service_uuid = g_variant_dup_string(value, NULL); + g_variant_unref(value); + g_variant_unref(ret); + } + + if (proxy) + g_object_unref(proxy); + + return; +} + + static void __bt_manager_event_filter(GDBusConnection *connection, const gchar *sender_name, const gchar *object_path, @@ -3555,9 +4351,17 @@ static void __bt_manager_event_filter(GDBusConnection *connection, BT_INFO("GATT Service [%s] added, but no watcher for %s", path, secure_address); return; - } else + } else { + char *uuid = NULL; + char *name = NULL; + __bt_gatt_get_uuid_from_path(path, &uuid); + bluetooth_get_uuid_name(uuid, &name); + BT_INFO(" ### GATT Service added [%s] [%s]", - path, secure_address); + path, name); + g_free(name); + g_free(uuid); + } change.svc_path = g_strdup(path); change.change_type = BLUETOOTH_GATT_SERVICE_CHANGE_TYPE_ADD; @@ -3583,10 +4387,7 @@ static void __bt_manager_event_filter(GDBusConnection *connection, if (g_strcmp0(interface_str, GATT_SERV_INTERFACE) != 0) continue; - _bt_convert_addr_type_to_secure_string(secure_address, - change.device_addr.addr); - BT_INFO(" ### GATT Service removed [%s] [%s]", - path, secure_address); + BT_INFO(" ### GATT Service removed [%s]", path); change.svc_path = g_strdup(path); change.change_type = BLUETOOTH_GATT_SERVICE_CHANGE_TYPE_REMOVE; @@ -3607,7 +4408,7 @@ int _bt_register_manager_subscribe_signal(gboolean subscribe) static guint service_added_id = 0; static guint interface_removed_id = 0; - g_conn = _bt_gdbus_get_system_gconn(); + g_conn = _bt_get_system_private_conn(); if (g_conn == NULL) return BLUETOOTH_ERROR_INTERNAL;