Add missed function names to check privilege.

[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 38ec417..fba1726 100644 (file)
--- a/bt-service/bt-request-handler.c
+++ b/bt-service/bt-request-handler.c
@@ -263,19 +263,16 @@ static void __bt_service_method(GDBusConnection *connection,
 
                                GVariant *temp = g_variant_new("(iv)", result, out_var);
                                g_dbus_method_invocation_return_value(invocation, temp);
-
-                               g_array_free(out_param1, TRUE);
-                               out_param1 = NULL;
                        }
                }
                /* TODO: MAP? see the if{}else{} above */
 
+               g_array_free(out_param1, TRUE);
                g_variant_unref(param1);
                g_variant_unref(param2);
                g_variant_unref(param3);
                g_variant_unref(param4);
                g_variant_unref(param5);
-//             g_free(sender);
                FN_END;
                return;
 fail:
@@ -300,7 +297,6 @@ fail:
                g_variant_unref(param3);
                g_variant_unref(param4);
                g_variant_unref(param5);
-//             g_free(sender);
        }
 
        FN_END;
@@ -1028,37 +1024,6 @@ 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} };
 
@@ -3053,9 +3018,6 @@ gboolean __bt_service_check_privilege(int function_name,
        char err_msg[256] = {0, };
 
        retv_if(unique_name == NULL, FALSE);
-
-       BT_DBG("unique_name: %s", unique_name);
-
        retv_if(bt_service_conn == NULL, FALSE);
 
        ret_val = cynara_creds_get_default_client_method(&client_creds_method);
@@ -3079,8 +3041,6 @@ gboolean __bt_service_check_privilege(int function_name,
                return FALSE;
        }
 
-       BT_DBG("client_creds: %s", client_creds);
-
        ret_val = cynara_creds_gdbus_get_user(bt_service_conn, unique_name, user_creds_method, &user_creds);
        if (ret_val != CYNARA_API_SUCCESS) {
                cynara_strerror(ret_val, err_msg, sizeof(err_msg));
@@ -3090,7 +3050,7 @@ gboolean __bt_service_check_privilege(int function_name,
                return FALSE;
        }
 
-       BT_DBG("user_creds: %s", user_creds);
+       BT_DBG("%s, %s, %s", unique_name, client_creds, user_creds);
 
        switch (function_name) {
        case BT_SET_LOCAL_NAME:
@@ -3271,7 +3231,6 @@ 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_PROFILE_RESTRICTED:
 
        case BT_CANCEL_SEARCH_SERVICE:
        case BT_ENABLE_RSSI:
@@ -3279,6 +3238,10 @@ gboolean __bt_service_check_privilege(int function_name,
        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:
 
        case BT_AVRCP_CONTROL_GET_PROPERTY:
        case BT_AVRCP_GET_TRACK_INFO:
@@ -3366,6 +3329,8 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_GET_BONDED_DEVICES:
        case BT_GET_PROFILE_CONNECTED_DEVICES:
        case BT_GET_BONDED_DEVICE:
+       case BT_PASSKEY_REPLY:
+       case BT_PASSKEY_CONFIRMATION_REPLY:
        case BT_GET_IS_ALIAS_SET:
        case BT_IS_DEVICE_CONNECTED:
        case BT_GET_CONNECTED_LINK_TYPE:
@@ -3379,7 +3344,6 @@ gboolean __bt_service_check_privilege(int function_name,
        case BT_GET_ADVERTISING_DATA:
        case BT_GET_SCAN_RESPONSE_DATA:
        case BT_IS_ADVERTISING:
-       case BT_GET_PROFILE_RESTRICTED:
        case BT_REGISTER_SCAN_FILTER:
        case BT_UNREGISTER_SCAN_FILTER:
        case BT_UNREGISTER_ALL_SCAN_FILTERS: