X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service%2Fbt-service-event-receiver.c;h=2bd9f50ae1010cda5372ac7ee8ee7ec0bf767cef;hb=c07b511d25638fdce6ea66ec9d76e2e5e6f8a75c;hp=22da88df9cf15b6732583a694eea93d5a493d2c7;hpb=9a796edfdd722dc13b471acd66423eb6667498fd;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-service/bt-service-event-receiver.c b/bt-service/bt-service-event-receiver.c old mode 100755 new mode 100644 index 22da88d..2bd9f50 --- a/bt-service/bt-service-event-receiver.c +++ b/bt-service/bt-service-event-receiver.c @@ -1,11 +1,5 @@ /* - * Bluetooth-frwk - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: Hocheol Seo - * Girishashok Joshi - * Chanyeol Park + * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,6 +41,10 @@ #include "bt-service-opp-client.h" +#ifdef TIZEN_DPM_ENABLE +#include "bt-service-dpm.h" +#endif + #define DBUS_TIMEOUT 20 * 1000 /* 20 Sec */ static GDBusConnection *manager_conn; static GDBusConnection *obexd_conn; @@ -99,7 +97,7 @@ static bt_le_adv_info_t *__bt_get_adv_ind_info(char *addr) retv_if(!addr, NULL); bt_le_adv_info_t *adv_info = NULL; GList *current = g_list_first((GList *)p_adv_ind_list); - while(current && current->data) { + while (current && current->data) { adv_info = (bt_le_adv_info_t *)current->data; retv_if(adv_info && !g_strcmp0(adv_info->addr, addr), adv_info); current = g_list_next(current); @@ -124,7 +122,7 @@ static void __bt_del_adv_ind_info(char *addr) ret_if(!p_adv_ind_list); bt_le_adv_info_t *adv_info = NULL; GList *current = g_list_first((GList *)p_adv_ind_list); - while(current && current->data) { + while (current && current->data) { adv_info = (bt_le_adv_info_t *)current->data; if (adv_info && !g_strcmp0(adv_info->addr, addr)) { p_adv_ind_list = g_list_remove(p_adv_ind_list, adv_info); @@ -174,7 +172,7 @@ static gboolean __bt_parse_device_properties(GVariant *item, } else if (strcasecmp(key, "UUIDs") == 0) { char **uuid_value; gsize size = 0; - int i =0; + int i = 0; size = g_variant_get_size(val); if (size > 0) { @@ -205,8 +203,9 @@ static gboolean __bt_parse_device_properties(GVariant *item, if (len > 0) { char *manufacturer_data = (char *)g_variant_get_data(manufacturer_var); dev_info->manufacturer_data = g_malloc0(len); - memcpy(dev_info->manufacturer_data, manufacturer_data, - len); + if (dev_info->manufacturer_data) + memcpy(dev_info->manufacturer_data, manufacturer_data, + len); } g_variant_unref(manufacturer_var); } @@ -223,14 +222,14 @@ static gboolean __bt_parse_interface(GVariant *msg, GVariant *optional_param; GVariantIter iter; GVariant *child; - char *interface_name= NULL; + char *interface_name = NULL; GVariant *inner_iter = NULL; g_variant_get(msg, "(&o@a{sa{sv}})", &path, &optional_param); g_variant_iter_init(&iter, optional_param); while ((child = g_variant_iter_next_value(&iter))) { - g_variant_get(child,"{&s@a{sv}}", &interface_name, &inner_iter); + g_variant_get(child, "{&s@a{sv}}", &interface_name, &inner_iter); if (g_strcmp0(interface_name, BT_DEVICE_INTERFACE) == 0) { BT_DBG("Found a device: %s", path); if (__bt_parse_device_properties(inner_iter, @@ -250,8 +249,8 @@ static gboolean __bt_parse_interface(GVariant *msg, g_variant_unref(inner_iter); g_variant_unref(child); } - if (optional_param) - g_variant_unref(optional_param); + + g_variant_unref(optional_param); return FALSE; } @@ -299,7 +298,6 @@ gboolean _bt_discovery_finished_cb(gpointer user_data) } _bt_set_cancel_by_user(FALSE); - _bt_disable_all_scanner_status(); _bt_set_discovery_status(FALSE); param = g_variant_new("(i)", result); _bt_send_event(BT_ADAPTER_EVENT, @@ -321,6 +319,7 @@ static gboolean __bt_le_discovery_finished_cb(gpointer user_data) } _bt_set_cancel_by_user(FALSE); + _bt_disable_all_scanner_status(); _bt_set_le_scan_status(FALSE); param = g_variant_new("(i)", result); _bt_send_event(BT_LE_ADAPTER_EVENT, @@ -343,7 +342,7 @@ void __bt_update_remote_cache_devinfo(const char *address, gboolean paired_statu node = g_list_first(p_cache_list); - while (node != NULL){ + while (node != NULL) { cache_info = (bt_cache_info_t *)node->data; if (cache_info == NULL) { @@ -375,10 +374,10 @@ static void __bt_device_remote_connected_properties( GVariant *param = NULL; BT_DBG("+"); - if (remote_dev_info->uuid_count > 0 ) { - for (i = 0; iuuid_count; i++) { + if (remote_dev_info->uuid_count > 0) { + for (i = 0; i < remote_dev_info->uuid_count; i++) { char *uuid = remote_dev_info->uuids[i]; - if (strcasecmp(uuid, HID_UUID) == 0){ + if (strcasecmp(uuid, HID_UUID) == 0) { int event = BLUETOOTH_EVENT_NONE; event = (connected == TRUE) ? @@ -444,7 +443,7 @@ void _bt_handle_adapter_event(GVariant *msg, const char *member) node = g_list_first(p_cache_list); - while (node != NULL){ + while (node != NULL) { cache_info = (bt_cache_info_t *)node->data; if (cache_info == NULL) { @@ -466,7 +465,6 @@ void _bt_handle_adapter_event(GVariant *msg, const char *member) } else if (strcasecmp(member, "AdvertisingEnabled") == 0) { BT_DBG("Advertising Enabled"); int slot_id; - const char *sender; int event; int adv_handle; gboolean status = FALSE; @@ -478,7 +476,6 @@ void _bt_handle_adapter_event(GVariant *msg, const char *member) /* Send event to application */ _bt_set_advertising_status(slot_id, status); - sender = _bt_get_adv_slot_owner(slot_id); adv_handle = _bt_get_adv_slot_adv_handle(slot_id); if (status) @@ -487,18 +484,25 @@ void _bt_handle_adapter_event(GVariant *msg, const char *member) event = BLUETOOTH_EVENT_ADVERTISING_STOPPED; param = g_variant_new("(ii)", result, adv_handle); + +#if 0 + const char *sender; + sender = _bt_get_adv_slot_owner(slot_id); _bt_send_event_to_dest(sender, BT_ADAPTER_EVENT, event, param); +#else + _bt_send_event(BT_ADAPTER_EVENT, event, param); +#endif if (event == BLUETOOTH_EVENT_ADVERTISING_STOPPED) - __bt_unregister_adv_slot_owner(slot_id); + _bt_unregister_adv_slot_owner(slot_id); } else if (strcasecmp(member, "RssiEnabled") == 0) { BT_DBG("RSSI Enabled"); gboolean status = FALSE; char *address = NULL; int link_type; - g_variant_get(msg,"(sib)", &address, &link_type, &status); + g_variant_get(msg, "(sib)", &address, &link_type, &status); BT_DBG("RSSI Enabled [%s %d]", address, status); param = g_variant_new("(isib)", result, @@ -513,7 +517,7 @@ void _bt_handle_adapter_event(GVariant *msg, const char *member) int rssi_dbm; int link_type; char *address = NULL; - g_variant_get(msg,"(siii)", &address, &link_type, &alert_type, &rssi_dbm); + g_variant_get(msg, "(siii)", &address, &link_type, &alert_type, &rssi_dbm); BT_DBG("RSSI Alert: [Address %s LinkType %d] [Type %d DBM %d]", address, alert_type, rssi_dbm); @@ -528,7 +532,7 @@ void _bt_handle_adapter_event(GVariant *msg, const char *member) int rssi_dbm; int link_type; char *address = NULL; - g_variant_get(msg,"(sii)", &address, &link_type, &rssi_dbm); + g_variant_get(msg, "(sii)", &address, &link_type, &rssi_dbm); BT_DBG("Raw RSSI: [Address %s] [Link Type %d][RSSI DBM %d]", address, link_type, rssi_dbm); @@ -558,8 +562,8 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path) GError *err = NULL; char *property = NULL; GVariant *param = NULL; - g_variant_iter_init (&value_iter, msg); - while ((g_variant_iter_loop (&value_iter,"{sv}", &property, &val))) { + g_variant_iter_init(&value_iter, msg); + while ((g_variant_iter_loop(&value_iter, "{sv}", &property, &val))) { BT_INFO("Property %s", property); if (strcasecmp(property, "Discovering") == 0) { @@ -715,7 +719,7 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path) gboolean powered = FALSE; int bt_state; - g_variant_get(val, "b" ,&powered); + g_variant_get(val, "b", &powered); BT_DBG("Powered = %d", powered); if (powered == FALSE) { #ifdef USB_BLUETOOTH @@ -730,8 +734,7 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path) bt_state != VCONFKEY_BT_LE_STATUS_OFF) { _bt_set_le_disabled(BLUETOOTH_ERROR_NONE); } - } - else { + } else { #ifdef USB_BLUETOOTH _bt_handle_adapter_added(); #endif @@ -746,26 +749,38 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path) _bt_send_event(BT_ADAPTER_EVENT, BLUETOOTH_EVENT_CONNECTABLE_CHANGED, param); +#if 0 if (_bt_adapter_get_status() == BT_DEACTIVATING && _bt_adapter_get_le_status() == BT_LE_ACTIVATED && connectable == 0) _bt_set_disabled(BLUETOOTH_ERROR_NONE); +#endif } else if (strcasecmp(property, "SupportedLEFeatures") == 0) { char *name = NULL; char *value = NULL; GVariantIter *iter = NULL; g_variant_get(val, "as", &iter); - while (g_variant_iter_loop(iter, "s", &name)) { - BT_DBG("name = %s", name); - g_variant_iter_loop(iter, "s", &value); - BT_DBG("Value = %s", value); - if (FALSE == _bt_update_le_feature_support(name, value)) - BT_INFO("Fail to update LE feature info"); - } - if (iter) + if (iter) { + while (g_variant_iter_loop(iter, "s", &name)) { + BT_DBG("name = %s", name); + g_variant_iter_loop(iter, "s", &value); + BT_DBG("Value = %s", value); + if (FALSE == _bt_update_le_feature_support(name, value)) + BT_INFO("Fail to update LE feature info"); + } g_variant_iter_free(iter); - } else { - BT_DBG("property : [%s]", property); + } + } else if (strcasecmp(property, "IpspInitStateChanged") == 0) { + gboolean ipsp_initialized = FALSE; + + g_variant_get(val, "b", &ipsp_initialized); + BT_DBG("IPSP init state changed: %d", ipsp_initialized); + param = g_variant_new("(b)", ipsp_initialized); + + /* Send event to application */ + _bt_send_event(BT_ADAPTER_EVENT, + BLUETOOTH_EVENT_IPSP_INIT_STATE_CHANGED, + param); } } } @@ -777,8 +792,8 @@ static void __bt_obex_property_changed_event(GVariant *msg, const char *path) GVariantIter value_iter; GVariant *child = NULL, *val = NULL; char *property = NULL; - g_variant_iter_init (&value_iter, msg); - while ((child = g_variant_iter_next_value (&value_iter))) { + g_variant_iter_init(&value_iter, msg); + while ((child = g_variant_iter_next_value(&value_iter))) { g_variant_get(child, "{sv}", &property, &val); ret_if(property == NULL); @@ -789,12 +804,12 @@ static void __bt_obex_property_changed_event(GVariant *msg, const char *path) char *status; g_variant_get(val, "s", &status); - if (strcasecmp(status, "active") == 0){ + if (strcasecmp(status, "active") == 0) { _bt_obex_transfer_started(path); } else if (strcasecmp(status, "complete") == 0) { _bt_obex_transfer_completed(path, TRUE); _bt_pbap_obex_transfer_completed(path, TRUE); - } else if (strcasecmp(status, "error") == 0){ + } else if (strcasecmp(status, "error") == 0) { _bt_obex_transfer_completed(path, FALSE); _bt_pbap_obex_transfer_completed(path, FALSE); } @@ -803,7 +818,7 @@ static void __bt_obex_property_changed_event(GVariant *msg, const char *path) static int transferred = 0; g_variant_get(val, "t", &transferred); - _bt_obex_transfer_progress(path,transferred); + _bt_obex_transfer_progress(path, transferred); } g_free(property); g_variant_unref(val); @@ -824,7 +839,7 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path) char *address; GVariant *param = NULL; bt_remote_dev_info_t *remote_dev_info; - g_variant_iter_init (&value_iter, msg); + g_variant_iter_init(&value_iter, msg); while ((g_variant_iter_loop(&value_iter, "{sv}", &property, &val))) { BT_DBG("Property %s", property); if (strcasecmp(property, "Connected") == 0) { @@ -875,14 +890,31 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path) } BT_DBG("Address type %d", remote_dev_info->addr_type); - if (remote_dev_info && remote_dev_info->addr_type == 0) { + if (remote_dev_info->addr_type == 0) { BT_DBG("Name %s", remote_dev_info->name); +#ifdef TIZEN_DPM_ENABLE + if (_bt_dpm_get_bluetooth_desktop_connectivity_state() == + DPM_RESTRICTED) { + bluetooth_device_class_t device_class; + _bt_divide_device_class(&device_class, remote_dev_info->class); + + if (device_class.major_class == + BLUETOOTH_DEVICE_MAJOR_CLASS_COMPUTER) { + _bt_free_device_info(remote_dev_info); + g_free(property); + g_variant_unref(val); + g_free(address); + return; + } + } +#endif + GVariant *uuids = NULL; GVariantBuilder *builder = NULL; int i = 0; builder = g_variant_builder_new(G_VARIANT_TYPE("as")); - for (i=0; i < remote_dev_info->uuid_count; i++) { + for (i = 0; i < remote_dev_info->uuid_count; i++) { g_variant_builder_add(builder, "s", remote_dev_info->uuids[i]); } @@ -959,7 +991,7 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path) return; } - if(paired == FALSE) { + if (paired == FALSE) { BT_INFO("Unpaired: %s", address); __bt_update_remote_cache_devinfo(address, FALSE); param = g_variant_new("(is)", result, address); @@ -982,7 +1014,7 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path) GVariantBuilder *builder = NULL; int i = 0; builder = g_variant_builder_new(G_VARIANT_TYPE("as")); - for (i=0; i < remote_dev_info->uuid_count; i++) { + for (i = 0; i < remote_dev_info->uuid_count; i++) { g_variant_builder_add(builder, "s", remote_dev_info->uuids[i]); } @@ -1062,6 +1094,46 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path) event, param); g_free(address); + } else if (strcasecmp(property, "IpspConnected") == 0) { + gboolean connected = FALSE; + + g_variant_get(val, "b", &connected); + + + event = connected ? BLUETOOTH_EVENT_IPSP_CONNECTED : + BLUETOOTH_EVENT_IPSP_DISCONNECTED; + + address = g_malloc0(BT_ADDRESS_STRING_SIZE); + + _bt_convert_device_path_to_address(path, address); + + BT_DBG("Ipspconnected: %d", connected); + BT_DBG("address: %s", address); + param = g_variant_new("(is)", result, address); + + /* Send event to application */ + _bt_send_event(BT_DEVICE_EVENT, + event, + param); + g_free(address); + } else if (strcasecmp(property, "IpspBtInterfaceInfo") == 0) { + char *ifname = NULL; + + g_variant_get(val, "s", &ifname); + + address = g_malloc0(BT_ADDRESS_STRING_SIZE); + + _bt_convert_device_path_to_address(path, address); + + BT_DBG("Ipsp BT Interface Name: %s", ifname); + BT_DBG("address: %s", address); + param = g_variant_new("(iss)", result, address, ifname); + + /* Send event to application */ + _bt_send_event(BT_DEVICE_EVENT, + BLUETOOTH_EVENT_IPSP_INTERFACE_INFO, + param); + g_free(address); } } BT_DBG("-"); @@ -1078,8 +1150,8 @@ static void __bt_media_control_changed_event(GVariant *msg, const char *path) GVariant *child = NULL; bt_remote_dev_info_t *remote_dev_info; GVariant *param = NULL; - g_variant_iter_init (&value_iter, msg); - while ((child = g_variant_iter_next_value (&value_iter))) { + g_variant_iter_init(&value_iter, msg); + while ((child = g_variant_iter_next_value(&value_iter))) { g_variant_get(child, "{sv}", &property, &val); BT_INFO("Property %s", property); if (strcasecmp(property, "Connected") == 0) { @@ -1123,13 +1195,13 @@ void _bt_handle_property_changed_event(GVariant *msg, const char *object_path) char *interface_name = NULL; GVariant *val = NULL; - g_variant_get(msg, "(&s@a{sv}@as)", &interface_name, &val,NULL); + g_variant_get(msg, "(&s@a{sv}@as)", &interface_name, &val, NULL); if (strcasecmp(interface_name, BT_ADAPTER_INTERFACE) == 0) { __bt_adapter_property_changed_event(val, object_path); } else if (strcasecmp(interface_name, BT_DEVICE_INTERFACE) == 0) { - __bt_device_property_changed_event(val,object_path); + __bt_device_property_changed_event(val, object_path); } else if (strcasecmp(interface_name, BT_OBEX_TRANSFER_INTERFACE) == 0) { BT_DBG("BT_OBEX_TRANSFER_INTERFACE"); __bt_obex_property_changed_event(val, @@ -1159,8 +1231,8 @@ void __bt_opc_property_changed_event(GVariant *msg, GVariant *val = NULL; GVariant *child = NULL; - g_variant_iter_init (&value_iter, msg); - while ((child = g_variant_iter_next_value (&value_iter))) { + g_variant_iter_init(&value_iter, msg); + while ((child = g_variant_iter_next_value(&value_iter))) { g_variant_get(child, "{sv}", &property, &val); ret_if(property == NULL); @@ -1169,11 +1241,11 @@ void __bt_opc_property_changed_event(GVariant *msg, g_variant_get(val, "s", &status); BT_DBG("Status is %s", status); - if(strcasecmp(status, "active") == 0){ + if (strcasecmp(status, "active") == 0) { _bt_obex_client_started(path); - }else if (strcasecmp(status, "complete") == 0) { + } else if (strcasecmp(status, "complete") == 0) { _bt_obex_client_completed(path, TRUE); - }else if (strcasecmp(status, "error") == 0){ + } else if (strcasecmp(status, "error") == 0) { _bt_obex_client_completed(path, FALSE); } g_free(status); @@ -1216,8 +1288,8 @@ void _bt_handle_input_event(GVariant *msg, const char *path) GVariant *child = NULL, *val = NULL; bt_remote_dev_info_t *remote_dev_info; GVariant *param = NULL; - g_variant_iter_init (&value_iter, msg); - while ((child = g_variant_iter_next_value (&value_iter))) { + g_variant_iter_init(&value_iter, msg); + while ((child = g_variant_iter_next_value(&value_iter))) { g_variant_get(child, "{sv}", &property, &val); ret_if(property == NULL); @@ -1322,7 +1394,7 @@ void _bt_handle_network_client_event(GVariant *msg, GVariant *val = NULL; GVariantIter value_iter; GVariant *param = NULL; - g_variant_iter_init (&value_iter, msg); + g_variant_iter_init(&value_iter, msg); while ((g_variant_iter_loop(&value_iter, "{sv}", &property, &val))) { if (strcasecmp(property, "Connected") == 0) { int event = BLUETOOTH_EVENT_NONE; @@ -1365,7 +1437,7 @@ void __bt_gatt_char_property_changed_event(GVariant *msg, GVariant *val = NULL; int result = BLUETOOTH_ERROR_NONE; GVariant *param = NULL; - g_variant_iter_init (&value_iter, msg); + g_variant_iter_init(&value_iter, msg); char_handle = g_strdup(path); while ((g_variant_iter_loop(&value_iter, "{sv}", &property, &val))) { BT_INFO("Property %s", property); @@ -1382,13 +1454,13 @@ void __bt_gatt_char_property_changed_event(GVariant *msg, } else if (strcasecmp(property, "ChangedValue") == 0) { int len = 0; GByteArray *gp_byte_array = NULL; - BT_INFO("Type '%s'\n", g_variant_get_type_string (val)); + BT_INFO("Type '%s'\n", g_variant_get_type_string(val)); if (val) { gp_byte_array = g_byte_array_new(); len = g_variant_get_size(val); BT_DBG("Len = %d", len); - g_byte_array_append (gp_byte_array, + g_byte_array_append(gp_byte_array, (const guint8 *) g_variant_get_data(val), len); if (gp_byte_array->len != 0) { GVariant *byte_array = NULL; @@ -1399,9 +1471,9 @@ void __bt_gatt_char_property_changed_event(GVariant *msg, TRUE, NULL, NULL); param = g_variant_new("(is@ay)", result, char_handle, byte_array); - _bt_send_event(BT_DEVICE_EVENT, - BLUETOOTH_EVENT_GATT_CHAR_VAL_CHANGED, - param); + + /* Send event only registered client */ + _bt_send_char_value_changed_event(param); } g_byte_array_free(gp_byte_array, TRUE); } @@ -1409,9 +1481,46 @@ void __bt_gatt_char_property_changed_event(GVariant *msg, } g_free(char_handle); } -void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) + +void _bt_handle_gatt_event(GVariant *msg, const char *member, const char *path) { - int event; + ret_if(path == NULL); + + if (strcasecmp(member, "GattValueChanged") == 0) { + +#if 0 // Debug Only + /*** Debug only ***/ + GVariant *value = NULL; + int value_len = 0; + char *buffer = NULL; + + g_variant_get(msg, "(is@ay)", NULL, NULL, &value); + value_len = g_variant_get_size(value); + if (value_len > 0) { + char buf[8 * 5 + 1] = { 0 }; + int i; + int to; + buffer = (char *)g_variant_get_data(value); + to = value_len > (sizeof(buf) / 5) ? sizeof(buf) / 5 : value_len; + + for (i = 0; i < to; i++) + snprintf(&buf[i * 5], 6, "0x%02x ", buffer[i]); + buf[i * 5] = '\0'; + BT_DBG("GATT Val[%d] %s", value_len, buf); + } + g_variant_unref(value); + /******/ +#endif + + /* Send event only registered client */ + _bt_send_char_value_changed_event(msg); + } +} + + +void _bt_handle_device_event(GVariant *msg, const char *member, const char *path) +{ + int event = 0; int result = BLUETOOTH_ERROR_NONE; char *address; char *dev_name; @@ -1429,6 +1538,8 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) gboolean connected = FALSE; char *address; address = g_malloc0(BT_ADDRESS_STRING_SIZE); + ret_if(address == NULL); + _bt_convert_device_path_to_address(path, address); g_variant_get(msg, "(b)", &connected); @@ -1460,6 +1571,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) } address = g_malloc0(BT_ADDRESS_STRING_SIZE); + ret_if(address == NULL); _bt_convert_device_path_to_address(path, address); @@ -1472,7 +1584,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) GVariantBuilder *builder = NULL; int i = 0; builder = g_variant_builder_new(G_VARIANT_TYPE("as")); - for (i=0; i < remote_dev_info->uuid_count; i++) { + for (i = 0; i < remote_dev_info->uuid_count; i++) { g_variant_builder_add(builder, "s", remote_dev_info->uuids[i]); } @@ -1510,6 +1622,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) ret_if(_bt_is_device_creating() == TRUE); address = g_malloc0(BT_ADDRESS_STRING_SIZE); + ret_if(address == NULL); _bt_convert_device_path_to_address(path, address); @@ -1525,7 +1638,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) GVariantBuilder *builder = NULL; int i = 0; builder = g_variant_builder_new(G_VARIANT_TYPE("as")); - for (i=0; i < remote_dev_info->uuid_count; i++) { + for (i = 0; i < remote_dev_info->uuid_count; i++) { g_variant_builder_add(builder, "s", remote_dev_info->uuids[i]); } @@ -1559,6 +1672,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) g_variant_get(msg, "(y)", &addr_type); address = g_malloc0(BT_ADDRESS_STRING_SIZE); + ret_if(address == NULL); _bt_convert_device_path_to_address(path, address); dev_name = _bt_get_bonded_device_name(address); @@ -1588,6 +1702,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) result = disc_reason; address = g_malloc0(BT_ADDRESS_STRING_SIZE); + ret_if(address == NULL); _bt_convert_device_path_to_address(path, address); dev_name = _bt_get_bonded_device_name(address); @@ -1612,7 +1727,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) */ _bt_obex_check_pending_transfer(address); _bt_opp_client_is_sending(&sending); - if(sending == TRUE) + if (sending == TRUE) _bt_opp_client_check_pending_transfer(address); param = g_variant_new("(isy)", result, address, addr_type); _bt_send_event(BT_DEVICE_EVENT, @@ -1627,6 +1742,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) g_variant_get(msg, "(si)", &profile_uuid, &state); address = g_malloc0(BT_ADDRESS_STRING_SIZE); + ret_if(address == NULL); _bt_convert_device_path_to_address(path, address); @@ -1798,6 +1914,8 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) ret_if(_bt_is_le_scanning() == FALSE); le_dev_info = g_malloc0(sizeof(bt_remote_le_dev_info_t)); + if (le_dev_info == NULL) + return; g_variant_get(msg, "(syyii@ay)", &le_dev_info->address, &le_dev_info->addr_type, @@ -1810,6 +1928,12 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) buffer = (char *)g_variant_get_data(value); le_dev_info->adv_data = g_memdup(buffer, buffer_len); + if (le_dev_info->adv_data == NULL && + le_dev_info->adv_type != BT_LE_ADV_SCAN_RSP) { + _bt_free_le_device_info(le_dev_info); + g_variant_unref(value); + return; + } if (_bt_get_le_scan_type() == BT_LE_PASSIVE_SCAN) { _bt_send_scan_result_event(le_dev_info, NULL); @@ -1820,13 +1944,21 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) if (le_dev_info->adv_type != BT_LE_ADV_SCAN_RSP) { /* ADV_IND */ adv_info = g_malloc0(sizeof(bt_le_adv_info_t)); + if (adv_info == NULL) { + _bt_free_le_device_info(le_dev_info); + g_variant_unref(value); + return; + } + adv_info->addr = g_strdup(le_dev_info->address); adv_info->data_len = le_dev_info->adv_data_len; adv_info->data = g_malloc0(le_dev_info->adv_data_len); - memcpy(adv_info->data, le_dev_info->adv_data, - le_dev_info->adv_data_len); + if (adv_info->data) { + memcpy(adv_info->data, le_dev_info->adv_data, + le_dev_info->adv_data_len); - __bt_add_adv_ind_info(adv_info); + __bt_add_adv_ind_info(adv_info); + } } else { /* SCAN_RSP */ adv_info = __bt_get_adv_ind_info(le_dev_info->address); @@ -1852,8 +1984,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member,const char *path) param = g_variant_new("(isqqqq)", result, address, tx_octets, tx_time, rx_octets, rx_time); /* Send event to application */ - _bt_send_event(BT_DEVICE_EVENT, - event, param); + _bt_send_event(BT_DEVICE_EVENT, event, param); g_free(address); } @@ -2014,8 +2145,11 @@ void _bt_handle_headset_event(GVariant *msg, const char *path) _bt_convert_device_path_to_address(path, address); - g_variant_get(value, "i", &spkr_gain); - param = g_variant_new("(isq)", result, address, spkr_gain); + spkr_gain = g_variant_get_uint16(value); + + BT_DBG("spkr_gain: %d", spkr_gain); + + param = g_variant_new("(i&sq)", result, address, spkr_gain); _bt_send_event(BT_HEADSET_EVENT, BLUETOOTH_EVENT_AG_SPEAKER_GAIN, param); @@ -2028,8 +2162,9 @@ void _bt_handle_headset_event(GVariant *msg, const char *path) _bt_convert_device_path_to_address(path, address); - g_variant_get(value, "i", &mic_gain); - param = g_variant_new("(isq)", result, address, mic_gain); + mic_gain = g_variant_get_uint16(value); + + param = g_variant_new("(i&sq)", result, address, mic_gain); _bt_send_event(BT_HEADSET_EVENT, BLUETOOTH_EVENT_AG_MIC_GAIN, param); g_free(address); @@ -2050,8 +2185,8 @@ void _bt_handle_sink_event(GVariant *msg, const char *path) GVariant *child = NULL; GVariant *val = NULL; GVariant *param = NULL; - g_variant_iter_init (&value_iter, msg); - while ((child = g_variant_iter_next_value (&value_iter))) { + g_variant_iter_init(&value_iter, msg); + while ((child = g_variant_iter_next_value(&value_iter))) { g_variant_get(child, "{sv}", &property, &val); @@ -2108,7 +2243,7 @@ void _bt_handle_sink_event(GVariant *msg, const char *path) wait_list->out_param1); } g_free(address); - }else if (strcasecmp(value, "Connected") == 0) { + } else if (strcasecmp(value, "Connected") == 0) { char *address; char connected_address[BT_ADDRESS_STRING_SIZE + 1]; bluetooth_device_address_t device_address; @@ -2205,7 +2340,7 @@ static void __bt_devices_list_free(void) node = g_list_first(p_cache_list); - while (node != NULL){ + while (node != NULL) { cache_info = (bt_cache_info_t *)node->data; p_cache_list = g_list_remove(p_cache_list, cache_info); __bt_free_cache_info(cache_info); @@ -2218,13 +2353,13 @@ static int __bt_parse_event(GVariant *msg) { GVariantIter iter; GVariant *child; - char *interface_name= NULL; + char *interface_name = NULL; GVariant *inner_iter = NULL; g_variant_iter_init(&iter, msg); while ((child = g_variant_iter_next_value(&iter))) { - g_variant_get(child,"{&s@a{sv}}", &interface_name, &inner_iter); + g_variant_get(child, "{&s@a{sv}}", &interface_name, &inner_iter); if (g_strcmp0(interface_name, BT_DEVICE_INTERFACE) == 0) { g_variant_unref(inner_iter); @@ -2266,15 +2401,14 @@ static void __bt_manager_event_filter(GDBusConnection *connection, if (strcasecmp(signal_name, "InterfacesAdded") == 0) { g_variant_get(parameters, "(&o@a{sa{sv}})", &obj_path, &value); - if (strcasecmp(obj_path, BT_BLUEZ_HCI_PATH) == 0){ + if (strcasecmp(obj_path, BT_BLUEZ_HCI_PATH) == 0) { #ifdef USB_BLUETOOTH BT_DBG("Enable Adapter"); _bt_enable_adapter(); #else _bt_handle_adapter_added(); #endif - } - else { + } else { bt_event = __bt_parse_event(value); if (bt_event == BT_DEVICE_EVENT) { bt_cache_info_t *cache_info; @@ -2284,7 +2418,14 @@ static void __bt_manager_event_filter(GDBusConnection *connection, _bt_is_le_scanning() == FALSE); cache_info = g_malloc0(sizeof(bt_cache_info_t)); + ret_if(cache_info == NULL); + dev_info = g_malloc0(sizeof(bt_remote_dev_info_t)); + if (dev_info == NULL) { + __bt_free_cache_info(cache_info); + return; + } + cache_info->dev_info = dev_info; if (__bt_parse_interface(parameters, dev_info) == FALSE) { @@ -2309,11 +2450,27 @@ static void __bt_manager_event_filter(GDBusConnection *connection, */ dev_info->name = g_strdup(dev_info->address); +#ifdef TIZEN_DPM_ENABLE + if (_bt_dpm_get_bluetooth_desktop_connectivity_state() == + DPM_RESTRICTED) { + bluetooth_device_class_t device_class; + _bt_divide_device_class(&device_class, dev_info->class); + BT_DBG("[%s]device_class.major_class : %d", dev_info->name, device_class.major_class); + + if (device_class.major_class == + BLUETOOTH_DEVICE_MAJOR_CLASS_COMPUTER) { + __bt_free_cache_info(cache_info); + g_variant_unref(value); + return; + } + } +#endif + GVariant *uuids = NULL; GVariantBuilder *builder = NULL; int i = 0; builder = g_variant_builder_new(G_VARIANT_TYPE("as")); - for (i=0; i < dev_info->uuid_count; i++) { + for (i = 0; i < dev_info->uuid_count; i++) { g_variant_builder_add(builder, "s", dev_info->uuids[i]); } @@ -2351,7 +2508,6 @@ static void __bt_manager_event_filter(GDBusConnection *connection, BT_DBG("InterfacesRemoved"); _bt_handle_adapter_removed(); #endif - if (g_strcmp0(interface_name, BT_MEDIATRANSPORT_INTERFACE) == 0) { bt_event = BT_MEDIA_TRANSFER_EVENT; } else if (g_strcmp0(interface_name, BT_DEVICE_INTERFACE) == 0) { @@ -2378,20 +2534,19 @@ static void __bt_manager_event_filter(GDBusConnection *connection, } if (*current != '\0') { + g_free(current); if (name) g_free(name); if (previous) g_free(previous); - if (current) - g_free(current); return; } if (strcasecmp(name, BT_BLUEZ_NAME) == 0) { BT_DBG("Bluetoothd is terminated"); - if (_bt_adapter_get_status() != BT_DEACTIVATING) { + if (_bt_adapter_get_status() == BT_ACTIVATED) __bt_disable_cb(); - } + _bt_handle_adapter_removed(); __bt_devices_list_free(); } @@ -2439,6 +2594,8 @@ static void __bt_manager_event_filter(GDBusConnection *connection, _bt_handle_agent_event(parameters, signal_name); } else if (g_strcmp0(interface_name, BT_DEVICE_INTERFACE) == 0) { _bt_handle_device_event(parameters, signal_name, object_path); + } else if (g_strcmp0(interface_name, BT_GATT_CHAR_INTERFACE) == 0) { + _bt_handle_gatt_event(parameters, signal_name, object_path); } return; @@ -2450,7 +2607,7 @@ static gboolean __bt_is_obexd_event(GVariant *msg, const char *interface) if (g_strcmp0(interface, BT_PROPERTIES_INTERFACE) == 0) { char *interface_name = NULL; - g_variant_get(msg,"(&s@a{sv}@as)", &interface_name, NULL, NULL); + g_variant_get(msg, "(&s@a{sv}@as)", &interface_name, NULL, NULL); retv_if(interface_name == NULL, FALSE); if (strcasecmp(interface_name, BT_OBEX_TRANSFER_INTERFACE) == 0) { @@ -2542,7 +2699,7 @@ static gboolean __bt_is_obexd_client_event(GVariant *msg, const char *interface) if (g_strcmp0(interface, BT_PROPERTIES_INTERFACE) == 0) { char *interface_name = NULL; - g_variant_get(msg,"(&s@a{sv}@as)", &interface_name, NULL, NULL); + g_variant_get(msg, "(&s@a{sv}@as)", &interface_name, NULL, NULL); retv_if(interface_name == NULL, FALSE); @@ -2570,22 +2727,21 @@ static void __bt_opc_event_filter(GDBusConnection *connection, char *obj_path = NULL; if (strcasecmp(member, "InterfacesAdded") == 0) { BT_DBG("InterfacesAdded"); - }else if (strcasecmp(member, "InterfacesRemoved") == 0) { + } else if (strcasecmp(member, "InterfacesRemoved") == 0) { if (__bt_get_object_path(parameters, &obj_path)) { BT_ERR("Fail to get the path"); return; } - BT_DBG("object_path =%s",obj_path); + BT_DBG("object_path = %s", obj_path); if (strncmp(obj_path, BT_SESSION_BASEPATH_CLIENT, strlen(BT_SESSION_BASEPATH_CLIENT)) != 0 || strstr(obj_path, "transfer") == NULL) { g_free(obj_path); return; - } - else if (strncmp(obj_path, BT_SESSION_BASEPATH_CLIENT, + } else if (strncmp(obj_path, BT_SESSION_BASEPATH_CLIENT, strlen(BT_SESSION_BASEPATH_CLIENT)) == 0) { BT_DBG("Going to call opc disconnected"); _bt_opc_disconnected(obj_path); @@ -2593,7 +2749,7 @@ static void __bt_opc_event_filter(GDBusConnection *connection, _bt_sending_files(); g_free(obj_path); - }else if (__bt_is_obexd_client_event(parameters, interface_name) == TRUE){ + } else if (__bt_is_obexd_client_event(parameters, interface_name) == TRUE) { char *path = (char *)object_path; BT_INFO("object_path %s", path); if (strncmp(path, BT_SESSION_BASEPATH_CLIENT, @@ -2655,6 +2811,7 @@ int _bt_register_manager_subscribe_signal(GDBusConnection *conn, static int subs_name_owner_id = -1; static int subs_property_id = -1; static int subs_adapter_id = -1; + static int subs_gatt_id = -1; if (subscribe) { if (subs_interface_added_id == -1) { @@ -2692,6 +2849,13 @@ int _bt_register_manager_subscribe_signal(GDBusConnection *conn, __bt_manager_event_filter, NULL, NULL); } + if (subs_gatt_id == -1) { + subs_gatt_id = g_dbus_connection_signal_subscribe(conn, + NULL, BT_GATT_CHAR_INTERFACE, + NULL, NULL, NULL, 0, + __bt_manager_event_filter, + NULL, NULL); + } } else { if (subs_interface_added_id != -1) { g_dbus_connection_signal_unsubscribe(conn, @@ -2713,10 +2877,14 @@ int _bt_register_manager_subscribe_signal(GDBusConnection *conn, subs_property_id); subs_property_id = -1; } - if (subs_adapter_id == -1) { + if (subs_adapter_id != -1) { g_dbus_connection_signal_unsubscribe(conn, subs_adapter_id); subs_adapter_id = -1; } + if (subs_gatt_id != -1) { + g_dbus_connection_signal_unsubscribe(conn, subs_gatt_id); + subs_gatt_id = -1; + } } return 0; }