Code optimize
[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-device.c
index f63a5b9..98da9f8 100644 (file)
@@ -37,7 +37,6 @@
 #include "bt-service-network.h"
 #include "bt-service-adapter.h"
 #include "bt-service-gap-agent.h"
-#include "bt-service-pbap.h"
 
 #define BT_SYSPOPUP_IPC_RESPONSE_OBJECT "/org/projectx/bt_syspopup_res"
 #define BT_SYSPOPUP_INTERFACE "User.Bluetooth.syspopup"
@@ -192,6 +191,7 @@ done:
        BT_DBG("-");
 } */
 
+#ifdef TIZEN_PROFILE_WEARABLE
 static gboolean __bt_syspopup_timer_cb(gpointer user_data)
 {
        int ret;
@@ -246,6 +246,7 @@ static gboolean __bt_launch_unable_to_pairing_syspopup(int result)
        BT_DBG("-");
        return TRUE;
 }
+#endif
 
 gboolean _bt_is_device_creating(void)
 {
@@ -315,12 +316,8 @@ static void __bt_get_uuids(GVariant *value, bt_remote_dev_info_t *info)
        ret_if(value == NULL);
        ret_if(info == NULL);
 
-       gsize uuid_count = 0;
-
-       info->uuids = g_variant_dup_strv(value, &uuid_count);
-       info->uuid_count = (unsigned int)uuid_count;
-
-       BT_DBG("uuid count : %d", uuid_count);
+       info->uuid_count = g_variant_get_size(value);
+       info->uuids = g_variant_dup_strv(value, &info->uuid_count);
 }
 
 bt_remote_dev_info_t *_bt_get_remote_device_info(char *address)
@@ -458,7 +455,7 @@ bt_remote_dev_info_t *_bt_get_remote_device_info_by_object_path(
                        g_variant_unref(tmp_value);
                }
 
