Revert BT enable / disable calling method to async call

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

diff --git a/bt-service/bt-request-handler.c b/bt-service/bt-request-handler.c
index ca63020..18c99e0 100644 (file)
--- a/bt-service/bt-request-handler.c
+++ b/bt-service/bt-request-handler.c
@@ -70,7 +70,6 @@ static const gchar bt_service_introspection_xml[] =
 "      </interface>"
 "</node>";
 
-GDBusNodeInfo *node_info = NULL;
 static gboolean name_acquired = FALSE;
 
 static char *current_sender_playing = NULL;
@@ -473,7 +472,6 @@ int __bt_bluez_request(int function_name,
        case BT_REGISTER_SCAN_FILTER: {
                char *sender = NULL;
                bluetooth_le_scan_filter_t scan_filter;
-               int slot_id;
 
                sender = (char *)g_dbus_method_invocation_get_sender(context);
                __bt_service_get_parameters(in_param1, &scan_filter,
@@ -482,31 +480,7 @@ int __bt_bluez_request(int function_name,
                                scan_filter.added_features);
 
                result = _bt_register_scan_filter(sender,
-                               &scan_filter, &slot_id);
-
-               g_array_append_vals(*out_param1, &slot_id, sizeof(int));
-               break;
-       }
-       case BT_UNREGISTER_SCAN_FILTER:{
-               char *sender = NULL;
-               int slot_id;
-
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-               __bt_service_get_parameters(in_param1, &slot_id, sizeof(int));
-               BT_DBG("Remove scan filter [Slot ID : %d]", slot_id);
-
-               result = _bt_unregister_scan_filter(sender, slot_id);
-
-               break;
-       }
-       case BT_UNREGISTER_ALL_SCAN_FILTERS:{
-               char *sender = NULL;
-
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-
-               BT_DBG("Remove all scan filters [Sender : %s]", sender);
-
-               result = _bt_unregister_all_scan_filters(sender);
+                               &scan_filter);
 
                break;
        }
@@ -614,9 +588,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(sender, adv_handle,
                                enable, &adv_params, use_reserved_slot);
                break;
@@ -703,7 +677,15 @@ int __bt_bluez_request(int function_name,
                                scan_params.interval, scan_params.window,
                                scan_params.type);
 
-               result = _bt_set_scan_parameters(&scan_params);
+               result = _bt_prepare_scan_parameters(&scan_params, 0);
+               break;
+       }
+       case BT_SET_SCAN_TYPE: {
+               int scan_type = 0;
+               __bt_service_get_parameters(in_param1, &scan_type, sizeof(int));
+
+               BT_DBG("bluetooth_le_scan_type [%d]", scan_type);
+               result = _bt_prepare_scan_parameters(NULL, scan_type);
                break;
        }
        case BT_LE_CONN_UPDATE: {
@@ -812,6 +794,17 @@ int __bt_bluez_request(int function_name,
 
                break;
        }
+       case BT_DISCONNECT_DEVICE: {
+               bluetooth_device_address_t addr = { {0} };
+               char address[BLUETOOTH_ADDRESS_STRING_LENGTH + 1];
+
+               __bt_service_get_parameters(in_param1,
+                               &addr, sizeof(bluetooth_device_address_t));
+               _bt_convert_addr_type_to_string(address, addr.addr);
+
+               result = _bt_disconnect_all(address);
+               break;
+       }
        case BT_BOND_DEVICE: {
                bluetooth_device_address_t address = { {0} };
 
@@ -1308,6 +1301,33 @@ int __bt_bluez_request(int function_name,
 
                break;
        }
+       case BT_LE_OOB_READ_LOCAL_DATA: {
+               bt_oob_data_t local_oob_data;
+
+               memset(&local_oob_data, 0x00, sizeof(bt_oob_data_t));
+               result = _bt_le_oob_read_local_data(&local_oob_data);
+
+               g_array_append_vals(*out_param1, &local_oob_data,
+                               sizeof(bt_oob_data_t));
+
+               break;
+       }
+       case BT_LE_OOB_ADD_REMOTE_DATA: {
+               bluetooth_device_address_t address = { {0} };
+               unsigned short address_type;
+               bt_oob_data_t remote_oob_data;
+
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2,
+                               &address_type, sizeof(unsigned short));
+               __bt_service_get_parameters(in_param3,
+                               &remote_oob_data, sizeof(bt_oob_data_t));
+
+               result = _bt_oob_add_remote_data(&address, address_type, &remote_oob_data);
+
+               break;
+       }
        case BT_AVRCP_SET_TRACK_INFO: {
                media_metadata_t data;
                media_metadata_attributes_t meta_data;
@@ -2208,7 +2228,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;
@@ -2224,8 +2244,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,
@@ -2690,6 +2710,7 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_START_LE_DISCOVERY:
        case BT_STOP_LE_DISCOVERY:
        case BT_SET_SCAN_PARAMETERS:
+       case BT_SET_SCAN_TYPE:
 
        case BT_BOND_DEVICE:
        case BT_CANCEL_BONDING:
@@ -2813,6 +2834,7 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_GATT_REGISTER_SERVICE:
        case BT_GATT_SEND_RESPONSE:
 
+       case BT_REQ_ATT_MTU:
        case BT_PBAP_CONNECT:
        case BT_PBAP_DISCONNECT:
        case BT_PBAP_GET_PHONEBOOK_SIZE:
@@ -2858,6 +2880,7 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_SET_PASSKEY_NOTIFICATION:
        case BT_SET_PROFILE_RESTRICTED:
 
+       case BT_DISCONNECT_DEVICE:
        case BT_CANCEL_SEARCH_SERVICE:
        case BT_ENABLE_RSSI:
 
@@ -2880,15 +2903,14 @@ 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_ENABLE_FORCE_HCI_DUMP:
        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_OOB_READ_LOCAL_DATA:
+       case BT_LE_OOB_ADD_REMOTE_DATA:
 
        case BT_LE_IPSP_INIT:
        case BT_LE_IPSP_DEINIT:
@@ -2939,10 +2961,9 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_GET_SCAN_RESPONSE_DATA:
        case BT_IS_ADVERTISING:
        case BT_REGISTER_SCAN_FILTER:
-       case BT_UNREGISTER_SCAN_FILTER:
-       case BT_UNREGISTER_ALL_SCAN_FILTERS:
        case BT_IS_SCAN_FILTER_SUPPORTED:
        case BT_GET_PROFILE_RESTRICTED:
+       case BT_GET_ATT_MTU:
 
        case BT_OBEX_SERVER_ALLOCATE:
        case BT_OBEX_SERVER_DEALLOCATE:
@@ -3090,10 +3111,6 @@ void _bt_service_unregister(void)
                        g_object_unref(bt_service_conn);
                        bt_service_conn = NULL;
                }
-               if (node_info) {
-                       g_dbus_node_info_unref(node_info);
-                       node_info = NULL;
-               }
                if (owner_id > 0) {
                        g_bus_unown_name(owner_id);
                        owner_id = 0;