X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-event-handler.c;h=a9b24c97cc194f0cd1658085eff17f5d3bb1b680;hb=55a899208b331246a31aab0f5001cd70b35b2631;hp=a4351578f2a7df534652597a820134ba588e9de6;hpb=f8ee7e3a44af4dca3cc110b47490a722c9e6bf2c;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c index a435157..a9b24c9 100644 --- a/bt-api/bt-event-handler.c +++ b/bt-api/bt-event-handler.c @@ -34,6 +34,7 @@ #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 */ @@ -385,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, @@ -421,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; @@ -612,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, @@ -647,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, @@ -665,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, @@ -718,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, @@ -941,7 +1043,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"); + 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); @@ -2124,7 +2226,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)) { @@ -2209,7 +2311,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; @@ -2279,7 +2381,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; @@ -2291,7 +2393,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; @@ -2477,7 +2579,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, @@ -3507,10 +3609,17 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection, BT_INFO("GATT Client Char value changed in remote Server [%s]", address); BT_INFO("GATT Client Char Val len: [%d]", char_prop.val_len); - /* Copy Data */ - memcpy(&char_prop.value, g_variant_get_data(data_var), 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]); @@ -3838,7 +3947,15 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection, _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_NOTIFICATION_COMPLETED) == 0) { + } 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; @@ -3868,7 +3985,7 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection, 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_COMPLETED]"); + 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); @@ -3882,11 +3999,37 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection, 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 @@ -4021,7 +4164,7 @@ int _bt_register_event(int event_type, void *event_cb, void *user_data) 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; @@ -4062,7 +4205,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); @@ -4110,7 +4253,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; @@ -4125,7 +4268,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); @@ -4141,11 +4284,11 @@ static void __bt_gatt_get_uuid_from_path(char *path, char **service_uuid) GVariant *ret = NULL; GVariant *value = NULL; - g_conn = _bt_gdbus_get_system_gconn(); + g_conn = _bt_get_system_private_conn(); ret_if(g_conn == NULL); proxy = g_dbus_proxy_new_sync(g_conn, - G_DBUS_PROXY_FLAGS_NONE, NULL, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, BT_BLUEZ_NAME, path, BT_PROPERTIES_INTERFACE, @@ -4263,7 +4406,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;