-               tmp_value = g_variant_lookup_value(value, "ManufacturerDataLen", G_VARIANT_TYPE_UINT16);
+               tmp_value = g_variant_lookup_value(value, "LegacyManufacturerDataLen", G_VARIANT_TYPE_UINT16);
                if (tmp_value) {
                        dev_info->manufacturer_data_len = g_variant_get_uint16(tmp_value);
                        if (dev_info->manufacturer_data_len > BLUETOOTH_MANUFACTURER_DATA_LENGTH_MAX) {
@@ -469,7 +466,7 @@ bt_remote_dev_info_t *_bt_get_remote_device_info_by_object_path(
                } else
                        dev_info->manufacturer_data_len = 0;
 
-               tmp_value = g_variant_lookup_value(value, "ManufacturerData", G_VARIANT_TYPE_ARRAY);
+               tmp_value = g_variant_lookup_value(value, "LegacyManufacturerData", G_VARIANT_TYPE_ARRAY);
                if (tmp_value) {
                        if ((dev_info->manufacturer_data_len == 0) ||
                                        dev_info->manufacturer_data_len != g_variant_get_size(tmp_value)) {
@@ -796,17 +793,17 @@ static void __bt_bond_device_cb(GDBusProxy *proxy, GAsyncResult *res,
                        result == BLUETOOTH_ERROR_AUTHENTICATION_FAILED ||
                        result == BLUETOOTH_ERROR_TIMEOUT ||
                        result == BLUETOOTH_ERROR_HOST_DOWN) {
-               if (TIZEN_PROFILE_WEARABLE) {
-                       int is_sw_running = 0;
+#ifdef TIZEN_PROFILE_WEARABLE
+               int is_sw_running = 0;
 
-                       if (vconf_get_int(VCONFKEY_SETUP_WIZARD_STATE, &is_sw_running))
-                               BT_ERR("vconf_get_int for setup wizard state failed");
+               if (vconf_get_int(VCONFKEY_SETUP_WIZARD_STATE, &is_sw_running))
+                       BT_ERR("vconf_get_int for setup wizard state failed");
 
-                       if (!is_sw_running)
-                               __bt_launch_unable_to_pairing_syspopup(result);
-                       else
-                               BT_ERR("Unable to pair");
-               }
+               if (!is_sw_running)
+                       __bt_launch_unable_to_pairing_syspopup(result);
+               else
+                       BT_ERR("Unable to pair");
+#endif
                bonding_info->result = result;
        }
 
@@ -1573,7 +1570,6 @@ int _bt_is_gatt_connected(bluetooth_device_address_t *device_address,
        GDBusProxy *device_proxy;
        GError *error = NULL;
        GVariant *value;
-       GVariant *tmp_value;
        GDBusConnection *conn;
        GVariant *result = NULL;
        int ret = BLUETOOTH_ERROR_NONE;
@@ -1594,8 +1590,9 @@ int _bt_is_gatt_connected(bluetooth_device_address_t *device_address,
        g_free(object_path);
        retv_if(device_proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-       result = g_dbus_proxy_call_sync(device_proxy, "GetAll",
-                       g_variant_new("(s)", BT_DEVICE_INTERFACE),
+       result = g_dbus_proxy_call_sync(device_proxy, "Get",
+                       g_variant_new("(ss)", BT_DEVICE_INTERFACE,
+                               "GattConnected"),
                        G_DBUS_CALL_FLAGS_NONE,
                        -1,
                        NULL,
@@ -1609,21 +1606,12 @@ int _bt_is_gatt_connected(bluetooth_device_address_t *device_address,
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
-       g_variant_get(result , "(@a{sv})", &value);
+       g_variant_get(result, "(v)", &value);
+       *is_connected = g_variant_get_boolean(value);
        g_variant_unref(result);
 
-       tmp_value = g_variant_lookup_value(value, "GattConnected", G_VARIANT_TYPE_BOOLEAN);
-       if (tmp_value == NULL) {
-               g_object_unref(device_proxy);
-               g_variant_unref(value);
-               return BLUETOOTH_ERROR_INTERNAL;
-       }
-
-       *is_connected = g_variant_get_boolean(tmp_value);
-
        BT_DBG("gatt is connected : %d", *is_connected);
 
-       g_variant_unref(tmp_value);
        g_variant_unref(value);
        g_object_unref(device_proxy);
 
@@ -1723,12 +1711,8 @@ int _bt_is_device_connected(bluetooth_device_address_t *device_address,
                BT_DBG("uuid %s [%s]", uuid, _bt_convert_uuid_to_string(uuid));
 
                object_path = _bt_get_device_object_path(address);
-               if (!object_path) {
-                       BT_ERR("object_path is NULL");
-                       g_free(uuid);
-                       return BLUETOOTH_ERROR_NOT_PAIRED;
-               }
-
+               retv_if(object_path == NULL, BLUETOOTH_ERROR_NOT_PAIRED);
+               BT_DBG("object_path: %s", object_path);
                device_proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
                                                                        NULL, BT_BLUEZ_NAME,
                                                                        object_path, BT_DEVICE_INTERFACE,  NULL, NULL);
@@ -1777,7 +1761,6 @@ int _bt_get_connected_link(bluetooth_device_address_t *device_address,
        GDBusProxy *device_proxy;
        GError *error = NULL;
        GDBusConnection *conn;
-       GVariant *tmp_value = NULL;
        GVariant *value = NULL;
        GVariant *result = NULL;
 
@@ -1800,33 +1783,24 @@ int _bt_get_connected_link(bluetooth_device_address_t *device_address,
                return BLUETOOTH_ERROR_NONE;
        }
 
-       result = g_dbus_proxy_call_sync(device_proxy, "GetAll",
-                                       g_variant_new("(s)", BT_DEVICE_INTERFACE),
-                                       G_DBUS_CALL_FLAGS_NONE,
-                                       -1,
-                                       NULL,
-                                       &error);
+       result = g_dbus_proxy_call_sync(device_proxy, "Get",
+                       g_variant_new("(ss)", BT_DEVICE_INTERFACE, "Connected"),
+                       G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
 
        if (error != NULL) {
                BT_ERR("Error occured in Proxy call [%s]\n", error->message);
                g_error_free(error);
                g_object_unref(device_proxy);
                return BLUETOOTH_ERROR_INTERNAL;
+       } else {
+               g_variant_get(result, "(v)", &value);
+               *connected = g_variant_get_byte(value);
+               g_variant_unref(value);
+               g_variant_unref(result);
        }
 
-       g_variant_get(result , "(@a{sv})", &value);
-       g_variant_unref(result);
-
-       tmp_value = g_variant_lookup_value(value, "Connected", G_VARIANT_TYPE_BYTE);
-       if (tmp_value != NULL) {
-               *connected = g_variant_get_byte(tmp_value);
-               g_variant_unref(tmp_value);
-               g_object_unref(device_proxy);
-               return BLUETOOTH_ERROR_NONE;
-       } else  {
-               BT_ERR("g_variant value is NULL");
-               return BLUETOOTH_ERROR_INTERNAL;
-       }
+       g_object_unref(device_proxy);
+       return BLUETOOTH_ERROR_NONE;
 }
 
 static void __le_connection_req_cb(GDBusProxy *proxy, GAsyncResult *res,
@@ -2116,17 +2090,8 @@ int _bt_connect_le_ipsp_device(const bluetooth_device_address_t *bd_addr)
                g_object_unref(device_proxy);
                return BLUETOOTH_ERROR_INTERNAL;
        }
-       g_object_unref(device_proxy);
-
-       /* IPSP daemon launch */
-       GDBusProxy *ipsp_proxy;
 
-       ipsp_proxy = _bt_get_ipsp_proxy();
-       retv_if(ipsp_proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
-
-       g_dbus_proxy_call(ipsp_proxy, "EnableIpsp",
-                       NULL, G_DBUS_CALL_FLAGS_NONE,
-                       -1, NULL, NULL, NULL);
+       g_object_unref(device_proxy);
 
        return ret;
 }
@@ -2240,47 +2205,6 @@ int _bt_connect_profile(char *address, char *uuid,
        return BLUETOOTH_ERROR_NONE;
 }
 
-int _bt_disconnect_all(char *address)
-{
-       int ret = BLUETOOTH_ERROR_NONE;
-       char *object_path;
-       GDBusProxy *proxy;
-       GDBusConnection *conn;
-       GVariant *result = NULL;
-       GError *err = NULL;
-
-       BT_DBG("");
-       conn = _bt_gdbus_get_system_gconn();
-       retv_if(conn == 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(conn, G_DBUS_PROXY_FLAGS_NONE,
-                                       NULL, BT_BLUEZ_NAME,
-                                       object_path, BT_DEVICE_INTERFACE,  NULL, NULL);
-       g_free(object_path);
-       retv_if(proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
-
-       result = g_dbus_proxy_call_sync(proxy, "Disconnect",
-               NULL,
-               G_DBUS_CALL_FLAGS_NONE,
-               -1, NULL,
-               &err);
-
-       if (err != NULL) {
-               BT_ERR("Dbus Call Error:[%s]", err->message);
-               g_error_free(err);
-               ret = BLUETOOTH_ERROR_INTERNAL;
-       }
-
-       g_object_unref(proxy);
-       if (result)
-               g_variant_unref(result);
-
-       return ret;
-}
-
 int _bt_disconnect_profile(char *address, char *uuid,
                                                void *cb, gpointer func_data)
 {
@@ -3101,6 +3025,12 @@ int _bt_request_att_mtu(int request_id, bluetooth_device_address_t *device_addre
        g_free(device_path);
        retv_if(device_proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
 
+       if (device_path == NULL) {
+               BT_DBG("device_path NULL");
+               ret = BLUETOOTH_ERROR_INTERNAL;
+               goto fail;
+       }
+
        att_mtu_req_info = g_malloc0(sizeof(bt_funcion_data_t));
        att_mtu_req_info->addr = (char *)g_strdup(address);
        att_mtu_req_info->req_id = request_id;
@@ -3113,7 +3043,7 @@ int _bt_request_att_mtu(int request_id, bluetooth_device_address_t *device_addre
                                NULL,
                                (GAsyncReadyCallback)__bt_request_att_mtu_device_cb,
                                NULL);
-
+fail:
        return ret;
 }
 
@@ -3126,10 +3056,8 @@ int _bt_get_att_mtu(bluetooth_device_address_t *device_address,
        GDBusProxy *device_proxy;
        GError *error = NULL;
        GVariant *value;
-       GVariant *tmp_value;
        GDBusConnection *conn;
        GVariant *result = NULL;
-       int ret = BLUETOOTH_ERROR_NONE;
 
        BT_CHECK_PARAMETER(device_address, return);
 
@@ -3147,40 +3075,24 @@ int _bt_get_att_mtu(bluetooth_device_address_t *device_address,
        g_free(object_path);
        retv_if(device_proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-       result = g_dbus_proxy_call_sync(device_proxy, "GetAll",
-                       g_variant_new("(s)", BT_DEVICE_INTERFACE),
-                       G_DBUS_CALL_FLAGS_NONE,
-                       -1,
-                       NULL,
-                       &error);
-       if (result == NULL) {
-               if (error != NULL) {
-                       BT_ERR("Error occured in Proxy call [%s]\n", error->message);
-                       g_error_free(error);
-               }
+       result = g_dbus_proxy_call_sync(device_proxy, "Get",
+                       g_variant_new("(ss)", BT_DEVICE_INTERFACE, "AttMtu"),
+                       G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+       if (error) {
+               ERR("DBus Error : %s", error->message);
+               g_clear_error(&error);
                g_object_unref(device_proxy);
                return BLUETOOTH_ERROR_INTERNAL;
-       }
-
-       g_variant_get(result , "(@a{sv})", &value);
-       g_variant_unref(result);
-
-       tmp_value = g_variant_lookup_value(value, "AttMtu", G_VARIANT_TYPE_UINT16);
-       if (tmp_value == NULL) {
-               g_object_unref(device_proxy);
+       } else {
+               g_variant_get(result, "(v)", &value);
+               *mtu = g_variant_get_uint16(value);
+               BT_DBG("ATT MTU : %d", *mtu);
                g_variant_unref(value);
-               return BLUETOOTH_ERROR_INTERNAL;
+               g_variant_unref(result);
        }
 
-       *mtu = g_variant_get_uint16(tmp_value);
-
-       BT_DBG("ATT MTU : %d", *mtu);
-
-       g_variant_unref(tmp_value);
-       g_variant_unref(value);
        g_object_unref(device_proxy);
-
-       return ret;
+       return BLUETOOTH_ERROR_NONE;
 }
 
 int _bt_get_device_ida(bluetooth_device_address_t *device_address,
@@ -3224,7 +3136,7 @@ int _bt_get_device_ida(bluetooth_device_address_t *device_address,
        if (result == NULL) {
                BT_ERR("Failed to get device ID address");
                if (error != NULL) {
-                       BT_ERR("Error occured in Proxy call [%s]\n", error->message);
+                       BT_ERR("Error occured in Proxy call [%s]", error->message);
                        g_error_free(error);
                }
                g_object_unref(device_proxy);