Fix the coding style errors (bt-service)
[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-request-handler.c
index 069ec2c..0deefbf 100644 (file)
@@ -1,11 +1,5 @@
 /*
- * Bluetooth-frwk
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact:  Hocheol Seo <hocheol.seo@samsung.com>
- *              Girishashok Joshi <girish.joshi@samsung.com>
- *              Chanyeol Park <chanyeol.park@samsung.com>
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,6 +41,7 @@
 #include "bt-service-rfcomm-server.h"
 #include "bt-request-handler.h"
 #include "bt-service-pbap.h"
+#include "bt-service-dpm.h"
 
 static GDBusConnection *bt_service_conn;
 static guint owner_id = 0;
@@ -101,6 +96,7 @@ int __bt_obexd_request(int function_name,
                GVariant *in_param2,
                GVariant *in_param3,
                GVariant *in_param4,
+               GVariant *in_param5,
                GArray **out_param1);
 int __bt_agent_request(int function_name,
                int request_type,
@@ -170,7 +166,7 @@ static void __bt_service_method(GDBusConnection *connection,
                GVariant *out_var = NULL;
                int result = 0;
                int request_id = -1;
-               char *sender = NULL;
+               const char *sender = NULL;
 
                g_variant_get(parameters, "(iii@ay@ay@ay@ay@ay)", &service_type,
                                &service_function, &request_type,
@@ -185,7 +181,6 @@ static void __bt_service_method(GDBusConnection *connection,
                } else if (__bt_service_check_privilege(service_function,
                                        service_type, (const char *)sender) == FALSE) {
                        BT_ERR("Client don't have the privilege to excute this function");
-                       /* TODO: privilege check doesn't work properly. It sometimes reutrns fail. */
                        result = BLUETOOTH_ERROR_PERMISSION_DEINED;
                        goto fail;
                }
