Fix the issue on AppControl share (BT) operation

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

diff --git a/bt-api/bt-gatt-service.c b/bt-api/bt-gatt-service.c
index 4b13102..60c58ff 100644 (file)
--- a/bt-api/bt-gatt-service.c
+++ b/bt-api/bt-gatt-service.c
@@ -343,18 +343,27 @@ static struct gatt_desc_info *__bt_gatt_find_gatt_desc_info(
 static struct gatt_req_info *__bt_gatt_find_request_info(guint request_id);
 static int __bt_gatt_unregister_service(struct gatt_service_info *svc_info);
 
-static int bluetooth_get_characteristic_fd(int att_handle , char *path)
+static int bluetooth_get_characteristic_fd(int att_handle , char *address)
 {
        GSList *l;
 
-       BT_DBG("request found  path [%s] att_handle [ %d]", path, att_handle);
+       BT_DBG("Find FD for address [%s] att_handle [ %d]", address, att_handle);
+
+       /* Check for NULL address */
+       if (g_strcmp0(address, "00:00:00:00:00:00") != 0) {
+               BT_INFO("Unicast address: Use DBUS send indication");
+               return -1;
+       }
+
        for (l = gatt_characteristic_server_notify_list; l != NULL; l = l->next) {
                bluetooth_gatt_acquire_notify_info_t *info = l->data;
 
-               if (info->att_hand == att_handle)
+               if (info->att_hand == att_handle) {
+                       BT_INFO("ATT handle Matched: AquireNotify Set: Remote addr[%s]", info->address);
                        return info->write_fd;
+               }
        }
-       return -1;
+       return -2;
 }
 
 static bluetooth_gatt_acquire_notify_info_t * bluetooth_get_characteristic_info_from_path(int att_handle)
@@ -2689,41 +2698,6 @@ BT_EXPORT_API int bluetooth_gatt_server_set_notification(const char *char_path,
        return err;
 }
 
-
-#if 0
-BT_EXPORT_API int bluetooth_gatt_register_application(int instance_id)
-{
-       BT_INIT_PARAMS();
-
-       if (!is_server_started) {
-
-               if (_bt_check_privilege(BT_CHECK_PRIVILEGE, BT_GATT_REGISTER_APPLICATION)
-                               == BLUETOOTH_ERROR_PERMISSION_DEINED) {
-                       BT_ERR("Don't have aprivilege to use this API");
-                       return BLUETOOTH_ERROR_PERMISSION_DEINED;
-               }
-
-               BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
-               g_array_append_vals(in_param1, &instance_id, sizeof(int));
-
-               ret = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_REGISTER_APPLICATION,
-                               in_param1, in_param2, in_param3, in_param4, &out_param);
-               BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
-
-               if (ret != BLUETOOTH_ERROR_NONE) {
-                       BT_ERR("Register application failed");
-                       return ret;
-               }
-               is_server_started = true;
-
-               return BLUETOOTH_ERROR_NONE;
-       }
-
-       BT_INFO("Already RegisterApplication");
-       return BLUETOOTH_ERROR_NONE;
-}
-#endif
-
 BT_EXPORT_API int bluetooth_gatt_server_init(int *instance_id, gatt_server_cb_func_ptr callback_ptr,
                                                void *user_data)
 {
@@ -2946,12 +2920,18 @@ BT_EXPORT_API int bluetooth_gatt_server_send_indication(bluetooth_device_address
        g_array_append_vals(in_param3, addr_hex, sizeof(bluetooth_device_address_t));
 
        _bt_convert_addr_type_to_string(addr, addr_hex->addr);
+       BT_INFO("Send Indication to address [%s]", addr);
        fd =  bluetooth_get_characteristic_fd(param->atrribute_handle, addr);
 
        if (fd > -1) {
+               BT_INFO("Send Multicast");
                result  = bluetooth_gatt_write_characteristics_value_to_fd_(fd, att_value->data, att_value->length, NULL);
                param->fd = fd;
-       } else {
+       } else if (fd == -2) {
+               BT_ERR("Acquire Notify FD not found for charatcristic handle");
+               BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+               return BLUETOOTH_ERROR_INVALID_PARAM;
+       } else if (fd == -1) {
                result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GATT_SERVER_SEND_INDICATION,
                                in_param1, in_param2, in_param3, in_param4, &out_param);
        }
@@ -3120,22 +3100,12 @@ static gboolean bluetooth_gatt_server_acquire_channel_write_cb(GIOChannel *gio,
                        } else {
                                BT_ERR("eventinfo failed");
                        }
-
-
                }
                g_free(buffer);
 
                return TRUE;
        }
 
-       if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR)) {
-               BT_ERR("Error : GIOCondition %d, ]", cond);
-               g_io_channel_shutdown(gio, TRUE, NULL);
-               g_io_channel_unref(gio);
-
-               return FALSE;
-       }
-
        return TRUE;
 }
 
@@ -3271,13 +3241,17 @@ void  bluetooth_gatt_server_send_acquire_notify_response(GVariant * parameters,
 
        chr_info = bluetooth_get_characteristic_info_from_path(att_han);
        if (!chr_info) {
+               BT_INFO("char info not found for ATT handle [%u]", att_han);
                chr_info = g_malloc0(sizeof(bluetooth_gatt_acquire_notify_info_t));
                chr_info->write_fd = fd;
                chr_info->att_hand = att_han;
+               memcpy(chr_info->address, address, BLUETOOTH_ADDRESS_STRING_LENGTH);
 
                gatt_characteristic_server_notify_list = g_slist_append(gatt_characteristic_server_notify_list, chr_info);
-       } else
+       } else {
+               BT_INFO("Already AcquireNotify Set for this attribute handle by remote Client [%s]", chr_info->address);
                chr_info->write_fd = fd;
+       }
 
        channel = g_io_channel_unix_new(fd);
        chr_info->io_channel = channel;