Disable GATT Client fd based function

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

diff --git a/bt-service-adaptation/services/bt-request-handler.c b/bt-service-adaptation/services/bt-request-handler.c
index 28a950a..3fa19cb 100644 (file)
--- a/bt-service-adaptation/services/bt-request-handler.c
+++ b/bt-service-adaptation/services/bt-request-handler.c
@@ -1898,10 +1898,10 @@ int __bt_bluez_request(int function_name,
 
                __bt_service_get_parameters(in_param1,
                                adv_handle, sizeof(int));
-               __bt_service_get_parameters(in_param2,
-                               &adv, sizeof(bluetooth_advertising_data_t));
                __bt_service_get_parameters(in_param3,
                                &length, sizeof(int));
+               __bt_service_get_parameters(in_param2,
+                               &adv, length);
                __bt_service_get_parameters(in_param4,
                                &use_reserved_slot, sizeof(gboolean));
                result = _bt_set_advertising_data(app, *adv_handle,
@@ -1927,10 +1927,10 @@ int __bt_bluez_request(int function_name,
 
                __bt_service_get_parameters(in_param1,
                                adv_handle, sizeof(int));
-               __bt_service_get_parameters(in_param2,
-                               &rsp, sizeof(bluetooth_scan_resp_data_t));
                __bt_service_get_parameters(in_param3,
                                &length, sizeof(int));
+               __bt_service_get_parameters(in_param2,
+                               &rsp, length);
                __bt_service_get_parameters(in_param4,
                                &use_reserved_slot, sizeof(gboolean));
 
@@ -2446,6 +2446,7 @@ int __bt_bluez_request(int function_name,
                /* Add socket fd to unix_fd_list */
                fd_list = g_unix_fd_list_new();
                g_unix_fd_list_append(fd_list, fd, &error);
+               g_assert_no_error(error);
 
                _bt_service_method_return_with_unix_fd_list(
                                context, *out_param1, result, fd_list);
@@ -2705,6 +2706,10 @@ int __bt_bluez_request(int function_name,
                __bt_service_get_parameters(in_param4, &is_indicate,
                                sizeof(gboolean));
 
+#ifdef TIZEN_FEATURE_BT_GATT_CLIENT_FD_DISABLE
+               goto normal;
+#endif
+
                if (is_indicate == false) {
                        result   = _bt_gatt_acquire_notify(&param , &fd, &mtu);
                        if (BLUETOOTH_ERROR_NONE == result && fd > -1) {