@@ -218,7 +213,7 @@ static void __bt_service_method(GDBusConnection *connection,
                                        request_type, request_id,
                                        invocation, param1,
                                        param2, param3,
-                                       param4, &out_param1);
+                                       param4, param5, &out_param1);
                        break;
                case BT_AGENT_SERVICE:
                        result = __bt_agent_request(service_function,
@@ -701,18 +696,18 @@ int __bt_bluez_request(int function_name,
        }
        case BT_LE_CONN_UPDATE: {
                bluetooth_device_address_t local_address = { {0} };
-               bluetooth_le_conn_update_t parameters = {0};
+               bluetooth_le_connection_param_t parameters = {0};
 
                __bt_service_get_parameters(in_param1, &local_address,
                                sizeof(bluetooth_device_address_t));
                __bt_service_get_parameters(in_param2, &parameters,
-                               sizeof(bluetooth_le_conn_update_t));
+                               sizeof(bluetooth_le_connection_param_t));
 
                result =  _bt_le_conn_update(local_address.addr,
                                        parameters.interval_min,
                                        parameters.interval_max,
                                        parameters.latency,
-                                       parameters.time_out);
+                                       parameters.timeout);
                break;
        }
        case BT_IS_ADVERTISING: {
@@ -798,6 +793,24 @@ int __bt_bluez_request(int function_name,
                result = _bt_cancel_bonding();
                break;
        }
+       case BT_PASSKEY_REPLY: {
+               const char *passkey = NULL;
+               gboolean authentication_reply = FALSE;
+
+               passkey = g_variant_get_data(in_param1);
+               __bt_service_get_parameters(in_param2,
+                       &authentication_reply, sizeof(gboolean));
+               result = _bt_passkey_reply(passkey, authentication_reply);
+               break;
+       }
+       case BT_PASSKEY_CONFIRMATION_REPLY: {
+               gboolean confirmation_reply = FALSE;
+
+               __bt_service_get_parameters(in_param1,
+                       &confirmation_reply, sizeof(gboolean));
+               result = _bt_passkey_confirmation_reply(confirmation_reply);
+               break;
+       }
        case BT_UNBOND_DEVICE: {
                bluetooth_device_address_t address = { {0} };
 
@@ -883,6 +896,48 @@ int __bt_bluez_request(int function_name,
 
                break;
        }
+       case BT_SET_PIN_CODE: {
+               bluetooth_device_address_t address = { {0} };
+               bluetooth_device_pin_code_t pin_code = { {0} };
+
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2,
+                               &pin_code, sizeof(bluetooth_device_pin_code_t));
+
+               result = _bt_set_pin_code(&address, &pin_code);
+               break;
+       }
+       case BT_UNSET_PIN_CODE: {
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+
+               result = _bt_unset_pin_code(&address);
+               break;
+       }
+       case BT_UPDATE_LE_CONNECTION_MODE: {
+               bluetooth_device_address_t remote_address = { { 0 } };
+               bluetooth_le_connection_param_t param = { 0 };
+               bluetooth_le_connection_mode_t mode = BLUETOOTH_LE_CONNECTION_MODE_BALANCED;
+
+               __bt_service_get_parameters(in_param1, &remote_address,
+                               sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2, &mode,
+                               sizeof(bluetooth_le_connection_mode_t));
+
+               result = _bt_get_le_connection_parameter(mode, &param);
+               if (result != BLUETOOTH_ERROR_NONE)
+                       break;
+
+               result = _bt_le_conn_update(remote_address.addr,
+                               param.interval_min,
+                               param.interval_max,
+                               param.latency,
+                               param.timeout);
+               break;
+       }
 
        case BT_HID_CONNECT: {
                bluetooth_device_address_t address = { {0} };
@@ -1331,7 +1386,7 @@ int __bt_bluez_request(int function_name,
                char *uuid;
                int socket_fd = -1;
 
-               sender = dbus_g_method_get_sender(context);
+               sender = (char *)g_dbus_method_invocation_get_sender(context);
                uuid = &g_array_index(in_param1, char, 0);
 
                result = _bt_rfcomm_create_socket(sender, uuid);
@@ -1418,8 +1473,11 @@ int __bt_bluez_request(int function_name,
                __bt_service_get_parameters(in_param2,
                                &auto_connect, sizeof(gboolean));
 
-               result = _bt_connect_le_device(&address, auto_connect);
-
+               result = _bt_connect_le_device(request_id, &address, auto_connect);
+               if (result != BLUETOOTH_ERROR_NONE) {
+                       g_array_append_vals(*out_param1, &address,
+                                       sizeof(bluetooth_device_address_t));
+               }
                break;
        }
        case BT_DISCONNECT_LE: {
@@ -1428,8 +1486,11 @@ int __bt_bluez_request(int function_name,
                __bt_service_get_parameters(in_param1, &address,
                                sizeof(bluetooth_device_address_t));
 
-               result = _bt_disconnect_le_device(&address);
-
+               result = _bt_disconnect_le_device(request_id, &address);
+               if (result != BLUETOOTH_ERROR_NONE) {
+                       g_array_append_vals(*out_param1, &address,
+                                       sizeof(bluetooth_device_address_t));
+               }
                break;
        }
        case BT_SET_LE_PRIVACY: {
@@ -1451,8 +1512,401 @@ int __bt_bluez_request(int function_name,
        case BT_GATT_SET_PROPERTY_REQUEST:
        case BT_GATT_READ_CHARACTERISTIC:
        case BT_GATT_DISCOVER_CHARACTERISTICS_DESCRIPTOR:
+
+       case BT_HID_DEVICE_ACTIVATE:
+       case BT_HID_DEVICE_DEACTIVATE:
+       case BT_HID_DEVICE_CONNECT:
+       case BT_HID_DEVICE_DISCONNECT:
+       case BT_HID_DEVICE_SEND_MOUSE_EVENT:
+       case BT_HID_DEVICE_SEND_KEY_EVENT:
+       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;
+       case BT_LE_IPSP_DEINIT:
+               result = _bt_deinitialize_ipsp();
+               break;
+       case BT_LE_IPSP_CONNECT: {
+               bluetooth_device_address_t address = { {0} };
+               __bt_service_get_parameters(in_param1, &address,
+                               sizeof(bluetooth_device_address_t));
+
+               result = _bt_connect_le_ipsp_device(&address);
+               break;
+       }
+       case BT_LE_IPSP_DISCONNECT: {
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1, &address,
+                               sizeof(bluetooth_device_address_t));
+
+               result = _bt_disconnect_le_ipsp_device(&address);
+               break;
+       }
+       case BT_LE_READ_MAXIMUM_DATA_LENGTH: {
+               bluetooth_le_read_maximum_data_length_t max_le_datalength = {0};
+
+               result = _bt_le_read_maximum_data_length(&max_le_datalength);
+
+               g_array_append_vals(*out_param1, &max_le_datalength,
+                       sizeof(bluetooth_le_read_maximum_data_length_t));
+               break;
+       }
+       case BT_LE_WRITE_HOST_SUGGESTED_DATA_LENGTH: {
+               unsigned int def_tx_Octects = 0;
+               unsigned int def_tx_Time = 0;
+
+               __bt_service_get_parameters(in_param1,
+                               &def_tx_Octects, sizeof(int));
+               __bt_service_get_parameters(in_param2,
+                               &def_tx_Time, sizeof(int));
+
+               result = _bt_le_write_host_suggested_default_data_length(
+                                               def_tx_Octects, def_tx_Time);
+               break;
+       }
+       case BT_LE_READ_HOST_SUGGESTED_DATA_LENGTH: {
+               bluetooth_le_read_host_suggested_data_length_t def_data_length = {0};
+
+               result = _bt_le_read_host_suggested_default_data_length(&def_data_length);
+
+               g_array_append_vals(*out_param1, &def_data_length,
+                               sizeof(bluetooth_le_read_host_suggested_data_length_t));
+
+               break;
+       }
+       case BT_LE_SET_DATA_LENGTH: {
+               int max_tx_Octets = 0;
+               int max_tx_Time = 0;
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1, &address,
+                               sizeof(bluetooth_device_address_t));
+               __bt_service_get_parameters(in_param2,
+                               &max_tx_Octets, sizeof(int));
+               __bt_service_get_parameters(in_param3,
+                               &max_tx_Time, sizeof(int));
+
+               result = _bt_le_set_data_length(&address, max_tx_Octets, max_tx_Time);
+               break;
+       }
+       case BT_DPM_SET_ALLOW_BT_MODE: {
+               dpm_bt_allow_t value = DPM_BT_ERROR;
+
+               __bt_service_get_parameters(in_param1, &value,
+                               sizeof(int));
+
+               result = _bt_dpm_set_allow_bluetooth_mode(value);
+               break;
+       }
+       case BT_DPM_GET_ALLOW_BT_MODE: {
+               dpm_bt_allow_t value = DPM_BT_ERROR;
+
+               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_BT_ERROR;
+
+               __bt_service_get_parameters(in_param1, &value,
+                               sizeof(int));
+
+               result = _bt_dpm_activate_bluetooth_device_restriction(value);
+               break;
+       }
+       case BT_DPM_GET_DEVICE_RESTRITION: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               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_BT_ERROR;
+
+               __bt_service_get_parameters(in_param1, &value,
+                               sizeof(int));
+
+               result = _bt_dpm_activate_bluetoooth_uuid_restriction(value);
+               break;
+       }
+       case BT_DPM_GET_UUID_RESTRITION: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               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: {
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1, &address,
+                       sizeof(bluetooth_device_address_t));
+
+               result = _bt_dpm_add_bluetooth_devices_to_blacklist(&address);
+               break;
+       }
+       case BT_DPM_ADD_DEVICES_WHITELIST: {
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1, &address,
+                       sizeof(bluetooth_device_address_t));
+
+               result = _bt_dpm_add_bluetooth_devices_to_whitelist(&address);
+               break;
+       }
+       case BT_DPM_ADD_UUIDS_BLACKLIST: {
+               const char *uuid = NULL;
+
+               uuid = g_variant_get_data(in_param1);
+
+               result = _bt_dpm_add_bluetooth_uuids_to_blacklist(uuid);
+               break;
+       }
+       case BT_DPM_ADD_UUIDS_WHITELIST: {
+               const char *uuid = NULL;
+
+               uuid = g_variant_get_data(in_param1);
+
+               result = _bt_dpm_add_bluetooth_uuids_to_whitelist(uuid);
+               break;
+       }
+       case BT_DPM_CLEAR_DEVICES_BLACKLIST: {
+               result = _bt_dpm_clear_bluetooth_devices_from_blacklist();
+               break;
+       }
+       case BT_DPM_CLEAR_DEVICES_WHITELIST: {
+               result = _bt_dpm_clear_bluetooth_devices_from_whitelist();
+               break;
+       }
+       case BT_DPM_CLEAR_UUIDS_BLACKLIST: {
+               result = _bt_dpm_clear_bluetooth_uuids_from_blacklist();
+               break;
+       }
+       case BT_DPM_CLEAR_UUIDS_WHITELIST: {
+               result = _bt_dpm_clear_bluetooth_uuids_from_whitelist();
+               break;
+       }
+       case BT_DPM_REMOVE_DEVICE_BLACKLIST: {
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1, &address,
+                       sizeof(bluetooth_device_address_t));
+
+               result = _bt_dpm_remove_bluetooth_devices_from_blacklist(&address);
+               break;
+       }
+       case BT_DPM_REMOVE_DEVICE_WHITELIST: {
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1, &address,
+                       sizeof(bluetooth_device_address_t));
+
+               result = _bt_dpm_remove_bluetooth_devices_from_whitelist(&address);
+               break;
+       }
+       case BT_DPM_REMOVE_UUID_BLACKLIST: {
+               const char *uuid = NULL;
+
+               uuid = g_variant_get_data(in_param1);
+
+               result = _bt_dpm_remove_bluetooth_uuids_from_blacklist(uuid);
+               break;
+       }
+       case BT_DPM_REMOVE_UUID_WHITELIST: {
+               const char *uuid = NULL;
+
+               uuid = g_variant_get_data(in_param1);
+
+               result = _bt_dpm_remove_bluetooth_uuids_from_whitelist(uuid);
+
+               break;
+       }
+       case BT_DPM_GET_DEVICES_BLACKLIST: {
+               result = _bt_dpm_get_bluetooth_devices_from_blacklist(out_param1);
+               break;
+       }
+       case BT_DPM_GET_DEVICES_WHITELIST: {
+               result = _bt_dpm_get_bluetooth_devices_from_whitelist(out_param1);
+               break;
+       }
+       case BT_DPM_GET_UUIDS_BLACKLIST: {
+               result = _bt_dpm_get_bluetooth_uuids_from_blacklist(out_param1);
+               break;
+       }
+       case BT_DPM_GET_UUIDS_WHITELIST: {
+               result = _bt_dpm_get_bluetooth_uuids_from_whitelist(out_param1);
+               break;
+       }
+       case BT_DPM_SET_ALLOW_OUTGOING_CALL: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               __bt_service_get_parameters(in_param1, &value,
+                               sizeof(int));
+
+               result = _bt_dpm_set_allow_bluetooth_outgoing_call(value);
+
+               break;
+       }
+       case BT_DPM_GET_ALLOW_OUTGOING_CALL: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               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_BT_ERROR;
+
+               __bt_service_get_parameters(in_param1, &value,
+                               sizeof(int));
+
+               result = _bt_dpm_set_bluetooth_pairing_state(value);
+
+               break;
+       }
+       case BT_DPM_GET_PAIRING_STATE: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               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: {
+               dpm_status_t value = DPM_BT_ERROR;
+               dpm_profile_t profile = DPM_PROFILE_NONE;
+
+               __bt_service_get_parameters(in_param1, &profile,
+                               sizeof(int));
+               __bt_service_get_parameters(in_param2, &value,
+                               sizeof(int));
+
+               result = _bt_dpm_set_bluetooth_profile_state(profile, value);
+
+               break;
+       }
+       case BT_DPM_GET_PROFILE_STATE: {
+               dpm_status_t value = DPM_BT_ERROR;
+               dpm_profile_t profile = DPM_PROFILE_NONE;
+
+               __bt_service_get_parameters(in_param2, &profile,
+                               sizeof(int));
+
+               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: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               __bt_service_get_parameters(in_param1, &value,
+                               sizeof(int));
+
+               result = _bt_dpm_set_bluetooth_desktop_connectivity_state(value);
+
+               break;
+       }
+       case BT_DPM_GET_DESKROP_CONNECTIVITY_STATE: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               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: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               __bt_service_get_parameters(in_param1, &value,
+                               sizeof(int));
+
+               result = _bt_dpm_set_bluetooth_discoverable_state(value);
+
+               break;
+       }
+       case BT_DPM_GET_DISCOVERABLE_STATE: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               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: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               __bt_service_get_parameters(in_param1, &value,
+                               sizeof(int));
+
+               result = _bt_dpm_set_bluetooth_limited_discoverable_state(value);
+
+               break;
+       }
+       case BT_DPM_GET_LIMITED_DISCOVERABLE_STATE: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               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: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               __bt_service_get_parameters(in_param1, &value,
+                               sizeof(int));
+
+               result = _bt_dpm_set_bluetooth_data_transfer_state(value);
+
+               break;
+       }
+       case BT_DPM_GET_DATA_TRANSFER_STATE: {
+               dpm_status_t value = DPM_BT_ERROR;
+
+               value = _bt_dpm_get_allow_bluetooth_data_transfer_state();
+               result = DPM_RESULT_SUCCESS;
+               g_array_append_vals(*out_param1, &value, sizeof(int));
+
+               break;
+       }
        default:
                result = BLUETOOTH_ERROR_INTERNAL;
                break;
