Merge "Fixed the descriptor write send response" into tizen

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-common.c

diff --git a/bt-api/bt-common.c b/bt-api/bt-common.c
index ed4ddba..c98fb07 100644 (file)
--- 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)
@@ -554,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"},
@@ -747,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];
@@ -888,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;
@@ -904,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;
 
@@ -928,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;
 
@@ -951,7 +947,7 @@ void _bt_unregister_gdbus(int object_id)
 {
        GDBusConnection *gconn;
 
-       gconn = _bt_init_system_gdbus_conn();
+       gconn = _bt_get_system_shared_conn();
        if (gconn == NULL)
                return;
 
@@ -983,7 +979,7 @@ int _bt_register_new_conn(const char *path, bt_new_connection_cb cb)
        GError *error = NULL;
        char *bus_name;
 
-       gconn = _bt_init_system_gdbus_conn();
+       gconn = _bt_get_system_shared_conn();
        if (gconn == NULL)
                return -1;
 
@@ -1021,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,
@@ -1088,7 +1084,7 @@ int _bt_register_new_conn_ex(const char *path, const char *bus_name, bt_new_conn
        int id;
        GError *error = NULL;
 
-       gconn = _bt_init_system_gdbus_conn();
+       gconn = _bt_get_system_shared_conn();
        if (gconn == NULL)
                return -1;
 
@@ -1230,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;
@@ -1298,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;
@@ -1508,7 +1504,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);
@@ -1578,7 +1574,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);
@@ -1834,7 +1830,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,
@@ -1877,23 +1873,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;
@@ -1966,7 +1945,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,
@@ -2329,7 +2308,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 &&
@@ -2401,9 +2380,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;