Redesign HID register / unregister code

Change-Id: I26f082749802a082bfb446e18a0a7c5600c8b042
Signed-off-by: Deokhyun Kim <dukan.kim@samsung.com>

diff --git a/bt-api/bt-hid-device.c b/bt-api/bt-hid-device.c
index 76ed6d0..1c51f7a 100644 (file)
--- a/bt-api/bt-hid-device.c
+++ b/bt-api/bt-hid-device.c
@@ -57,13 +57,9 @@
 #define BT_HID_HSHK_ERR_UNKNOWN        0x0E
 #define BT_HID_HSHK_ERR_FATAL  0x0F
 
-typedef struct {
-       guint object_id;
-       gchar *path;
-       int id;
-       char *uuid;
-       GSList *device_list;
-} hid_info_t;
+#define BT_HID_SERVICE_NAME "org.bluez.hid_agent"
+#define BT_HID_AGENT_OBJECT_PATH "/org/bluez/hid_agent"
+#define BT_HID_SERVICE_INTERFACE "org.tizen.HidApp"
 
 typedef struct {
        int ctrl_fd;
@@ -81,7 +77,7 @@ struct reports {
        guint8 rep_data[20];
 } __attribute__((__packed__));
 
-static hid_info_t *hid_info = NULL;
+static GSList *device_list;
 
 /* Variable for privilege, only for write API,
   before we should reduce time to bt-service dbus calling
@@ -156,11 +152,36 @@ int _bt_hid_device_get_fd(const char *address, int *ctrl, int *intr)
        return ret;
 }
 
+static GVariant* __bt_hid_agent_dbus_send(const char *path,
+                               const char *interface,  const char *method,
+                               GError **err, GVariant *parameters)
+{
+       GVariant *reply = NULL;
+       GDBusProxy *proxy = NULL;
+       GDBusConnection *conn = NULL;
+
+       conn = _bt_gdbus_get_system_gconn();
+       retv_if(conn == NULL, NULL);
+
+       proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
+               NULL, BT_HID_SERVICE_NAME, path, interface, NULL, err);
+       if (proxy == NULL) {
+               BT_ERR("Unable to allocate new proxy");
+               return NULL;
+       }
+
+       reply = g_dbus_proxy_call_sync(proxy, method, parameters,
+                               G_DBUS_CALL_FLAGS_NONE, -1, NULL, err);
+
+       g_object_unref(proxy);
+       return reply;
+}
+
 static hid_connected_device_info_t *__find_hid_info_with_address(const char *remote_addr)
 {
        GSList *l;
 
-       for (l = hid_info->device_list; l != NULL; l = l->next) {
+       for (l = device_list; l != NULL; l = l->next) {
                hid_connected_device_info_t *info = l->data;
                if (g_strcmp0((const char *)info->address, (const char *)remote_addr) == 0)
                        return info;
@@ -245,7 +266,7 @@ static gboolean __hid_disconnect(hid_connected_device_info_t *info)
        bt_event_info_t *event_info;
 
        BT_INFO_C("Disconnected [HID Device]");
-       hid_info->device_list = g_slist_remove(hid_info->device_list, info);
+       device_list = g_slist_remove(device_list, info);
        if (info->ctrl_data_id > 0) {
                g_source_remove(info->ctrl_data_id);
                info->ctrl_data_id = 0;
@@ -290,29 +311,6 @@ static gboolean __hid_disconnect(hid_connected_device_info_t *info)
        return FALSE;
 }
 
-void __free_hid_info(hid_info_t *info)
-{
-       BT_DBG("");
-
-       _bt_unregister_gdbus(info->object_id);
-
-       while (info->device_list) {
-               hid_connected_device_info_t *dev_info = NULL;
-               dev_info = (hid_connected_device_info_t *)info->device_list->data;
-
-               if (dev_info->disconnect_idle_id > 0) {
-                       BT_INFO("Disconnect idle still not process remove source");
-                       g_source_remove(dev_info->disconnect_idle_id);
-                       dev_info->disconnect_idle_id = 0;
-               }
-               __hid_disconnect(dev_info);
-       }
-
-       g_free(info->path);
-       g_free(info->uuid);
-       g_free(info);
-}
-
 static gboolean __is_error_by_disconnect(GError *err)
 {
        return !g_strcmp0(err->message, "Connection reset by peer") ||
@@ -519,13 +517,9 @@ static gboolean __received_cb(GIOChannel *chan, GIOCondition cond,
 
 int new_hid_connection(const char *path, int fd, bluetooth_device_address_t *addr)
 {
-       hid_info_t *info = NULL;
        hid_connected_device_info_t *dev_info = NULL;
        char address[18];
-       info = hid_info;
 
-       if (info == NULL)
-               return -1;
        _bt_convert_addr_type_to_string((char *)address, addr->addr);
        BT_INFO("Address [%s]", address);
        dev_info = __find_hid_info_with_address(address);
@@ -544,7 +538,7 @@ int new_hid_connection(const char *path, int fd, bluetooth_device_address_t *add
                dev_info->intr_data_id = g_io_add_watch(dev_info->intr_data_io,
                                G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
                                __received_cb, dev_info);
-               hid_info->device_list = g_slist_append(hid_info->device_list, dev_info);
+               device_list = g_slist_append(device_list, dev_info);
        } else {
                dev_info->ctrl_fd = fd;
                dev_info->ctrl_data_io = g_io_channel_unix_new(dev_info->ctrl_fd);
@@ -561,35 +555,26 @@ int new_hid_connection(const char *path, int fd, bluetooth_device_address_t *add
 
        return 0;
 }
-static hid_info_t *__register_method()
-{
-       int object_id;
-       hid_info_t *info = NULL;
-       char *path = NULL;
-       path = g_strdup_printf("/org/socket/server/%d", getpid());
 
-       object_id = _bt_register_new_conn(path, new_hid_connection);
-       if (object_id < 0)
-               return NULL;
+static void __free_hid_info(void *data)
+{
+       BT_DBG("");
 
-       info = g_new(hid_info_t, 1);
-       info->object_id = (guint)object_id;
-       info->path = path;
-       info->id = 0;
-       info->device_list = NULL;
+       hid_connected_device_info_t *dev_info = (hid_connected_device_info_t *)data;
 
-       return info;
+       if (dev_info->disconnect_idle_id > 0) {
+               BT_INFO("Disconnect idle still not process remove source");
+               g_source_remove(dev_info->disconnect_idle_id);
+               dev_info->disconnect_idle_id = 0;
+       }
+       __hid_disconnect(dev_info);
 }
 
 void _bluetooth_hid_free_hid_info(void)
 {
-       if (hid_info == NULL) {
-               BT_DBG("hid_info is already NULL");
-               return;
-       }
+       g_slist_free_full(device_list, __free_hid_info);
 
-       __free_hid_info(hid_info);
-       hid_info = NULL;
+       device_list = NULL;
 }
 
 BT_EXPORT_API int bluetooth_hid_device_init(hid_cb_func_ptr callback_ptr, void *user_data)
@@ -629,8 +614,8 @@ BT_EXPORT_API int bluetooth_hid_device_deinit(void)
 
 BT_EXPORT_API int bluetooth_hid_device_activate(void)
 {
-       bt_register_profile_info_t profile_info;
-       int result = BLUETOOTH_ERROR_NONE;
+       GVariant *reply;
+       GError *err = NULL;
 
        BT_CHECK_ENABLED(return);
 
@@ -640,30 +625,34 @@ BT_EXPORT_API int bluetooth_hid_device_activate(void)
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-       if (hid_info != NULL)
-               return BLUETOOTH_ERROR_IN_PROGRESS;
+       reply = __bt_hid_agent_dbus_send(BT_HID_AGENT_OBJECT_PATH,
+                       BT_HID_SERVICE_INTERFACE,
+                       "RegisterApplication", &err, NULL);
 
-       hid_info = __register_method();
-       if (hid_info == NULL)
-               return BLUETOOTH_ERROR_INTERNAL;
-
-       hid_info->uuid = g_strdup(HID_DEVICE_UUID);
-
-       profile_info.authentication = TRUE;
-       profile_info.authorization = TRUE;
-       profile_info.obj_path = hid_info->path;
-       profile_info.role = "Hid";
-       profile_info.service = hid_info->uuid;
-       profile_info.uuid = hid_info->uuid;
+       if (!reply) {
+               int ret = BLUETOOTH_ERROR_INTERNAL;
+               BT_ERR("Error returned in method call");
+               if (err) {
+                       BT_ERR("Error = %s", err->message);
+                       if (strcmp(err->message, BT_ERROR_ALREADY_EXIST) == 0)
+                               ret = BLUETOOTH_ERROR_IN_PROGRESS;
+                       else
+                               ret = BLUETOOTH_ERROR_INTERNAL;
+                       g_clear_error(&err);
+               }
+               return ret;
+       }
 
-       BT_INFO("uuid %s", profile_info.uuid);
-       result = _bt_register_profile(&profile_info, FALSE);
+       g_variant_unref(reply);
 
-       return result;
+       return BLUETOOTH_ERROR_NONE;
 }
 
 BT_EXPORT_API int bluetooth_hid_device_deactivate(void)
 {
+       GVariant *reply;
+       GError *err = NULL;
+
        BT_CHECK_ENABLED(return);
 
        if (_bt_check_privilege(BT_CHECK_PRIVILEGE, BT_HID_DEVICE_DEACTIVATE)
@@ -672,10 +661,25 @@ BT_EXPORT_API int bluetooth_hid_device_deactivate(void)
                return BLUETOOTH_ERROR_PERMISSION_DEINED;
        }
 
-       if (hid_info == NULL)
-               return BLUETOOTH_ERROR_NOT_IN_OPERATION;
+       reply = __bt_hid_agent_dbus_send(BT_HID_AGENT_OBJECT_PATH,
+                       BT_HID_SERVICE_INTERFACE,
+                       "UnregisterApplication", &err, NULL);
+
+       if (!reply) {
+               int ret = BLUETOOTH_ERROR_INTERNAL;
+               BT_ERR("Error returned in method call");
+               if (err) {
+                       BT_ERR("Error = %s", err->message);
+                       if (strcmp(err->message, BT_ERROR_NOT_AVAILABLE) == 0)
+                               ret = BLUETOOTH_ERROR_NOT_IN_OPERATION;
+                       else
+                               ret = BLUETOOTH_ERROR_INTERNAL;
+                       g_clear_error(&err);
+               }
+               return ret;
+       }
 
-       _bt_unregister_profile(hid_info->path);
+       g_variant_unref(reply);
 
        _bluetooth_hid_free_hid_info();
 

diff --git a/bt-api/include/bt-common.h b/bt-api/include/bt-common.h
index c4cc514..989164e 100644 (file)
--- a/bt-api/include/bt-common.h
+++ b/bt-api/include/bt-common.h
@@ -209,6 +209,21 @@ extern "C" {
 
 #define BT_AGENT_INTERFACE "org.bluez.Agent1"
 
+#define BT_ERROR_INTERNAL "InternalError"
+#define BT_ERROR_NOT_AVAILABLE "NotAvailable"
+#define BT_ERROR_NOT_CONNECTED "NotConnected"
+#define BT_ERROR_NOT_CONNECTION_FAILED "ConnectionFailed"
+#define BT_ERROR_BUSY "InProgress"
+#define BT_ERROR_INVALID_PARAM "InvalidArguments"
+#define BT_ERROR_ALREADY_EXIST "AlreadyExists"
+#define BT_ERROR_ALREADY_CONNECTED "Already Connected"
+#define BT_ERROR_NO_MEMORY "No memory"
+#define BT_ERROR_NO_DATA "No data"
+#define BT_ERROR_I_O_ERROR "I/O error"
+#define BT_ERROR_OPERATION_NOT_AVAILABLE "Operation currently not available"
+#define BT_ERROR_OPERATION_NOT_ALLOWED "Operation not allowed"
+#define BT_ERROR_OPERATION_NOT_SUPPORTED "Operation not supported"
+#define BT_ERROR_INVALID_FILE_DESCRIPTOR "Invalid File Descriptor"
 
 #define BT_MAX_USER_INFO 5
 #define RFKILL_EVENT_SIZE 8