X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-event-handler.c;h=a9b24c97cc194f0cd1658085eff17f5d3bb1b680;hb=55a899208b331246a31aab0f5001cd70b35b2631;hp=776a309abd6729f30cac8b3876016fcfd9a3fa64;hpb=aa5b1255572c85a874f49e91975bc9227650be7b;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c index 776a309..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, @@ -773,7 +875,52 @@ void __bt_device_event_filter(GDBusConnection *connection, #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} }; @@ -796,6 +943,7 @@ void __bt_device_event_filter(GDBusConnection *connection, _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} }; @@ -895,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); @@ -1594,24 +1742,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; @@ -1619,6 +1766,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); } } @@ -2074,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)) { @@ -2159,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; @@ -2229,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; @@ -2241,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; @@ -2427,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, @@ -2709,14 +2861,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) @@ -2903,7 +3054,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, @@ -3409,6 +3560,280 @@ 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, @@ -3425,7 +3850,9 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection, 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} }; @@ -3447,6 +3874,7 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection, 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; @@ -3519,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; @@ -3549,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); @@ -3563,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 @@ -3608,11 +4070,11 @@ int _bt_register_event(int event_type, void *event_cb, void *user_data) case BT_HEADSET_EVENT: event_func = __bt_headset_event_filter; path = BT_HEADSET_PATH; - break; + break; case BT_NETWORK_EVENT: event_func = __bt_network_event_filter; path = BT_NETWORK_PATH; - break; + break; case BT_AVRCP_EVENT: event_func = __bt_avrcp_event_filter; path = BT_AVRCP_PATH; @@ -3690,12 +4152,19 @@ int _bt_register_event(int event_type, void *event_cb, void *user_data) 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; @@ -3736,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); @@ -3784,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; @@ -3799,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); @@ -3815,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, @@ -3937,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;