@@ -1469,6 +1923,7 @@ int __bt_obexd_request(int function_name,
                GVariant *in_param2,
                GVariant *in_param3,
                GVariant *in_param4,
+               GVariant *in_param5,
                GArray **out_param1)
 {
        BT_DBG("+");
@@ -1485,6 +1940,14 @@ int __bt_obexd_request(int function_name,
                bt_file_path_t path;
                char **file_path;
                int file_count;
+               GDBusProxy *process_proxy;
+               guint owner_pid = 0;
+               int opp_server_pid = 0;
+               const gchar *owner_sender_name =  NULL;
+               GDBusConnection *owner_connection = NULL;
+               GVariant *val_get = NULL;
+               GError *error_connection = NULL;
+               GError *errro_proxy = NULL;
                GArray *param2;
 
                __bt_service_get_parameters(in_param1, &address,
@@ -1501,17 +1964,77 @@ int __bt_obexd_request(int function_name,
                        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,
-                                               &address, file_path,
-                                               file_count);
+
+               owner_connection = g_dbus_method_invocation_get_connection(context);
+               owner_sender_name = g_dbus_method_invocation_get_sender(context);
+
+               BT_DBG("sender = %s", owner_sender_name);
+
+               process_proxy = g_dbus_proxy_new_sync(owner_connection,
+                                                 G_DBUS_PROXY_FLAGS_NONE,
+                                                 NULL,
+                                                 "org.freedesktop.DBus",
+                                                 "/org/freedesktop/DBus",
+                                                 "org.freedesktop.DBus",
+                                                 NULL, &error_connection);
+
+               if (process_proxy == NULL)
+                       BT_DBG("Fail to get process_proxy");
+
+               if (error_connection) {
+                       BT_DBG("Fail to get proxy : %s", error_connection->message);
+                       g_error_free(error_connection);
+                       error_connection = NULL;
+               }
+
+               if (process_proxy) {
+                       val_get = g_dbus_proxy_call_sync(process_proxy,
+                                                       "GetConnectionUnixProcessID",
+                                                       g_variant_new("(s)", owner_sender_name),
+                                                       G_DBUS_CALL_FLAGS_NONE,
+                                                       -1,     NULL,
+                                                       &errro_proxy);
+
+                       if (val_get == NULL) {
+                               BT_DBG("Fail to get pid");
+                       } else {
+                               g_variant_get(val_get, "(u)", &owner_pid);
+                               BT_DBG("request is from pid %d\n", owner_pid);
+                       }
+
+                       if (errro_proxy) {
+                               g_error("Unable to get PID for %s: %s",
+                                                 owner_sender_name, errro_proxy->message);
+                               g_error_free(errro_proxy);
+                               errro_proxy = NULL;
+                       }
+               } else {
+                       BT_DBG("fail to get proxy");
+               }
+
+               opp_server_pid = _bt_obex_get_native_pid();
+
+               BT_DBG("owner_pid, agent_info.native_server->app_pid = %d, %d",
+                                       owner_pid, opp_server_pid);
+               if (opp_server_pid == owner_pid) {
+                       BT_DBG("The exception case : _bt_opp_client_push_files");
+                       result = _bt_opp_client_push_files(request_id, context,
+                                                               &address, file_path,
+                                                               file_count);
+               } else {
+            BT_DBG("normal case");
+            result = _bt_opp_client_push_files(request_id, context,
+                                                       &address, file_path,
+                                                       file_count);
+               }
 
                for (i = 0; i < file_count; i++) {
                        g_free(file_path[i]);
                }
                g_free(file_path);
                g_array_free(param2, TRUE);
-
+               if (process_proxy)
+                       g_object_unref(process_proxy);
                break;
        }
        case BT_OPP_CANCEL_PUSH: {
@@ -1541,7 +2064,6 @@ int __bt_obexd_request(int function_name,
                                sizeof(gboolean));
                __bt_service_get_parameters(in_param3, &app_pid,
                                sizeof(int));
-
                result = _bt_obex_server_allocate(sender,
                                path, app_pid, is_native);
 
@@ -1583,7 +2105,6 @@ int __bt_obexd_request(int function_name,
                char *file_name;
 
                file_name = (char *)g_variant_get_data(in_param1);
-
                result = _bt_obex_server_accept_authorize(file_name, TRUE);
 
                break;
@@ -1601,8 +2122,8 @@ int __bt_obexd_request(int function_name,
                __bt_service_get_parameters(in_param2, &is_native,
                                sizeof(gboolean));
 
-               result = _bt_obex_server_set_destination_path(destination_path,
-                                                       is_native);
+               result = _bt_obex_server_set_destination_path(
+                               destination_path, is_native);
 
                break;
        }
@@ -1893,8 +2414,8 @@ gboolean __bt_service_check_privilege(int function_name,
         char *client_creds = NULL;
         char *user_creds = NULL;
         char *client_session = "";
-        int client_creds_method = CLIENT_METHOD_SMACK;
-        int user_creds_method = USER_METHOD_UID;
+        enum cynara_client_creds client_creds_method = CLIENT_METHOD_SMACK;
+        enum cynara_user_creds user_creds_method = USER_METHOD_UID;
         char err_msg[256] = {0, };
 
         retv_if(unique_name == NULL, FALSE);
@@ -1946,6 +2467,7 @@ gboolean __bt_service_check_privilege(int function_name,
         case BT_OOB_REMOVE_REMOTE_DATA:
         case BT_SET_ADVERTISING:
         case BT_SET_CUSTOM_ADVERTISING:
+        case BT_SET_ADVERTISING_PARAMETERS:
         case BT_START_LE_DISCOVERY:
         case BT_STOP_LE_DISCOVERY:
 
@@ -1982,14 +2504,30 @@ gboolean __bt_service_check_privilege(int function_name,
         case BT_AG_DISCONNECT:
         case BT_AV_CONNECT:
         case BT_AV_DISCONNECT:
+        case BT_AV_SOURCE_CONNECT:
+        case BT_AV_SOURCE_DISCONNECT:
         case BT_AVRCP_CONTROL_CONNECT:
         case BT_AVRCP_CONTROL_DISCONNECT:
+        case BT_AVRCP_HANDLE_CONTROL:
+        case BT_AVRCP_SET_TRACK_INFO:
+        case BT_AVRCP_SET_PROPERTY:
+        case BT_AVRCP_SET_PROPERTIES:
+        case BT_AVRCP_CONTROL_SET_PROPERTY:
+
         case BT_HF_CONNECT:
         case BT_HF_DISCONNECT:
 
         case BT_HID_CONNECT:
         case BT_HID_DISCONNECT:
 
+        case BT_HID_DEVICE_ACTIVATE:
+        case BT_HID_DEVICE_DEACTIVATE:
+        case BT_HID_DEVICE_CONNECT:
+        case BT_HID_DEVICE_DISCONNECT:
+        case BT_HID_DEVICE_SEND_MOUSE_EVENT:
+        case BT_HID_DEVICE_SEND_KEY_EVENT:
+        case BT_HID_DEVICE_SEND_REPLY_TO_REPORT:
+
         case BT_CONNECT_LE:
         case BT_DISCONNECT_LE:
 
@@ -2000,6 +2538,43 @@ gboolean __bt_service_check_privilege(int function_name,
         case BT_HDP_DISCONNECT:
         case BT_HDP_SEND_DATA:
 
+        case BT_DPM_SET_ALLOW_BT_MODE:
+        case BT_DPM_GET_ALLOW_BT_MODE:
+        case BT_DPM_SET_DEVICE_RESTRITION:
+        case BT_DPM_GET_DEVICE_RESTRITION:
+        case BT_DPM_SET_UUID_RESTRITION:
+        case BT_DPM_GET_UUID_RESTRITION:
+        case BT_DPM_ADD_DEVICES_BLACKLIST:
+        case BT_DPM_ADD_DEVICES_WHITELIST:
+        case BT_DPM_ADD_UUIDS_BLACKLIST:
+        case BT_DPM_ADD_UUIDS_WHITELIST:
+        case BT_DPM_CLEAR_DEVICES_BLACKLIST:
+        case BT_DPM_CLEAR_DEVICES_WHITELIST:
+        case BT_DPM_CLEAR_UUIDS_BLACKLIST:
+        case BT_DPM_CLEAR_UUIDS_WHITELIST:
+        case BT_DPM_REMOVE_DEVICE_BLACKLIST:
+        case BT_DPM_REMOVE_DEVICE_WHITELIST:
+        case BT_DPM_REMOVE_UUID_BLACKLIST:
+        case BT_DPM_REMOVE_UUID_WHITELIST:
+        case BT_DPM_GET_DEVICES_BLACKLIST:
+        case BT_DPM_GET_DEVICES_WHITELIST:
+        case BT_DPM_GET_UUIDS_BLACKLIST:
+        case BT_DPM_GET_UUIDS_WHITELIST:
+        case BT_DPM_SET_ALLOW_OUTGOING_CALL:
+        case BT_DPM_GET_ALLOW_OUTGOING_CALL:
+        case BT_DPM_SET_PAIRING_STATE:
+        case BT_DPM_GET_PAIRING_STATE:
+        case BT_DPM_SET_PROFILE_STATE:
+        case BT_DPM_GET_PROFILE_STATE:
+        case BT_DPM_SET_DESKROP_CONNECTIVITY_STATE:
+        case BT_DPM_GET_DESKROP_CONNECTIVITY_STATE:
+        case BT_DPM_SET_DISCOVERABLE_STATE:
+        case BT_DPM_GET_DISCOVERABLE_STATE:
+        case BT_DPM_SET_LIMITED_DISCOVERABLE_STATE:
+        case BT_DPM_GET_LIMITED_DISCOVERABLE_STATE:
+        case BT_DPM_SET_DATA_TRANSFER_STATE:
+        case BT_DPM_GET_DATA_TRANSFER_STATE:
+
         case BT_NETWORK_ACTIVATE:
         case BT_NETWORK_DEACTIVATE:
         case BT_NETWORK_CONNECT:
@@ -2011,6 +2586,13 @@ gboolean __bt_service_check_privilege(int function_name,
         case BT_GATT_SET_PROPERTY_REQUEST:
         case BT_GATT_READ_CHARACTERISTIC:
         case BT_GATT_DISCOVER_CHARACTERISTICS_DESCRIPTOR:
+               case BT_PBAP_CONNECT:
+               case BT_PBAP_DISCONNECT:
+               case BT_PBAP_GET_PHONEBOOK_SIZE:
+               case BT_PBAP_GET_PHONEBOOK:
+               case BT_PBAP_GET_LIST:
+               case BT_PBAP_PULL_VCARD:
+               case BT_PBAP_PHONEBOOK_SEARCH:
                 ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds,
                                                                                  BT_PRIVILEGE_PUBLIC);
 
@@ -2018,6 +2600,18 @@ gboolean __bt_service_check_privilege(int function_name,
                         BT_ERR("Fail to access: %s", BT_PRIVILEGE_PUBLIC);
                         result = FALSE;
                 }
+
+                               /* Need to check mediastorage privilege */
+                               if (function_name == BT_PBAP_GET_PHONEBOOK ||
+                                        function_name == BT_PBAP_PULL_VCARD) {
+                       ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds,
+                                                                    MEDIASTORAGE_PRIVILEGE);
+
+                       if (ret_val != CYNARA_API_ACCESS_ALLOWED) {
+                               BT_ERR("Fail to access: %s", MEDIASTORAGE_PRIVILEGE);
+                               result = FALSE;
+                       }
+                               }
         break;
 
         case BT_ENABLE_ADAPTER:
@@ -2041,11 +2635,6 @@ gboolean __bt_service_check_privilege(int function_name,
         case BT_RFCOMM_REJECT_CONNECTION:
         case BT_RFCOMM_LISTEN:
 
-        case BT_AVRCP_SET_TRACK_INFO:
-        case BT_AVRCP_SET_PROPERTY:
-        case BT_AVRCP_SET_PROPERTIES:
-        case BT_AVRCP_HANDLE_CONTROL:
-        case BT_AVRCP_CONTROL_SET_PROPERTY:
         case BT_AVRCP_CONTROL_GET_PROPERTY:
         case BT_AVRCP_GET_TRACK_INFO:
 
@@ -2053,6 +2642,10 @@ gboolean __bt_service_check_privilege(int function_name,
         case BT_BOND_DEVICE_BY_TYPE:
         case BT_SET_LE_PRIVACY:
         case BT_LE_CONN_UPDATE:
+       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:
                 ret_val = cynara_check(p_cynara, client_creds, client_session, user_creds,
                                                                                  BT_PRIVILEGE_PLATFORM);