Revert BT enable / disable calling method to async call
[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-request-handler.c
index a9567ed..18c99e0 100644 (file)
@@ -36,7 +36,6 @@
 #include "bt-service-avrcp.h"
 #include "bt-service-avrcp-controller.h"
 #include "bt-service-opp-client.h"
-#include "bt-service-map-client.h"
 #include "bt-service-obex-server.h"
 #include "bt-service-rfcomm-client.h"
 #include "bt-service-rfcomm-server.h"
@@ -45,8 +44,6 @@
 #include "bt-service-dpm.h"
 #include "bt-service-agent.h"
 #include "bt-service-proximity.h"
-#include "bt-service-tds.h"
-#include "bt-service-otp.h"
 
 static GDBusConnection *bt_service_conn;
 static guint owner_id = 0;
@@ -206,9 +203,8 @@ static void __bt_service_method(GDBusConnection *connection,
                        }
                }
 
-               BT_DBG("Service type = %d, fn = %s (0x%x)",
-                               service_type, _bt_convert_service_function_to_string(service_function),
-                               service_function);
+               BT_DBG("Service type = %s, fn = %s (0x%x)", __bt_convert_service_type_to_string(service_type),
+                               _bt_convert_service_function_to_string(service_function), service_function);
                switch (service_type) {
                case BT_BLUEZ_SERVICE:
                        result = __bt_bluez_request(service_function,
@@ -265,7 +261,6 @@ static void __bt_service_method(GDBusConnection *connection,
                                g_dbus_method_invocation_return_value(invocation, temp);
                        }
                }
-               /* TODO: MAP? see the if{}else{} above */
 
                g_array_free(out_param1, TRUE);
                g_variant_unref(param1);
@@ -477,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,
@@ -486,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;
        }
@@ -618,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;
@@ -707,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: {
@@ -816,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} };
 
@@ -1024,6 +1013,37 @@ int __bt_bluez_request(int function_name,
 
                break;
        }
+       case BT_SET_PROFILE_RESTRICTED: {
+               bluetooth_device_address_t bd_addr = { {0} };
+               int profile;
+               int restricted;
+
+               __bt_service_get_parameters(in_param1, &bd_addr,
+                               sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2, &profile, sizeof(int));
+               __bt_service_get_parameters(in_param3, &restricted, sizeof(int));
+
+               result = _bt_set_restrict_profile(&bd_addr, profile, restricted);
+               break;
+       }
+       case BT_GET_PROFILE_RESTRICTED: {
+               bluetooth_device_address_t bd_addr = { {0} };
+               int profile;
+               guint restricted_profile = 0;
+
+               __bt_service_get_parameters(in_param1, &bd_addr,
+                               sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2, &profile, sizeof(int));
+
+               result = _bt_get_restrict_profile(&bd_addr, profile, &restricted_profile);
+               BT_DBG("Restricted %d", restricted_profile);
+               if (result == BLUETOOTH_ERROR_NONE) {
+                       g_array_append_vals(*out_param1, &restricted_profile,
+                                       sizeof(guint));
+               }
+
+               break;
+       }
        case BT_HID_CONNECT: {
                bluetooth_device_address_t address = { {0} };
 
@@ -1247,17 +1267,6 @@ int __bt_bluez_request(int function_name,
 
                break;
        }
-       case BT_AUDIO_SELECT_ROLE: {
-
-               bluetooth_audio_role_t role;
-
-               __bt_service_get_parameters(in_param1,
-                               &role, sizeof(bluetooth_audio_role_t));
-
-               result = _bt_audio_select_role(role);
-
-               break;
-       }
        case BT_OOB_READ_LOCAL_DATA: {
                bt_oob_data_t local_oob_data;
 
@@ -1271,17 +1280,14 @@ int __bt_bluez_request(int function_name,
        }
        case BT_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);
+               result = _bt_oob_add_remote_data(&address, &remote_oob_data);
 
                break;
        }
