X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-event-handler.c;h=f0167eac0a7700fd52428166b369afb642ed1839;hb=f6c6a35e715d3c2cf14a6c70635bb218ffdf69ed;hp=b2360fa59dbb0132de15346e99bdf6d171c971d9;hpb=ad3cb4b9fcbcf8d1d5ecc0814deaa9991fac6cf9;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c index b2360fa..f0167ea 100644 --- a/bt-api/bt-event-handler.c +++ b/bt-api/bt-event-handler.c @@ -457,6 +457,12 @@ void __bt_adapter_event_filter(GDBusConnection *connection, } 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); @@ -491,7 +497,7 @@ void __bt_adapter_event_filter(GDBusConnection *connection, 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", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes); + BT_DBG("%ld %ld %d %d %u", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes, t->time); } } @@ -500,6 +506,7 @@ void __bt_adapter_event_filter(GDBusConnection *connection, 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; @@ -812,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, @@ -875,7 +883,6 @@ 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_SERVER_CONNECTED, result, &dev_address, event_info->cb, event_info->user_data); @@ -886,7 +893,6 @@ 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_SERVER_DISCONNECTED, result, &dev_address, event_info->cb, event_info->user_data); @@ -897,7 +903,6 @@ 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_CLIENT_CONNECTED, result, &dev_address, event_info->cb, event_info->user_data); @@ -908,7 +913,6 @@ 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_CLIENT_DISCONNECTED, result, &dev_address, event_info->cb, event_info->user_data); @@ -920,7 +924,6 @@ 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); @@ -931,7 +934,6 @@ 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); @@ -1011,7 +1013,6 @@ 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); @@ -1021,8 +1022,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} }; - BT_DBG("BT_DEVICE_DISCONNECTED"); - g_variant_get(parameters, "(i&sy)", &result, &address, &addr_type); + int rssi; + g_variant_get(parameters, "(i&syi)", &result, &address, &addr_type, &rssi); + BT_DBG("BT_DEVICE_DISCONNECTED reason(%d)", result); _bt_convert_addr_string_to_type(dev_address.addr, address); @@ -1035,7 +1037,7 @@ void __bt_device_event_filter(GDBusConnection *connection, conn_info.addr_type = addr_type; conn_info.disc_reason = result; - BT_DBG("Sending Event to Framework, disconnect reason [0x%x]", result); + conn_info.rssi = rssi; _bt_common_event_cb(BLUETOOTH_EVENT_DEVICE_DISCONNECTED, result, &conn_info, event_info->cb, event_info->user_data); @@ -1384,7 +1386,24 @@ void __bt_headset_event_filter(GDBusConnection *connection, _bt_headset_event_cb(BLUETOOTH_EVENT_AG_MIC_GAIN, result, &gain, event_info->cb, event_info->user_data); +#ifdef TIZEN_FEATURE_BT_AVC_TARGET + } else if (strcasecmp(signal_name, BT_AUDIO_AVC_MODE_CHANGED) == 0) { + bool mode; + + g_variant_get(parameters, "(b)", &mode); + + _bt_headset_event_cb(BLUETOOTH_EVENT_AUDIO_AVC_STATUS, + result, &mode, + event_info->cb, event_info->user_data); + } else if (strcasecmp(signal_name, BT_MEDIA_VOLUME_CHANGE) == 0) { + unsigned int volume; + + g_variant_get(parameters, "(u)", &volume); + _bt_avrcp_event_cb(BLUETOOTH_EVENT_AVRCP_VOLUME_CHANGED, + result, &volume, + event_info->cb, event_info->user_data); } +#endif } void __bt_hid_device_event_filter(GDBusConnection *connection, @@ -2245,6 +2264,7 @@ void __bt_map_client_event_filter(GDBusConnection *connection, } g_free(folders_struct.names); + g_variant_iter_free(iter); g_variant_unref(folder_list_var); } else if (strcasecmp(signal_name, BT_MAP_FILTER_FIELDS_COMPLETE) == 0) { @@ -2273,6 +2293,7 @@ void __bt_map_client_event_filter(GDBusConnection *connection, fields_info.fields[i] = strdup(field); i++; } + g_variant_iter_free(iter); } _bt_common_event_cb(BLUETOOTH_EVENT_MAP_LIST_FILTER_FIELD_COMPLETE, @@ -2403,9 +2424,12 @@ void __bt_map_client_event_filter(GDBusConnection *connection, messages_struct.message_items[i].is_protected = value_bool ? 1 : 0; BT_DBG(" Protected: %s", value_bool ? "true" : "false"); } + + g_free(value_string); } ++i; } + g_variant_iter_free(iter); _bt_common_event_cb(BLUETOOTH_EVENT_MAP_LIST_MESSAGES_COMPLETE, result, &messages_struct, @@ -3105,7 +3129,6 @@ static void __bt_tds_event_filter(GDBusConnection *connection, const char *address = NULL; char *data; int data_len = 0; - int k; GVariant *var = NULL; bluetooth_tds_transport_data_info_t *info = NULL; @@ -3114,13 +3137,6 @@ static void __bt_tds_event_filter(GDBusConnection *connection, data = (char *)g_variant_get_data(var); 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]); - if (data_len == 0) { BT_ERR("No data"); g_variant_unref(var); @@ -3561,8 +3577,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, GVariant *parameters, gpointer user_data) { - BT_DBG("GATT Client event handler Entry >>"); - bt_event_info_t *event_info; int result = BLUETOOTH_ERROR_NONE; @@ -3571,7 +3585,7 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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_DBG("GATT Client event[BT_GATT_CHAR_VAL_CHANGED]"); bt_gatt_char_property_t char_prop; const char *address = NULL; GVariant *data_var = NULL; @@ -3580,7 +3594,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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)); @@ -3612,16 +3625,17 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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); + + g_variant_unref(svc_uuid_var); + g_variant_unref(char_uuid_var); + g_variant_unref(data_var); + } 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_DBG("GATT Client event[BT_GATT_CLIENT_READ_CHAR]"); bt_gatt_char_property_t char_prop; const char *address = NULL; GVariant *data_var = NULL; @@ -3630,7 +3644,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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)); @@ -3648,11 +3661,10 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, &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]", + BT_DBG("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); } @@ -3663,16 +3675,17 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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); + + g_variant_unref(svc_uuid_var); + g_variant_unref(char_uuid_var); + g_variant_unref(data_var); + } 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_DBG("GATT Client event[BT_GATT_CLIENT_WRITE_CHAR]"); bt_gatt_char_property_t char_prop; const char *address = NULL; GVariant *svc_uuid_var = NULL; @@ -3708,9 +3721,13 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_WRITE_CHAR, result, &char_prop, event_info->cb, event_info->user_data); + + g_variant_unref(svc_uuid_var); + g_variant_unref(char_uuid_var); + } 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_DBG("GATT Client event[BT_GATT_CLIENT_READ_DESC]"); bt_gatt_char_descriptor_property_t desc_prop; const char *address = NULL; GVariant *data_var = NULL; @@ -3722,7 +3739,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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)); @@ -3762,16 +3778,18 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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); + + g_variant_unref(svc_uuid_var); + g_variant_unref(char_uuid_var); + g_variant_unref(desc_uuid_var); + g_variant_unref(data_var); + } 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_DBG("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; @@ -3818,9 +3836,33 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, _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 <<"); + g_variant_unref(svc_uuid_var); + g_variant_unref(char_uuid_var); + g_variant_unref(desc_uuid_var); + + } else if (strcasecmp(signal_name, BT_GATT_CLIENT_SERVICE_CHANGED) == 0) { + BT_DBG("GATT Client event[BT_GATT_CLIENT_SERVICE_CHANGED]"); + bt_gatt_service_change_t change = {0, }; + char *address_str = NULL; + char *name = NULL; + + g_variant_get(parameters, "(ii&s&s)", &change.inst_id, &change.change_type, &address_str, &change.uuid); + + _bt_convert_addr_string_to_type(change.device_addr.addr, address_str); + bluetooth_get_uuid_name(change.uuid, &name); + BT_INFO(" ### GATT Service %s [%s]", change.change_type ? "Added" : "Removed", name); + g_free(name); + + if (_bluetooth_gatt_check_service_change_watcher_address(&change.device_addr) == FALSE) { + BT_INFO("No watcher for %s", address_str); + return; + } + + _bt_gatt_client_event_cb(BLUETOOTH_EVENT_GATT_CLIENT_SERVICE_CHANGED, + BLUETOOTH_ERROR_NONE, &change, + event_info->cb, event_info->user_data); + } } #endif @@ -3870,7 +3912,6 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection, 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; @@ -3909,13 +3950,11 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection, 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); + + g_variant_unref(data_var); } else if (strcasecmp(signal_name, BT_GATT_SERVER_READ_REQ) == 0) { const char *address = NULL; bluetooth_device_address_t dev_address = { {0} }; @@ -4100,41 +4139,34 @@ int _bt_register_event(int event_type, void *event_cb, void *user_data) path = BT_RFCOMM_SERVER_PATH; break; case BT_HF_AGENT_EVENT: - BT_DBG("BT_HF_AGENT_EVENT\n"); event_func = __bt_hf_agent_event_filter; path = BT_HF_AGENT_PATH; interface = BT_HF_SERVICE_INTERFACE; break; case BT_A2DP_SOURCE_EVENT: - BT_DBG("BT_A2DP_SOURCE_EVENT"); event_func = __bt_a2dp_source_event_filter; path = BT_A2DP_SOURCE_PATH; break; case BT_HID_DEVICE_EVENT: - BT_DBG("BT_HID_DEVICE_EVENT"); 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; case BT_HDP_EVENT: - BT_DBG("BT_HDP_EVENT"); event_func = __bt_hdp_event_filter; path = BT_HDP_DEVICE_PATH; break;