Correct the privilege check logic for MTU size APIs

[platform/core/connectivity/bluetooth-frwk.git] / bt-service-adaptation / services / bt-request-handler.c

diff --git a/bt-service-adaptation/services/bt-request-handler.c b/bt-service-adaptation/services/bt-request-handler.c
index a5ad048..e369320 100644 (file)
--- a/bt-service-adaptation/services/bt-request-handler.c
+++ b/bt-service-adaptation/services/bt-request-handler.c
@@ -203,6 +203,7 @@ static gboolean __bt_is_sync_function(int service_function)
                        || service_function == BT_GET_IS_ALIAS_SET
                        || service_function == BT_GET_CONNECTED_LINK_TYPE
                        || service_function == BT_IS_SERVICE_USED
+                       || service_function == BT_RFCOMM_LISTEN_AND_ACCEPT
                        || service_function == BT_RFCOMM_LISTEN
                        || service_function == BT_HDP_REGISTER_SINK_APP
                        || service_function == BT_HDP_UNREGISTER_SINK_APP
@@ -1312,6 +1313,25 @@ int __bt_bluez_request(int function_name,
                result = BLUETOOTH_ERROR_NONE;
                break;
        }
+       case BT_RFCOMM_LISTEN_AND_ACCEPT: {
+               char *uuid;
+               int socket_fd = -1;
+
+               sender = (char *)g_dbus_method_invocation_get_sender(context);
+               uuid = (char *)g_variant_get_data(in_param1);
+
+               result = _bt_rfcomm_socket_listen(sender, uuid, true);
+               if (result > 0) {
+                       BT_ERR("BT_RFCOMM_LISTEN_AND_ACCEPT success, save context");
+
+                       result = BLUETOOTH_ERROR_NONE;
+                       _bt_save_invocation_context(context,
+                                       result, sender, function_name, NULL);
+               } else {
+                       g_array_append_vals(*out_param1, &socket_fd, sizeof(int));
+               }
+               break;
+       }
        case BT_RFCOMM_LISTEN: {
                char *uuid;
                int socket_fd = -1;
@@ -1319,7 +1339,7 @@ int __bt_bluez_request(int function_name,
                sender = (char *)g_dbus_method_invocation_get_sender(context);
                uuid = (char *)g_variant_get_data(in_param1);
 
-               result = _bt_rfcomm_socket_listen(sender, uuid);
+               result = _bt_rfcomm_socket_listen(sender, uuid, false);
                if (result > 0) {
                        BT_ERR("BT_RFCOMM_LISTEN success, save context");
 
@@ -2446,6 +2466,7 @@ int __bt_bluez_request(int function_name,
                /* Add socket fd to unix_fd_list */
                fd_list = g_unix_fd_list_new();
                g_unix_fd_list_append(fd_list, fd, &error);
+               g_assert_no_error(error);
 
                _bt_service_method_return_with_unix_fd_list(
                                context, *out_param1, result, fd_list);
@@ -2705,6 +2726,10 @@ int __bt_bluez_request(int function_name,
                __bt_service_get_parameters(in_param4, &is_indicate,
                                sizeof(gboolean));
 
+#ifdef TIZEN_FEATURE_BT_GATT_CLIENT_FD_DISABLE
+               goto normal;
+#endif
+
                if (is_indicate == false) {
                        result   = _bt_gatt_acquire_notify(&param , &fd, &mtu);
                        if (BLUETOOTH_ERROR_NONE == result && fd > -1) {
@@ -3708,6 +3733,7 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_GATT_SERVER_UPDATE_VALUE:
        case BT_GATT_SERVER_DEREGISTER:
 #endif
+       case BT_REQ_ATT_MTU:
        case BT_PBAP_CONNECT:
        case BT_PBAP_DISCONNECT:
        case BT_PBAP_GET_PHONEBOOK_SIZE:
@@ -3716,6 +3742,8 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_PBAP_PULL_VCARD:
        case BT_PBAP_PHONEBOOK_SEARCH:
 
+       case BT_RFCOMM_LISTEN_AND_ACCEPT:
+
        ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds,
                                                BT_PRIVILEGE_PUBLIC);
 
@@ -3770,15 +3798,12 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_SET_LE_STATIC_RANDOM_ADDRESS:
        case BT_LE_CONN_UPDATE:
        case BT_UPDATE_LE_CONNECTION_MODE:
-       case BT_REQ_ATT_MTU:
        case BT_GET_DEVICE_IDA:
        case BT_LE_READ_MAXIMUM_DATA_LENGTH:
        case BT_LE_WRITE_HOST_SUGGESTED_DATA_LENGTH:
        case BT_LE_READ_HOST_SUGGESTED_DATA_LENGTH:
        case BT_LE_SET_DATA_LENGTH:
 
-       case BT_GET_ATT_MTU:
-
        case BT_LE_IPSP_INIT:
        case BT_LE_IPSP_DEINIT:
        case BT_LE_IPSP_CONNECT:
@@ -3866,6 +3891,7 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_UNREGISTER_SCAN_FILTER:
        case BT_UNREGISTER_ALL_SCAN_FILTERS:
        case BT_IS_SCAN_FILTER_SUPPORTED:
+       case BT_GET_ATT_MTU:
 
        case BT_OBEX_SERVER_ALLOCATE:
        case BT_OBEX_SERVER_DEALLOCATE: