Implement interface to set advertise Tx power level

[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 3fa19cb..358bb26 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
@@ -231,8 +232,7 @@ static gboolean __bt_is_sync_function(int service_function)
                        || service_function == BT_GATT_WATCH_CHARACTERISTIC
                        || service_function == BT_GATT_ACQUIRE_WRITE
 #endif
-                       || service_function == BT_AUDIO_SELECT_ROLE
-                       || service_function == BT_OBEX_SERVER_ACCEPT_CONNECTION)
+                       || service_function == BT_AUDIO_SELECT_ROLE)
                return TRUE;
        else
                return FALSE;
@@ -1312,6 +1312,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 +1338,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");
 
@@ -1614,6 +1633,17 @@ int __bt_bluez_request(int function_name,
                result = _bt_avrcp_control_cmd(key_code);
                break;
        }
+       case BT_AVRCP_HANDLE_CONTROL_TO_DEST: {
+               int key_code;
+               bluetooth_device_address_t address = { { 0 } };
+
+               __bt_service_get_parameters(in_param1, &key_code, sizeof(int));
+               __bt_service_get_parameters(in_param2,
+                                               &address, sizeof(bluetooth_device_address_t));
+
+               result = _bt_avrcp_control_cmd_to_dest(key_code, &address);
+               break;
+       }
        case BT_AVRCP_CONTROL_SET_PROPERTY: {
                int type;
                unsigned int value;
@@ -1992,9 +2022,9 @@ int __bt_bluez_request(int function_name,
                __bt_service_get_parameters(in_param4, &use_reserved_slot,
                                sizeof(gboolean));
 
-               BT_DBG("bluetooth_advertising_params_t [%f %f %d %d]",
+               BT_DBG("bluetooth_advertising_params_t [%f %f %d %d %d]",
                                adv_params.interval_min, adv_params.interval_max,
-                               adv_params.filter_policy, adv_params.type);
+                               adv_params.filter_policy, adv_params.type, adv_params.tx_power_level);
                result = _bt_set_custom_advertising(app, *adv_handle,
                                enable, &adv_params, use_reserved_slot);
                if (result != BLUETOOTH_ERROR_NONE) {
@@ -2958,7 +2988,7 @@ int __bt_obexd_request(int function_name,
                BT_DBG("BT_OPP_PUSH_FILES");
                int i;
                bluetooth_device_address_t address = { {0} };
-               bt_file_path_t path;
+               bt_file_path_t *path;
                char **file_path;
                int file_count;
                GArray *param2;
@@ -2974,8 +3004,8 @@ int __bt_obexd_request(int function_name,
                __bt_fill_garray_from_variant(in_param2, param2);
 
                for (i = 0; i < file_count; i++) {
-                       path = g_array_index(param2, bt_file_path_t, i);
-                       file_path[i] = g_strdup(path.path);
+                       path = &g_array_index(param2, bt_file_path_t, i);
+                       file_path[i] = g_strdup(path->path);
                }
                BT_DBG("_bt_opp_client_push_files");
                result = _bt_opp_client_push_files(request_id, context,
@@ -3409,7 +3439,7 @@ int __bt_core_request(int function_name,
        case BT_ENABLE_ADAPTER:
        {
                bt_status_t status;
-
+               set_adapter_request_state(TRUE);
                status = _bt_adapter_get_status();
 
                if (status == BT_ACTIVATING) {
@@ -3420,10 +3450,6 @@ int __bt_core_request(int function_name,
                        result = BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED;
                } else {
                        _bt_adapter_set_status(BT_ACTIVATING);
-
-#if TODO_40 /* Need to add this function */
-                       _bt_adapter_start_enable_timer();
-#endif
                        result = BLUETOOTH_ERROR_NONE;
                }
 
@@ -3432,7 +3458,7 @@ int __bt_core_request(int function_name,
        case BT_DISABLE_ADAPTER:
        {
                bt_status_t status;
-
+               set_le_request_state(TRUE);
                status = _bt_adapter_get_status();
                if (status == BT_DEACTIVATING) {
                                BT_DBG("Disabling in progress");
@@ -3460,10 +3486,6 @@ int __bt_core_request(int function_name,
                        result = BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED;
                } else {
                        _bt_adapter_set_le_status(BT_LE_ACTIVATING);
-
-#if TODO_40 /* Need to add this function */
-                       _bt_adapter_start_le_enable_timer();
-#endif
                        result = BLUETOOTH_ERROR_NONE;
                }
 
@@ -3551,6 +3573,7 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_CANCEL_DISCOVERY:
        case BT_OOB_ADD_REMOTE_DATA:
        case BT_OOB_REMOVE_REMOTE_DATA:
+       case BT_OOB_READ_LOCAL_DATA:
        case BT_SET_ADVERTISING:
        case BT_SET_CUSTOM_ADVERTISING:
        case BT_SET_ADVERTISING_PARAMETERS:
@@ -3713,6 +3736,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:
@@ -3721,6 +3745,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);
 
@@ -3767,7 +3793,7 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_AVRCP_CONTROL_GET_PROPERTY:
        case BT_AVRCP_GET_TRACK_INFO:
        case BT_AVRCP_TRANSPORT_SET_PROPERTY:
-
+       case BT_AVRCP_HANDLE_CONTROL_TO_DEST:
 
        case BT_SET_CONTENT_PROTECT:
        case BT_BOND_DEVICE_BY_TYPE:
@@ -3775,15 +3801,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:
@@ -3859,7 +3882,6 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_GET_PROFILE_TRUSTED:
        case BT_GET_SPEAKER_GAIN:
        case BT_SET_SPEAKER_GAIN:
-       case BT_OOB_READ_LOCAL_DATA:
        case BT_RFCOMM_CLIENT_IS_CONNECTED:
        case BT_RFCOMM_IS_UUID_AVAILABLE:
        case BT_GET_ADVERTISING_DATA:
@@ -3871,6 +3893,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: