X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-event-handler.c;h=3342aed750cf25bb834ddf9d3304e34c8d67d890;hb=4c80458fe15505940c306732ecc7691e9b766946;hp=39cb654786d792005dbc5cd65ddd53d6ddf0afa8;hpb=39c867bd85c07934c6e799a5205fc4931033e6c9;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c index 39cb654..3342aed 100644 --- a/bt-api/bt-event-handler.c +++ b/bt-api/bt-event-handler.c @@ -386,6 +386,20 @@ gboolean __bt_reliable_disable_cb(gpointer user_data) 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, @@ -422,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; @@ -734,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, @@ -943,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); @@ -957,6 +1044,7 @@ 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, @@ -3483,8 +3571,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; @@ -3493,7 +3579,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; @@ -3502,7 +3588,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)); @@ -3535,15 +3620,15 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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]); + // 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_DBG("GATT Client event[BT_GATT_CLIENT_READ_CHAR]"); bt_gatt_char_property_t char_prop; const char *address = NULL; GVariant *data_var = NULL; @@ -3552,7 +3637,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)); @@ -3570,11 +3654,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); } @@ -3586,15 +3669,15 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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]); + // 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_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; @@ -3632,7 +3715,7 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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_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; @@ -3693,7 +3776,7 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, 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_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; @@ -3740,9 +3823,28 @@ 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); - } + } 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, "(i&s&s)", &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); - BT_DBG("GATT Client event handler Exit <<"); + 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 @@ -3919,8 +4021,31 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection, _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