X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-common.c;h=6636577dc2f416cf93442c4157050542253a548d;hb=1fa07edcd0e77a445700975773db3300f556caf5;hp=6992b7c15c4ad864a443b606583641c0d185fe2f;hpb=73dc6ba2d484a0c16a099f2f524f26867f93732f;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-common.c b/bt-api/bt-common.c index 6992b7c..6636577 100644 --- a/bt-api/bt-common.c +++ b/bt-api/bt-common.c @@ -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; - - system_gconn = g_bus_get_private_conn(); + 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(); - 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) @@ -512,6 +513,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"}, @@ -553,6 +555,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"}, @@ -746,7 +749,6 @@ gboolean _bt_utf8_validate(char *name) 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]; @@ -887,14 +889,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; @@ -903,7 +897,10 @@ 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; @@ -927,7 +924,7 @@ 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; @@ -950,11 +947,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) @@ -963,14 +977,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], @@ -997,7 +1017,7 @@ 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, @@ -1064,12 +1084,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; @@ -1207,7 +1226,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; @@ -1275,7 +1294,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; @@ -1321,43 +1340,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] != '\0') + 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, @@ -1524,7 +1530,7 @@ 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); @@ -1551,7 +1557,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) { @@ -1594,7 +1600,7 @@ 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); @@ -1850,7 +1856,7 @@ 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, @@ -1893,23 +1899,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; @@ -1982,7 +1971,7 @@ 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, @@ -2037,7 +2026,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; @@ -2138,6 +2127,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"}, @@ -2219,6 +2219,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 @@ -2273,7 +2299,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; } @@ -2345,7 +2370,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 && @@ -2417,9 +2442,9 @@ BT_EXPORT_API int bluetooth_unregister_callback(void) _bt_gdbus_deinit_proxys(); - if (system_gconn) { - g_object_unref(system_gconn); - system_gconn = NULL; + if (system_private_conn) { + g_object_unref(system_private_conn); + system_private_conn = NULL; } return BLUETOOTH_ERROR_NONE;