X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-common.c;h=2161643fdadba84f08f0954b0a2eb307b43addc6;hb=604fbd7fc8b48cc594017fb6d8b77c378f3e0cca;hp=d9ab407e0fca58888e6802e160fd00adc9f8a8c3;hpb=41a3944f11beea2b5de2dc4a918769cdc7493663;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-common.c b/bt-api/bt-common.c index d9ab407..2161643 100644 --- a/bt-api/bt-common.c +++ b/bt-api/bt-common.c @@ -21,7 +21,7 @@ #include #include #include - +#include #include @@ -49,20 +49,17 @@ #include "bt-dpm.h" #endif - static bt_user_info_t user_info[BT_MAX_USER_INFO]; -static GDBusConnection *system_gdbus_conn = NULL; - +static GDBusConnection *system_shared_conn = NULL; +static GDBusConnection *system_private_conn = NULL; static guint bus_id; -static GDBusConnection *system_gconn = NULL; - static gboolean bt_enabled = FALSE; #define DBUS_TIMEOUT 20 * 1000 /* 20 Seconds */ -GDBusConnection *g_bus_get_private_conn(void) +static GDBusConnection *g_bus_get_private_conn(void) { GError *error = NULL; char *address; @@ -95,24 +92,28 @@ GDBusConnection *g_bus_get_private_conn(void) return private_gconn; } -GDBusConnection *_bt_gdbus_init_system_gconn(void) +GDBusConnection *_bt_get_system_private_conn(void) { - if (system_gconn != NULL) - return system_gconn; + if (system_private_conn == NULL) + system_private_conn = g_bus_get_private_conn(); + else if (g_dbus_connection_is_closed(system_private_conn)) + system_private_conn = g_bus_get_private_conn(); - system_gconn = g_bus_get_private_conn(); - - return system_gconn; + return system_private_conn; } -GDBusConnection *_bt_gdbus_get_system_gconn(void) +GDBusConnection *_bt_get_system_shared_conn(void) { - if (system_gconn == NULL) - system_gconn = _bt_gdbus_init_system_gconn(); - else if (g_dbus_connection_is_closed(system_gconn)) - system_gconn = g_bus_get_private_conn(); - - return system_gconn; + if (system_shared_conn == NULL) { + GError *error = NULL; + system_shared_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); + if (error) { + BT_ERR("GDBus connection Error : %s \n", error->message); + g_clear_error(&error); + return NULL; + } + } + return system_shared_conn; } void _bt_print_device_address_t(const bluetooth_device_address_t *addr) @@ -132,6 +133,52 @@ bt_user_info_t *_bt_get_user_data(int type) return &user_info[type]; } +int _bt_common_send_rfcomm_rx_details(int len) +{ + uid_t uid = getuid(); + pid_t pid = getpid(); + int size = len; + int ret = BLUETOOTH_ERROR_NONE; + + BT_INFO("+"); + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + g_array_append_vals(in_param1, &uid, sizeof(uid_t)); + g_array_append_vals(in_param2, &pid, sizeof(pid_t)); + g_array_append_vals(in_param3, &size, sizeof(int)); + + ret = _bt_send_request(BT_BLUEZ_SERVICE, BT_RFCOMM_SEND_RX_DETAILS, + in_param1, in_param2, in_param3, in_param4, &out_param); + + BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + BT_INFO("-"); + return ret; +} + +int _bt_common_send_rfcomm_tx_details(int len) +{ + uid_t uid = getuid(); + pid_t pid = getpid(); + int size = len; + int ret = BLUETOOTH_ERROR_NONE; + + BT_INFO("+"); + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + g_array_append_vals(in_param1, &uid, sizeof(uid_t)); + g_array_append_vals(in_param2, &pid, sizeof(pid_t)); + g_array_append_vals(in_param3, &size, sizeof(int)); + + ret = _bt_send_request(BT_BLUEZ_SERVICE, BT_RFCOMM_SEND_TX_DETAILS, + in_param1, in_param2, in_param3, in_param4, &out_param); + + BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + BT_INFO("-"); + return ret; +} + void _bt_common_event_cb(int event, int result, void *param, void *callback, void *user_data) { @@ -282,6 +329,24 @@ void _bt_convert_addr_string_to_type(unsigned char *addr, const char *address) } } +void _bt_convert_uuid_type_to_string(char *str, const unsigned char *uuid) +{ + if (!str) { + BT_ERR("str == NULL"); + return; + } + + if (!uuid) { + BT_ERR("uuid == NULL"); + return; + } + + snprintf(str, 37, + "%2.2X%2.2X%2.2X%2.2X-%2.2X%2.2X-%2.2X%2.2X-%2.2X%2.2X-%2.2X%2.2X%2.2X%2.2X%2.2X%2.2X", + uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], + uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15]); +} + void _bt_convert_addr_string_to_secure_string(char *addr, const char *address) { int len; @@ -455,6 +520,7 @@ const char *_bt_convert_service_function_to_string(int function) {BT_GET_ADVERTISING_DATA, "BT_GET_ADVERTISING_DATA"}, {BT_SET_ADVERTISING_DATA, "BT_SET_ADVERTISING_DATA"}, {BT_SET_SCAN_PARAMETERS, "BT_SET_SCAN_PARAMETERS"}, + {BT_SET_SCAN_TYPE, "BT_SET_SCAN_TYPE"}, {BT_GET_SCAN_RESPONSE_DATA, "BT_GET_SCAN_RESPONSE_DATA"}, {BT_SET_SCAN_RESPONSE_DATA, "BT_SET_SCAN_RESPONSE_DATA"}, {BT_IS_ADVERTISING, "BT_IS_ADVERTISING"}, @@ -468,8 +534,6 @@ const char *_bt_convert_service_function_to_string(int function) {BT_REMOVE_WHITE_LIST, "BT_REMOVE_WHITE_LIST"}, {BT_CLEAR_WHITE_LIST, "BT_CLEAR_WHITE_LIST"}, {BT_REGISTER_SCAN_FILTER, "BT_REGISTER_SCAN_FILTER"}, - {BT_UNREGISTER_SCAN_FILTER, "BT_UNREGISTER_SCAN_FILTER"}, - {BT_UNREGISTER_ALL_SCAN_FILTERS, "BT_UNREGISTER_ALL_SCAN_FILTERS"}, {BT_IS_SCAN_FILTER_SUPPORTED, "BT_IS_SCAN_FILTER_SUPPORTED"}, {BT_GET_PROFILE_CONNECTED_DEVICES, "BT_GET_PROFILE_CONNECTED_DEVICES"}, {BT_ENABLE_FORCE_HCI_DUMP, "BT_ENABLE_FORCE_HCI_DUMP"}, @@ -494,6 +558,7 @@ const char *_bt_convert_service_function_to_string(int function) {BT_UPDATE_LE_CONNECTION_MODE, "BT_UPDATE_LE_CONNECTION_MODE"}, {BT_SET_PROFILE_TRUSTED, "BT_SET_PROFILE_TRUSTED"}, {BT_GET_PROFILE_TRUSTED, "BT_GET_PROFILE_TRUSTED"}, + {BT_DISCONNECT_DEVICE, "BT_DISCONNECT_DEVICE"}, {BT_HID_CONNECT, "BT_HID_CONNECT"}, {BT_HID_DISCONNECT, "BT_HID_DISCONNECT"}, {BT_HID_DEVICE_ACTIVATE, "BT_HID_DEVICE_ACTIVATE"}, @@ -524,9 +589,14 @@ const char *_bt_convert_service_function_to_string(int function) {BT_SET_SPEAKER_GAIN, "BT_SET_SPEAKER_GAIN"}, {BT_SET_CONTENT_PROTECT, "BT_SET_CONTENT_PROTECT"}, {BT_AUDIO_SELECT_ROLE, "BT_AUDIO_SELECT_ROLE"}, + {BT_AUDIO_SET_ABSOLUTE_VOLUME, "BT_AUDIO_SET_ABSOLUTE_VOLUME"}, + {BT_AUDIO_GET_ABSOLUTE_VOLUME, "BT_AUDIO_GET_ABSOLUTE_VOLUME"}, + {BT_AUDIO_IS_AVC_ACTIVATED, "BT_AUDIO_IS_AVC_ACTIVATED"}, {BT_OOB_READ_LOCAL_DATA, "BT_OOB_READ_LOCAL_DATA"}, {BT_OOB_ADD_REMOTE_DATA, "BT_OOB_ADD_REMOTE_DATA"}, {BT_OOB_REMOVE_REMOTE_DATA, "BT_OOB_REMOVE_REMOTE_DATA"}, + {BT_LE_OOB_READ_LOCAL_DATA, "BT_LE_OOB_READ_LOCAL_DATA"}, + {BT_LE_OOB_ADD_REMOTE_DATA, "BT_LE_OOB_ADD_REMOTE_DATA"}, {BT_AVRCP_SET_TRACK_INFO, "BT_AVRCP_SET_TRACK_INFO"}, {BT_AVRCP_SET_PROPERTY, "BT_AVRCP_SET_PROPERTY"}, {BT_AVRCP_SET_PROPERTIES, "BT_AVRCP_SET_PROPERTIES"}, @@ -535,6 +605,7 @@ const char *_bt_convert_service_function_to_string(int function) {BT_AVRCP_TARGET_CONNECT, "BT_AVRCP_TARGET_CONNECT"}, {BT_AVRCP_TARGET_DISCONNECT, "BT_AVRCP_TARGET_DISCONNECT"}, {BT_AVRCP_HANDLE_CONTROL, "BT_AVRCP_HANDLE_CONTROL"}, + {BT_AVRCP_HANDLE_CONTROL_TO_DEST, "BT_AVRCP_HANDLE_CONTROL_TO_DEST"}, {BT_AVRCP_CONTROL_SET_PROPERTY, "BT_AVRCP_CONTROL_SET_PROPERTY"}, {BT_AVRCP_CONTROL_GET_PROPERTY, "BT_AVRCP_CONTROL_GET_PROPERTY"}, {BT_AVRCP_GET_TRACK_INFO, "BT_AVRCP_GET_TRACK_INFO"}, @@ -570,6 +641,7 @@ const char *_bt_convert_service_function_to_string(int function) {BT_RFCOMM_SOCKET_WRITE, "BT_RFCOMM_SOCKET_WRITE"}, {BT_RFCOMM_CREATE_SOCKET, "BT_RFCOMM_CREATE_SOCKET"}, {BT_RFCOMM_REMOVE_SOCKET, "BT_RFCOMM_REMOVE_SOCKET"}, + {BT_RFCOMM_LISTEN_AND_ACCEPT, "BT_RFCOMM_LISTEN_AND_ACCEPT"}, {BT_RFCOMM_LISTEN, "BT_RFCOMM_LISTEN"}, {BT_RFCOMM_IS_UUID_AVAILABLE, "BT_RFCOMM_IS_UUID_AVAILABLE"}, {BT_RFCOMM_ACCEPT_CONNECTION, "BT_RFCOMM_ACCEPT_CONNECTION"}, @@ -590,6 +662,7 @@ const char *_bt_convert_service_function_to_string(int function) {BT_SET_LE_PRIVACY, "BT_SET_LE_PRIVACY"}, {BT_REQ_ATT_MTU, "BT_REQ_ATT_MTU"}, {BT_GET_ATT_MTU, "BT_GET_ATT_MTU"}, + {BT_GATT_ACQUIRE_WRITE, "BT_GATT_ACQUIRE_WRITE"}, {BT_GET_DEVICE_IDA, "BT_GET_DEVICE_IDA"}, {BT_SET_LE_STATIC_RANDOM_ADDRESS, "BT_SET_LE_STATIC_RANDOM_ADDRESS"}, {BT_HDP_CONNECT, "BT_HDP_CONNECT"}, @@ -724,9 +797,7 @@ gboolean _bt_utf8_validate(char *name) return TRUE; } - static GDBusProxy *profile_gproxy; -static GDBusConnection *gconn; static int latest_id = -1; #define BT_RFCOMM_ID_MAX 245 static gboolean id_used[BT_RFCOMM_ID_MAX]; @@ -867,14 +938,6 @@ void __rfcomm_delete_id(int id) latest_id = id - 1; } -static GDBusConnection *__get_gdbus_connection() -{ - if (gconn == NULL) - gconn = g_bus_get_private_conn(); - - return gconn; -} - static GDBusProxy *__bt_gdbus_get_profile_proxy(void) { GDBusConnection *gconn; @@ -883,11 +946,14 @@ static GDBusProxy *__bt_gdbus_get_profile_proxy(void) if (profile_gproxy) return profile_gproxy; - gconn = __get_gdbus_connection(); + /* Shared connection should be used because rfcomm interface was registered + * on shared connection not private. Otherwise, dbus rejection is occured + * because dbus policy is only applied on shared connection not private. */ + gconn = _bt_get_system_shared_conn(); if (gconn == NULL) return NULL; - profile_gproxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_NONE, + profile_gproxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, BT_BLUEZ_NAME, "/org/bluez", "org.bluez.ProfileManager1", @@ -907,11 +973,11 @@ static GDBusProxy *__bt_gdbus_get_device_proxy(char *object_path) GError *err = NULL; GDBusProxy *device_gproxy; - gconn = __get_gdbus_connection(); + gconn = _bt_get_system_private_conn(); if (gconn == NULL) return NULL; - device_gproxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_NONE, + device_gproxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, BT_BLUEZ_NAME, object_path, BT_DEVICE_INTERFACE, @@ -930,11 +996,28 @@ void _bt_unregister_gdbus(int object_id) { GDBusConnection *gconn; - gconn = __get_gdbus_connection(); + gconn = _bt_get_system_shared_conn(); if (gconn == NULL) return; g_dbus_connection_unregister_object(gconn, object_id); + + /* TODO: bus_id needs to be un-owned if all of path is unregistered */ +} + +static GDBusNodeInfo *_bt_get_gdbus_node(GDBusConnection *gconn, const gchar *xml_data, const char *bus_name) +{ + if (bus_id == 0) { + char *name = g_strdup(bus_name); + BT_DBG("well-known name: %s", name); + bus_id = g_bus_own_name_on_connection(gconn, + name, G_BUS_NAME_OWNER_FLAGS_NONE, + NULL, NULL, NULL, NULL); + BT_DBG("Got bus id %d", bus_id); + g_free(name); + } + + return g_dbus_node_info_new_for_xml(xml_data, NULL); } int _bt_register_new_conn(const char *path, bt_new_connection_cb cb) @@ -943,14 +1026,20 @@ int _bt_register_new_conn(const char *path, bt_new_connection_cb cb) GDBusNodeInfo *node_info; int id; GError *error = NULL; + char *bus_name; - gconn = __get_gdbus_connection(); + gconn = _bt_get_system_shared_conn(); if (gconn == NULL) return -1; - node_info = _bt_get_gdbus_node(rfcomm_agent_xml); - if (node_info == NULL) + bus_name = g_strdup_printf("org.bt.frwk.p%d", getpid()); + + node_info = _bt_get_gdbus_node(gconn, rfcomm_agent_xml, bus_name); + if (node_info == NULL) { + g_free(bus_name); return -1; + } + g_free(bus_name); id = g_dbus_connection_register_object(gconn, path, node_info->interfaces[0], @@ -977,11 +1066,11 @@ static GDBusProxy * __bt_gdbus_get_adapter_proxy() GVariant *result = NULL; char *adapter_path = NULL; - conn = __get_gdbus_connection(); + conn = _bt_get_system_private_conn(); retv_if(conn == NULL, NULL); manager_proxy = g_dbus_proxy_new_sync(conn, - G_DBUS_PROXY_FLAGS_NONE, NULL, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, BT_BLUEZ_NAME, BT_MANAGER_PATH, BT_MANAGER_INTERFACE, @@ -1019,7 +1108,7 @@ static GDBusProxy * __bt_gdbus_get_adapter_proxy() BT_INFO("Adapter Path %s", adapter_path); adapter_proxy = g_dbus_proxy_new_sync(conn, - G_DBUS_PROXY_FLAGS_NONE, NULL, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, BT_BLUEZ_NAME, adapter_path, BT_ADAPTER_INTERFACE, @@ -1044,12 +1133,11 @@ int _bt_register_new_conn_ex(const char *path, const char *bus_name, bt_new_conn int id; GError *error = NULL; - gconn = __get_gdbus_connection(); + gconn = _bt_get_system_shared_conn(); if (gconn == NULL) return -1; - node_info = _bt_get_gdbus_node_ex(rfcomm_agent_xml, bus_name); - + node_info = _bt_get_gdbus_node(gconn, rfcomm_agent_xml, bus_name); if (node_info == NULL) return -1; @@ -1187,7 +1275,7 @@ int _bt_register_profile_ex(bt_register_profile_info_t *info, gboolean use_defau NULL, &err); if (err) { g_dbus_error_strip_remote_error(err); - BT_ERR("RegisterProfile failed: %s", err->message); + BT_ERR("RegisterProfile2 failed: %s", err->message); if (g_strrstr(err->message, BT_ACCESS_DENIED_MSG)) result = BLUETOOTH_ERROR_ACCESS_DENIED; @@ -1255,7 +1343,7 @@ int _bt_register_profile_platform(bt_register_profile_info_t *info, gboolean use if (err) { g_dbus_error_strip_remote_error(err); - BT_ERR("RegisterProfile failed: %s", err->message); + BT_ERR("RegisterProfile1 failed: %s", err->message); if (g_strrstr(err->message, BT_ACCESS_DENIED_MSG)) result = BLUETOOTH_ERROR_ACCESS_DENIED; @@ -1301,43 +1389,30 @@ void _bt_unregister_profile(char *path) return; } -GDBusNodeInfo * _bt_get_gdbus_node(const gchar *xml_data) +void _bt_print_api_caller_name(void) { - if (bus_id == 0) { - char *name = g_strdup_printf("org.bt.frwk.p%d", getpid()); - - bus_id = g_bus_own_name(G_BUS_TYPE_SYSTEM, - name, - G_BUS_NAME_OWNER_FLAGS_NONE, - NULL, - NULL, - NULL, - NULL, - NULL); - BT_DBG("Got bus id %d", bus_id); - g_free(name); - } + FILE *fp = NULL; + char *path = NULL; + char buf[256] = {0, }; + char **str_list = NULL; - return g_dbus_node_info_new_for_xml(xml_data, NULL); -} + path = g_strdup_printf("/proc/%d/cmdline", getpid()); + fp = fopen(path, "r"); + if (fp == NULL) { + g_free(path); + return; + } -GDBusNodeInfo * _bt_get_gdbus_node_ex(const gchar *xml_data, const char *bus_name) -{ - if (bus_id == 0) { - char *name = g_strdup(bus_name); - bus_id = g_bus_own_name(G_BUS_TYPE_SYSTEM, - name, - G_BUS_NAME_OWNER_FLAGS_NONE, - NULL, - NULL, - NULL, - NULL, - NULL); - BT_DBG("Got bus id %d", bus_id); - g_free(name); + if (fgets(buf, 256, fp) != NULL) { + str_list = g_strsplit(buf, " ", -1); + if (str_list[0] != NULL) + BT_INFO("Caller : %s", str_list[0]); + g_strfreev(str_list); } - return g_dbus_node_info_new_for_xml(xml_data, NULL); + fclose(fp); + g_free(path); + return; } int _bt_connect_profile(char *address, char *uuid, void *cb, @@ -1393,6 +1468,8 @@ int _bt_connect_profile(char *address, char *uuid, void *cb, DBUS_TIMEOUT, NULL, (GAsyncReadyCallback)cb, func_data); + if (cb == NULL) + g_object_unref(proxy); BT_DBG("-"); return BLUETOOTH_ERROR_NONE; } @@ -1438,6 +1515,8 @@ int _bt_discover_services(char *address, char *uuid, void *cb, DBUS_TIMEOUT, NULL, (GAsyncReadyCallback)cb, func_data); + if (cb == NULL) + g_object_unref(proxy); BT_DBG("-"); return BLUETOOTH_ERROR_NONE; } @@ -1504,12 +1583,12 @@ int _bt_discover_service_uuids(char *address, char *remote_uuid) int result = BLUETOOTH_ERROR_INTERNAL; BT_INFO("+"); retv_if(remote_uuid == NULL, BLUETOOTH_ERROR_INTERNAL); - gconn = __get_gdbus_connection(); + gconn = _bt_get_system_private_conn(); retv_if(gconn == NULL, BLUETOOTH_ERROR_INTERNAL); object_path = _bt_get_device_object_path(address); retv_if(object_path == NULL, BLUETOOTH_ERROR_INTERNAL); - proxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_NONE, NULL, + proxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, BT_BLUEZ_NAME, object_path, BT_PROPERTIES_INTERFACE, NULL, &err); g_free(object_path); @@ -1531,7 +1610,7 @@ int _bt_discover_service_uuids(char *address, char *remote_uuid) } else { g_variant_get(ret, "(v)", &value); uuid_value = (char **)g_variant_get_strv(value, &size); - BT_DBG("Size items %d", size); + BT_DBG("Size items %zd", size); } if (uuid_value) { @@ -1574,13 +1653,13 @@ int _bt_get_cod_by_address(char *address, bluetooth_device_class_t *dev_class) unsigned int class = 0x00; int ret = BLUETOOTH_ERROR_NONE; - gconn = __get_gdbus_connection(); + gconn = _bt_get_system_private_conn(); retv_if(gconn == NULL, BLUETOOTH_ERROR_INTERNAL); object_path = _bt_get_device_object_path(address); retv_if(object_path == NULL, BLUETOOTH_ERROR_INTERNAL); - proxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_NONE, NULL, + proxy = g_dbus_proxy_new_sync(gconn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, BT_BLUEZ_NAME, object_path, BT_PROPERTIES_INTERFACE, NULL, &err); if (proxy == NULL) { @@ -1658,6 +1737,8 @@ int _bt_disconnect_profile(char *address, char *uuid, void *cb, DBUS_TIMEOUT, NULL, (GAsyncReadyCallback)cb, func_data); + if (cb == NULL) + g_object_unref(proxy); BT_DBG("-"); return BLUETOOTH_ERROR_NONE; } @@ -1682,6 +1763,7 @@ int _bt_disconnect_ext_profile(char *address, char *path) g_variant_new("(o)", path), G_DBUS_CALL_FLAGS_NONE, DBUS_TIMEOUT, NULL, NULL, NULL); + g_object_unref(proxy); BT_DBG("-"); return BLUETOOTH_ERROR_NONE; } @@ -1696,7 +1778,7 @@ int _bt_get_adapter_path(GDBusConnection *conn, char *path) retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL); manager_proxy = g_dbus_proxy_new_sync(conn, - G_DBUS_PROXY_FLAGS_NONE, NULL, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, BT_BLUEZ_NAME, BT_MANAGER_PATH, BT_MANAGER_INTERFACE, @@ -1830,11 +1912,11 @@ char *_bt_get_device_object_path(char *address) GDBusConnection *conn = NULL; char *object_path = NULL; - conn = _bt_gdbus_get_system_gconn(); + conn = _bt_get_system_private_conn(); retv_if(conn == NULL, NULL); proxy = g_dbus_proxy_new_sync(conn, - G_DBUS_PROXY_FLAGS_NONE, NULL, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, BT_BLUEZ_NAME, BT_MANAGER_PATH, BT_MANAGER_INTERFACE, @@ -1873,23 +1955,6 @@ fail: return object_path; } -GDBusConnection *_bt_init_system_gdbus_conn(void) -{ - GError *error = NULL; - if (system_gdbus_conn == NULL) { - system_gdbus_conn = - g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); - if (error) { - BT_ERR("GDBus connection Error : %s \n", - error->message); - g_clear_error(&error); - return NULL; - } - } - return system_gdbus_conn; -} - - int _bt_register_osp_server_in_agent(int type, char *uuid, char *path, int fd) { int ret; @@ -1962,11 +2027,11 @@ GVariant *_bt_get_managed_objects(void) BT_DBG("+"); - g_conn = _bt_gdbus_get_system_gconn(); + g_conn = _bt_get_system_private_conn(); retv_if(g_conn == NULL, NULL); manager_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, BT_MANAGER_PATH, BT_MANAGER_INTERFACE, @@ -2017,7 +2082,7 @@ void _bt_set_adapter_internal_status(gboolean enabled) BT_EXPORT_API int bluetooth_get_uuid_name(const char *uuid, char **name) { -#define SHORT_UUID_COUNT 162 +#define SHORT_UUID_COUNT 199 #define LONG_UUID_COUNT 17 int offset = 0; @@ -2118,6 +2183,17 @@ BT_EXPORT_API int bluetooth_get_uuid_name(const char *uuid, char **name) {"181D", "Weight Scale"}, {"181E", "Bond Management"}, {"181F", "Continuous Glucose Monitoring"}, + {"1820", "Internet Protocol Support Service"}, + {"1821", "Indoor Positioning"}, + {"1822", "Pulse Oximeter Service"}, + {"1823", "HTTP Proxy"}, + {"1824", "Transport Discovery"}, + {"1825", "Object Transfer Service"}, + {"1826", "Fitness Machine"}, + {"1827", "Mesh Provisioning Service"}, + {"1828", "Mesh Proxy Service"}, + {"1829", "Reconnection Configuration"}, + {"183A", "Insulin Delivery"}, /* GATT Declarations */ {"2800", "Primary Service Declaration"}, @@ -2199,6 +2275,32 @@ BT_EXPORT_API int bluetooth_get_uuid_name(const char *uuid, char **name) {"2A68", "Navigation"}, {"2A6D", "Pressure"}, {"2A6E", "Temperature"}, + {"2A8E", "Height"}, + {"2A90", "Last Name"}, + {"2A91", "Maximum Recommended Heart Rate"}, + {"2A92", "Resting Heart Rate"}, + {"2A98", "Weight"}, + {"2A9B", "Body Composition Feature"}, + {"2A9C", "Body Composition Measurement"}, + {"2A9D", "Weight Measurement"}, + {"2AA2", "Language"}, + {"2AA4", "Bond Management Control Point"}, + {"2AA5", "Bond Management Features"}, + {"2AA6", "Central Address Resolution"}, + {"2AAD", "Indoor Positioning Configuration"}, + {"2AB5", "Location Name"}, + {"2AB6", "URI"}, + {"2ABC", "TDS Control Point"}, + {"2AC9", "Resolvable Private Address Only"}, + {"2ACC", "Fitness Machine Feature"}, + {"2ACE", "Cross Trainer Data"}, + {"2AD3", "Training Status"}, + {"2AD7", "Supported Heart Rate Range"}, + {"2AD9", "Fitness Machine Control Point"}, + {"2ADA", "Fitness Machine Status"}, + {"2B1D", "RC Feature"}, + {"2B1E", "RC Settings"}, + {"2B1F", "Reconnection Configuration Control Point"}, }; static uuid_name_s long_uuid_name[LONG_UUID_COUNT] = { // List should be sorted by UUID @@ -2253,7 +2355,6 @@ BT_EXPORT_API int bluetooth_get_uuid_name(const char *uuid, char **name) start = p + 1; } - BT_INFO("Unknown uuid : %s", uuid); *name = g_strdup("Unknown"); return BLUETOOTH_ERROR_NONE; } @@ -2325,7 +2426,7 @@ BT_EXPORT_API int bluetooth_register_callback(bluetooth_cb_func_ptr callback_ptr { int ret; - _bt_gdbus_init_system_gconn(); + _bt_get_system_private_conn(); ret = _bt_init_event_handler(); if (ret != BLUETOOTH_ERROR_NONE && @@ -2384,7 +2485,6 @@ BT_EXPORT_API int bluetooth_unregister_callback(void) { int ret; - ret = _bt_deinit_event_handler(); if (ret != BLUETOOTH_ERROR_NONE) BT_ERR("Fail to deinit the event handler"); @@ -2395,13 +2495,19 @@ BT_EXPORT_API int bluetooth_unregister_callback(void) _bt_set_obex_server_id(BT_NO_SERVER); + _bt_reset_battery_monitor_info(); + _bt_gdbus_deinit_proxys(); - if (system_gconn) { - g_object_unref(system_gconn); - system_gconn = NULL; + if (profile_gproxy) { + g_object_unref(profile_gproxy); + profile_gproxy = NULL; + } + + if (system_private_conn) { + g_object_unref(system_private_conn); + system_private_conn = NULL; } return BLUETOOTH_ERROR_NONE; } -