@@ -1295,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;
@@ -1313,6 +1346,17 @@ int __bt_bluez_request(int function_name,
                meta_data.number = data.number;
                meta_data.duration = (int64_t) data.duration;
 
+               if (meta_data.title)
+                       BT_INFO("title [%s]", meta_data.title);
+               if (meta_data.artist)
+                       BT_INFO("artist [%s]", meta_data.artist);
+               if (meta_data.album)
+                       BT_INFO("album [%s]", meta_data.album);
+               if (meta_data.genre)
+                       BT_INFO("genre [%s]", meta_data.genre);
+               BT_INFO("total_tracks[%d], number[%d], duration[%d]",
+                               meta_data.total_tracks, meta_data.number, meta_data.duration);
+
                result = _bt_avrcp_set_track_info(&meta_data);
 
                g_free((gpointer)meta_data.title);
@@ -1395,19 +1439,6 @@ int __bt_bluez_request(int function_name,
 
                break;
        }
-       case BT_AVRCP_TRANSPORT_SET_PROPERTY: {
-               int type;
-               unsigned int value;
-
-               __bt_service_get_parameters(in_param1,
-                               &type, sizeof(int));
-               __bt_service_get_parameters(in_param2,
-                               &value, sizeof(unsigned int));
-
-               result = _bt_avrcp_transport_set_property(type, value);
-
-               break;
-       }
        case BT_AVRCP_GET_TRACK_INFO: {
                media_metadata_t meta_data;
                media_metadata_attributes_t metadata;
@@ -1729,6 +1760,26 @@ int __bt_bluez_request(int function_name,
        case BT_HID_DEVICE_SEND_REPLY_TO_REPORT:
                /* Just call to check the privilege */
                break;
+#ifndef GATT_NO_RELAY
+       case BT_GATT_WATCH_CHARACTERISTIC: {
+               char *sender = NULL;
+
+               sender = (char *)g_dbus_method_invocation_get_sender(context);
+
+               result = _bt_insert_gatt_client_sender(sender);
+
+               break;
+       }
+       case BT_GATT_UNWATCH_CHARACTERISTIC: {
+               char *sender = NULL;
+
+               sender = (char *)g_dbus_method_invocation_get_sender(context);
+
+               result = _bt_delete_gatt_client_sender(sender);
+
+               break;
+       }
+#endif
        case BT_LE_IPSP_INIT:
                result = _bt_initialize_ipsp();
                break;
@@ -1809,14 +1860,16 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_ALLOW_BT_MODE: {
-               int value = DPM_BT_ERROR;
+               dpm_bt_allow_t value = DPM_BT_ERROR;
 
-               result = _bt_dpm_get_allow_bluetooth_mode(&value);
+               value = _bt_dpm_get_allow_bluetooth_mode();
+               result = DPM_RESULT_SUCCESS;
                g_array_append_vals(*out_param1, &value, sizeof(int));
+
                break;
        }
        case BT_DPM_SET_DEVICE_RESTRITION: {
-               dpm_status_t value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -1825,14 +1878,16 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_DEVICE_RESTRITION: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
-               result = _bt_dpm_is_bluetooth_device_restriction_active(&value);
+               value = _bt_dpm_is_bluetooth_device_restriction_active();
+               result = DPM_RESULT_SUCCESS;
                g_array_append_vals(*out_param1, &value, sizeof(int));
+
                break;
        }
        case BT_DPM_SET_UUID_RESTRITION: {
-               dpm_status_t value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -1841,10 +1896,12 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_UUID_RESTRITION: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
-               result = _bt_dpm_is_bluetooth_uuid_restriction_active(&value);
+               value = _bt_dpm_is_bluetooth_uuid_restriction_active();
+               result = DPM_RESULT_SUCCESS;
                g_array_append_vals(*out_param1, &value, sizeof(int));
+
                break;
        }
        case BT_DPM_ADD_DEVICES_BLACKLIST: {
@@ -1949,7 +2006,7 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_SET_ALLOW_OUTGOING_CALL: {
-               dpm_status_t value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -1959,14 +2016,16 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_ALLOW_OUTGOING_CALL: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
-               result = _bt_dpm_get_allow_bluetooth_outgoing_call(&value);
+               value = _bt_dpm_get_allow_bluetooth_outgoing_call();
+               result = DPM_RESULT_SUCCESS;
                g_array_append_vals(*out_param1, &value, sizeof(int));
+
                break;
        }
        case BT_DPM_SET_PAIRING_STATE: {
-               dpm_status_t value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -1976,15 +2035,17 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_PAIRING_STATE: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
-               result = _bt_dpm_get_bluetooth_pairing_state(&value);
+               value = _bt_dpm_get_bluetooth_pairing_state();
+               result = DPM_RESULT_SUCCESS;
                g_array_append_vals(*out_param1, &value, sizeof(int));
+
                break;
        }
        case BT_DPM_SET_PROFILE_STATE: {
-               int value = DPM_STATUS_ERROR;
-               int profile = DPM_PROFILE_NONE;
+               dpm_status_t value = DPM_BT_ERROR;
+               dpm_profile_t profile = DPM_PROFILE_NONE;
 
                __bt_service_get_parameters(in_param1, &profile,
                                sizeof(int));
@@ -1996,18 +2057,20 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_PROFILE_STATE: {
-               int value = DPM_STATUS_ERROR;
-               int profile = DPM_PROFILE_NONE;
+               dpm_status_t value = DPM_BT_ERROR;
+               dpm_profile_t profile = DPM_PROFILE_NONE;
 
-               __bt_service_get_parameters(in_param1, &profile,
+               __bt_service_get_parameters(in_param2, &profile,
                                sizeof(int));
 
-               result = _bt_dpm_get_bluetooth_profile_state(profile, &value);
+               value = _bt_dpm_get_bluetooth_profile_state(profile);
+               result = DPM_RESULT_SUCCESS;
                g_array_append_vals(*out_param1, &value, sizeof(int));
+
                break;
        }
        case BT_DPM_SET_DESKROP_CONNECTIVITY_STATE: {
-               int value = DPM_BT_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -2017,14 +2080,16 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_DESKROP_CONNECTIVITY_STATE: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
-               result = _bt_dpm_get_bluetooth_desktop_connectivity_state(&value);
+               value = _bt_dpm_get_bluetooth_desktop_connectivity_state();
+               result = DPM_RESULT_SUCCESS;
                g_array_append_vals(*out_param1, &value, sizeof(int));
+
                break;
        }
        case BT_DPM_SET_DISCOVERABLE_STATE: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -2034,14 +2099,16 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_DISCOVERABLE_STATE: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
-               result = _bt_dpm_get_bluetooth_discoverable_state(&value);
+               value = _bt_dpm_get_bluetooth_discoverable_state();
+               result = DPM_RESULT_SUCCESS;
                g_array_append_vals(*out_param1, &value, sizeof(int));
+
                break;
        }
        case BT_DPM_SET_LIMITED_DISCOVERABLE_STATE: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -2051,14 +2118,16 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_LIMITED_DISCOVERABLE_STATE: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
-               result = _bt_dpm_get_bluetooth_limited_discoverable_state(&value);
+               value = _bt_dpm_get_bluetooth_limited_discoverable_state();
+               result = DPM_RESULT_SUCCESS;
                g_array_append_vals(*out_param1, &value, sizeof(int));
+
                break;
        }
        case BT_DPM_SET_DATA_TRANSFER_STATE: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
                __bt_service_get_parameters(in_param1, &value,
                                sizeof(int));
@@ -2068,13 +2137,15 @@ int __bt_bluez_request(int function_name,
                break;
        }
        case BT_DPM_GET_DATA_TRANSFER_STATE: {
-               int value = DPM_STATUS_ERROR;
+               dpm_status_t value = DPM_BT_ERROR;
 
-               result = _bt_dpm_get_allow_bluetooth_data_transfer_state(&value);
+               value = _bt_dpm_get_allow_bluetooth_data_transfer_state();
+               result = DPM_RESULT_SUCCESS;
                g_array_append_vals(*out_param1, &value, sizeof(int));
+
                break;
        }
-       case BT_PXP_MONITOR_SET_PROPERTY: {
+       case BT_PXP_SET_PROPERTY: {
                bluetooth_device_address_t address = { {0} };
                unsigned int property = 0;
                unsigned int value = 0;
@@ -2086,10 +2157,10 @@ int __bt_bluez_request(int function_name,
                __bt_service_get_parameters(in_param3,
                                &value, sizeof(int));
 
-               result = _bt_proximity_monitor_set_property(&address, property, value);
+               result = bt_set_proximity_property(&address, property, value);
                break;
        }
-       case BT_PXP_MONITOR_GET_PROPERTY: {
+       case BT_PXP_GET_PROPERTY: {
                bluetooth_device_address_t address = { {0} };
                unsigned int property = 0;
                int value = 0;
@@ -2099,348 +2170,33 @@ int __bt_bluez_request(int function_name,
                __bt_service_get_parameters(in_param2,
                                &property, sizeof(unsigned int));
 
-               result = _bt_proximity_monitor_get_property(&address, property, &value);
+               result = bt_get_proximity_property(&address, property, &value);
                if (result == BLUETOOTH_ERROR_NONE) {
                        g_array_append_vals(*out_param1, &value,
                                                sizeof(int));
                }
                break;
        }
-       case BT_PXP_MONITOR_GET_SUPPORTED_SERIVCES: {
+       case BT_PXP_GET_SUPPORTED_SERIVCES: {
                bluetooth_device_address_t address = { {0} };
                unsigned int property = 0;
 
                __bt_service_get_parameters(in_param1,
                                &address, sizeof(bluetooth_device_address_t));
 
-               result = _bt_proximity_monitor_get_supported_services(&address, &property);
+               result = bt_get_proximity_supported_services(&address, &property);
                if (result == BLUETOOTH_ERROR_NONE) {
                        g_array_append_vals(*out_param1, &property,
                                                sizeof(int));
                }
                break;
        }
-       case BT_PXP_REPORTER_REGISTER: {
-               char *sender = NULL;
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-               result = _bt_proximity_reporter_register(sender);
-               break;
-       }
-       case BT_PXP_REPORTER_UNREGISTER: {
-               char *sender = NULL;
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-               result = _bt_proximity_reporter_unregister(sender);
-               break;
-       }
-       case BT_PXP_REPORTER_GET_PROPERTY: {
-               bluetooth_device_address_t address = { {0} };
-               unsigned int property = 0;
-               int value = 0;
-
-               __bt_service_get_parameters(in_param1,
-                               &address, sizeof(bluetooth_device_address_t));
-               __bt_service_get_parameters(in_param2,
-                               &property, sizeof(unsigned int));
-
-               result = _bt_proximity_reporter_get_property(&address, property, &value);
-               if (result == BLUETOOTH_ERROR_NONE) {
-                       g_array_append_vals(*out_param1, &value,
-                                               sizeof(int));
-               }
-               break;
-       }
-       case BT_TDS_PROVIDER_REGISTER: {
-               char *sender = NULL;
-
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-               result = _bt_tds_provider_register(sender);
-
-               break;
-       }
-       case BT_TDS_PROVIDER_UNREGISTER: {
-               char *sender = NULL;
-
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-               result = _bt_tds_provider_unregister(sender);
-
-               break;
-       }
-       case BT_TDS_PROVIDER_SET_MANUF_DATA: {
-               char *sender = NULL;
-               unsigned int length = 0;
-               bluetooth_advertising_data_t manuf_data;
-
-               __bt_service_get_parameters(in_param1,
-                               &length, sizeof(unsigned int));
-               __bt_service_get_parameters(in_param2,
-                               &manuf_data, sizeof(bluetooth_advertising_data_t));
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-
-               result = _bt_tds_provider_set_manuf_data(sender, manuf_data.data, length);
-               break;
-       }
-       case BT_TDS_PROVIDER_CREATE: {
-               char *sender = NULL;
-               unsigned int tds_handle = 0;
-               int transport;
-
-               __bt_service_get_parameters(in_param1,
-                               &tds_handle, sizeof(unsigned int));
-               __bt_service_get_parameters(in_param2,
-                               &transport, sizeof(int));
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-               result = _bt_tds_provider_transport_create(sender, transport, tds_handle);
-
-               break;
-       }
-       case BT_TDS_PROVIDER_DESTROY: {
-               char *sender = NULL;
-               unsigned int tds_handle = 0;
-
-               __bt_service_get_parameters(in_param1,
-                               &tds_handle, sizeof(unsigned int));
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-               result = _bt_tds_provider_transport_remove(sender, tds_handle);
-
-               break;
-       }
-       case BT_TDS_PROVIDER_SET_TRANSPORT_DATA: {
-               char *sender = NULL;
-               unsigned int tds_handle = 0;
-               int transport_state = 0;
-               bluetooth_tds_data_t tds_data;
-
-               __bt_service_get_parameters(in_param1,
-                               &tds_handle, sizeof(unsigned int));
-               __bt_service_get_parameters(in_param2,
-                               &transport_state, sizeof(int));
-               __bt_service_get_parameters(in_param3,
-                               &tds_data, sizeof(bluetooth_tds_data_t));
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-
-               result = _bt_tds_provider_set_transport_data(sender, tds_handle,
-                               transport_state, tds_data.data, tds_data.length);
-               break;
-       }
-       case BT_TDS_SEND_ACTIVATION_RESPONSE: {
-               bluetooth_device_address_t address = { {0} };
-               bluetooth_tds_data_t tds_data;
-               char *sender = NULL;
-               unsigned int tds_handle = 0;
-               int response;
-
-               __bt_service_get_parameters(in_param1,
-                               &tds_handle, sizeof(unsigned int));
-               __bt_service_get_parameters(in_param2,
-                               &response, sizeof(int));
-               __bt_service_get_parameters(in_param3, &address,
-                       sizeof(bluetooth_device_address_t));
-               __bt_service_get_parameters(in_param4,
-                               &tds_data, sizeof(bluetooth_tds_data_t));
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-
-               result = _bt_tds_provider_send_activation_response(sender, tds_handle,
-                               &address, response, tds_data.data, tds_data.length);
-               break;
-       }
-       case BT_TDS_READ_TRANSPORT_DATA: {
-               char *handle;
-               char *data = NULL;
-               guint data_len = 0;
-
-               char *sender = NULL;
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-
-               bluetooth_device_address_t address = { {0} };
-               __bt_service_get_parameters(in_param2,
-                       &address, sizeof(bluetooth_device_address_t));
-
-               data_len = g_variant_get_size(in_param1);
-               data = (char *)g_variant_get_data(in_param1);
-
-               handle = g_strndup(data, data_len);
-               BT_DBG("Read TDS Transport Block [%s]", handle);
-
-               result = _bt_tds_read_transport_data(request_id, sender, &address, handle);
-
-               if (result != BLUETOOTH_ERROR_NONE) {
-                       BT_ERR("Reading TDS Transport data failed result [%d]", result);
-                       g_array_append_vals(*out_param1, &address,
-                                       sizeof(bluetooth_device_address_t));
-               }
-               if (handle)
-                       g_free(handle);
-               break;
-       }
-       case BT_TDS_ENABLE_CONTROL_POINT: {
-               char *handle;
-               char *data = NULL;
-               guint data_len = 0;
-               bluetooth_device_address_t address = { {0} };
-
-               char *sender = NULL;
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-
-               data_len = g_variant_get_size(in_param1);
-               data = (char *)g_variant_get_data(in_param1);
-               __bt_service_get_parameters(in_param2,
-                       &address, sizeof(bluetooth_device_address_t));
-
-               handle = g_strndup(data, data_len);
-               BT_DBG("TDS Control point CCCD handle [%s]", handle);
-
-               result = _bt_tds_enable_control_point(request_id, sender, &address, handle);
-
-               if (result != BLUETOOTH_ERROR_NONE) {
-                       BT_ERR("Enabling TDS CCCD failed result [%d]", result);
-                       g_array_append_vals(*out_param1, &address,
-                                       sizeof(bluetooth_device_address_t));
-               }
-               if (handle)
-                       g_free(handle);
-               break;
-       }
-       case BT_TDS_ACTIVATE_CONTROL_POINT: {
-               char *handle;
-               char *data = NULL;
-               guint data_len = 0;
-               bluetooth_control_point_data_t tds_data;
-               char *sender = NULL;
-
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-
-               bluetooth_device_address_t address = { {0} };
-
-               data_len = g_variant_get_size(in_param1);
-               data = (char *)g_variant_get_data(in_param1);
-
-                __bt_service_get_parameters(in_param2,
-                       &address, sizeof(bluetooth_device_address_t));
-
-               __bt_service_get_parameters(in_param3,
-                       &tds_data, sizeof(bluetooth_control_point_data_t));
-
-               handle = g_strndup(data, data_len);
-               BT_DBG("TDS Activate Control point handle [%s]", handle);
-
-               result = _bt_tds_activate_control_point(request_id, sender, &address, handle,
-                                                               tds_data.data, tds_data.length);
-
-               if (result != BLUETOOTH_ERROR_NONE) {
-                       BT_ERR("Activating TDS Control Point request failed result [%d]", result);
-                       g_array_append_vals(*out_param1, &address,
-                                       sizeof(bluetooth_device_address_t));
-               }
-               if (handle)
-                       g_free(handle);
-               break;
-       }
-       case BT_OTP_SERVER_INIT: {
-               const char *directory;
-               directory = (const char *)g_variant_get_data(in_param1);
-               result = bt_otp_server_init(request_id, directory);
+       case BT_PXP_REGISTER_REPORTER: {
+               result = bt_register_proximity_reporter();
                break;
        }
-       case BT_OTP_SERVER_DEINIT: {
-               result = bt_otp_server_deinit(request_id);
-               break;
-       }
-       case BT_OTP_READ_VALUE: {
-               char *handle;
-               char *data = NULL;
-               guint data_len = 0;
-
-               char *sender = NULL;
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-
-               data_len = g_variant_get_size(in_param1);
-               data = (char *)g_variant_get_data(in_param1);
-
-               handle = g_strndup(data, data_len);
-               BT_DBG("Read OTP Characteristic Value [%s]", handle);
-
-               result = _bt_otp_read_characteristic_value(request_id, sender, handle);
-
-               if (result != BLUETOOTH_ERROR_NONE) {
-                       BT_ERR("Reading OTP Characteristic Value failed result [%d]", result);
-                       g_array_append_vals(*out_param1, handle, data_len);
-               }
-               if (handle)
-                       g_free(handle);
-               break;
-       }
-       case BT_OTP_ENABLE_NOTIFICATION: {
-               char *handle;
-               char *data = NULL;
-               guint data_len = 0;
-
-               char *sender = NULL;
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-
-               data_len = g_variant_get_size(in_param1);
-               data = (char *)g_variant_get_data(in_param1);
-
-               handle = g_strndup(data, data_len);
-               BT_DBG("OTP Control point CCCD handle [%s]", handle);
-
-               result = _bt_otp_enable_notification(request_id, sender, handle);
-
-               if (result != BLUETOOTH_ERROR_NONE) {
-                       BT_ERR("Enabling OTP CCCD failed result [%d]", result);
-                       g_array_append_vals(*out_param1, handle, data_len);
-               }
-               if (handle)
-                       g_free(handle);
-               break;
-       }
-       case BT_OTP_WRITE_VALUE: {
-               char *handle;
-               char *data = NULL;
-               guint data_len = 0;
-               char *sender = NULL;
-               bluetooth_otp_charc_data_t otp_charc_data;
-               sender = (char *)g_dbus_method_invocation_get_sender(context);
-
-               data_len = g_variant_get_size(in_param1);
-               data = (char *)g_variant_get_data(in_param1);
-
-               handle = g_strndup(data, data_len);
-               BT_DBG("OTP Write Characteristic value [%s]", handle);
-
-               __bt_service_get_parameters(in_param2,
-                       &otp_charc_data, sizeof(bluetooth_otp_charc_data_t));
-
-               int i;
-               for (i = 0; i < otp_charc_data.length; i++)
-                       BT_DBG("Value[%d] = %u", i, otp_charc_data.data[i]);
-
-               result = _bt_otp_write_characteristic_value(request_id, sender, handle,
-                                                               otp_charc_data.data, otp_charc_data.length);
-
-               if (result != BLUETOOTH_ERROR_NONE) {
-                       BT_ERR("OTP Write Characteristic failed result [%d]", result);
-                       g_array_append_vals(*out_param1, handle, data_len);
-               }
-               if (handle)
-                       g_free(handle);
-               break;
-       }
-       case BT_LE_OTC_CONNECT: {
-               BT_DBG("OTC Connect");
-               bluetooth_device_address_t address = { {0} };
-               __bt_service_get_parameters(in_param1, &address,
-                               sizeof(bluetooth_device_address_t));
-
-               result = _bt_otp_connect_otc(request_id, &address);
-               break;
-       }
-       case BT_LE_OTC_DISCONNECT: {
-               BT_DBG("OTC Disconnect");
-               bluetooth_device_address_t address = { {0} };
-
-               __bt_service_get_parameters(in_param1, &address,
-                                               sizeof(bluetooth_device_address_t));
-               result = _bt_otp_disconnect_otc(&address);
+       case BT_PXP_UNREGISTER_REPORTER: {
+               result = bt_unregister_proximity_reporter();
                break;
        }
        default:
@@ -2472,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;
@@ -2488,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,
@@ -2537,117 +2293,6 @@ int __bt_obexd_request(int function_name,
 
                break;
        }
-
-       case BT_MAP_CREATE_SESSION: {
-               BT_DBG("BT_MAP_CREATE_SESSION");
-               char *address = (char *)g_variant_get_data(in_param1);
-               char *session_id = NULL;
-               result = _bt_create_session_sync(address, &session_id);
-               if (result == BLUETOOTH_ERROR_NONE)
-                       g_array_append_vals(*out_param1, session_id, strlen(session_id)+1);
-               break;
-       }
-
-       case BT_MAP_DESTROY_SESSION: {
-               BT_DBG("BT_MAP_DESTROY_SESSION");
-               char* session_id = (char *)g_variant_get_data(in_param1);
-               result = _bt_destroy_session_sync(session_id);
-               if (result == BLUETOOTH_ERROR_NONE)
-                       BT_DBG("successfully destroyed session");
-               break;
-       }
-
-       case BT_MAP_SET_FOLDER: {
-               BT_DBG("BT_MAP_SET_FOLDER");
-               char *session_id = (char *)g_variant_get_data(in_param1);
-               char *name = (char *)g_variant_get_data(in_param2);
-               result = _bt_map_client_set_folder(session_id, name);
-               break;
-       }
-
-       case BT_MAP_LIST_FOLDERS: {
-               BT_DBG("BT_MAP_LIST_FOLDERS");
-
-               char* session_id = (char *)g_variant_get_data(in_param1);
-               char* filter_serialized = (char*)g_variant_get_data(in_param2);
-
-               result = _bt_map_client_list_folders(request_id, context, session_id, filter_serialized);
-               if (result == BLUETOOTH_ERROR_NONE)
-                       BT_DBG("_bt_map_client_list_folders succeed");
-
-               break;
-       }
-
-       case BT_MAP_LIST_FILTER_FIELDS: {
-               BT_DBG("BT_MAP_LIST_FILTER_FIELDS");
-
-               char* session_id = (char *)g_variant_get_data(in_param1);
-
-               result = _bt_map_client_list_filter_fields(request_id, context, session_id);
-               if (result == BLUETOOTH_ERROR_NONE)
-                       BT_DBG("_bt_map_client_list_filter_fields succeed");
-
-               break;
-       }
-
-       case BT_MAP_LIST_MESSAGES: {
-               BT_DBG("BT_MAP_LIST_MESSAGES");
-
-               char* session_id = (char*)g_variant_get_data(in_param1);
-               char* folder = (char*)g_variant_get_data(in_param2);
-               char* filter_serialized = (char*)g_variant_get_data(in_param3);
-
-               result = _bt_map_client_list_messages(request_id, context, session_id, folder, filter_serialized);
-               if (result == BLUETOOTH_ERROR_NONE)
-                       BT_DBG("_bt_map_client_list_messages succeed");
-               else
-                       BT_DBG("_bt_map_client_list_messages failed");
-
-               break;
-       }
-
-       case BT_MAP_UPDATE_INBOX: {
-               BT_DBG("BT_MAP_UPDATE_INBOX");
-               char* session_id = (char *)g_variant_get_data(in_param1);
-               result = _bt_map_client_update_inbox(session_id);
-               break;
-       }
-
-       case BT_MAP_PUSH_MESSAGE: {
-               BT_DBG("BT_MAP_PUSH_MESSAGE");
-
-               char* session_id = (char *)g_variant_get_data(in_param1);
-               char* source_file = (char *)g_variant_get_data(in_param2);
-               char* folder = (char *)g_variant_get_data(in_param3);
-               char* args_serialized = (char *)g_variant_get_data(in_param4);
-
-               result = _bt_map_client_push_message(
-                               request_id, context, session_id, source_file, folder, args_serialized);
-               if (result == BLUETOOTH_ERROR_NONE)
-                       BT_DBG("_bt_map_client_push_message succeed");
-               else
-                       BT_ERR("_bt_map_client_push_message failed");
-
-               break;
-       }
-
-       case BT_MAP_GET_MESSAGE: {
-               BT_DBG("BT_MAP_GET_MESSAGE");
-               // TODO session currently is not used, but should be valid
-               //char* session_id = (char *)g_variant_get_data(in_param1);
-               char* message_object = (char *)g_variant_get_data(in_param2);
-               char* target_file = (char *)g_variant_get_data(in_param3);
-               bool attachment = false;
-               __bt_service_get_parameters(in_param4, &attachment, sizeof(bool));
-
-               result = _bt_map_client_get_message(request_id, context, message_object,
-                               target_file, attachment);
-               if (result == BLUETOOTH_ERROR_NONE)
-                       BT_DBG("_bt_map_client_get_message succeed");
-
-               break;
-       }
-
        case BT_OBEX_SERVER_ALLOCATE: {
                int app_pid;
                gboolean is_native;
@@ -3065,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:
@@ -3083,7 +2729,6 @@ gboolean __bt_service_check_privilege(int function_name,
 
        case BT_OPP_PUSH_FILES:
        case BT_OPP_CANCEL_PUSH:
-       /* TODO: MAP? MAP functions, see above */
 
        case BT_OBEX_SERVER_ACCEPT_CONNECTION:
        case BT_OBEX_SERVER_REJECT_CONNECTION:
@@ -3189,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:
@@ -3231,13 +2877,18 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_REMOVE_WHITE_LIST:
        case BT_CLEAR_WHITE_LIST:
        case BT_SET_MANUFACTURER_DATA:
+       case BT_SET_PASSKEY_NOTIFICATION:
+       case BT_SET_PROFILE_RESTRICTED:
 
+       case BT_DISCONNECT_DEVICE:
        case BT_CANCEL_SEARCH_SERVICE:
        case BT_ENABLE_RSSI:
 
        case BT_RFCOMM_ACCEPT_CONNECTION:
        case BT_RFCOMM_REJECT_CONNECTION:
        case BT_RFCOMM_LISTEN:
+       case BT_RFCOMM_CREATE_SOCKET_EX:
+       case BT_RFCOMM_REMOVE_SOCKET_EX:
 
        case BT_HID_ENABLE_BARCODE_FEATURE:
 
@@ -3252,57 +2903,24 @@ 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:
        case BT_LE_IPSP_CONNECT:
        case BT_LE_IPSP_DISCONNECT:
-       case BT_PXP_MONITOR_SET_PROPERTY:
-       case BT_PXP_MONITOR_GET_PROPERTY:
-       case BT_PXP_MONITOR_GET_SUPPORTED_SERIVCES:
-       case BT_PXP_REPORTER_REGISTER:
-       case BT_PXP_REPORTER_UNREGISTER:
-       case BT_PXP_REPORTER_GET_PROPERTY:
-
-       /* TDS */
-       case BT_TDS_PROVIDER_REGISTER:
-       case BT_TDS_PROVIDER_UNREGISTER:
-       case BT_TDS_PROVIDER_SET_MANUF_DATA:
-       case BT_TDS_PROVIDER_CREATE:
-       case BT_TDS_PROVIDER_DESTROY:
-       case BT_TDS_PROVIDER_SET_TRANSPORT_DATA:
-       case BT_TDS_SEND_ACTIVATION_RESPONSE:
-       case BT_TDS_READ_TRANSPORT_DATA:
-       case BT_TDS_ENABLE_CONTROL_POINT:
-       case BT_TDS_ACTIVATE_CONTROL_POINT:
-
-       /* OTP Server */
-       case BT_OTP_SERVER_INIT:
-       case BT_OTP_SERVER_DEINIT:
-       case BT_OTP_READ_VALUE:
-       case BT_OTP_ENABLE_NOTIFICATION:
-       case BT_OTP_WRITE_VALUE:
-       case BT_LE_OTC_CONNECT:
-       case BT_LE_OTC_DISCONNECT:
-
-       case BT_MAP_CREATE_SESSION:
-       case BT_MAP_DESTROY_SESSION:
-       case BT_MAP_SET_FOLDER:
-       case BT_MAP_LIST_FOLDERS:
-       case BT_MAP_LIST_FILTER_FIELDS:
-       case BT_MAP_LIST_MESSAGES:
-       case BT_MAP_UPDATE_INBOX:
-       case BT_MAP_PUSH_MESSAGE:
-       case BT_MAP_GET_MESSAGE:
-
+       case BT_PXP_SET_PROPERTY:
+       case BT_PXP_GET_PROPERTY:
+       case BT_PXP_GET_SUPPORTED_SERIVCES:
+       case BT_PXP_REGISTER_REPORTER:
+       case BT_PXP_UNREGISTER_REPORTER:
        ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds,
                                BT_PRIVILEGE_PLATFORM);
 
@@ -3343,9 +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: