Adapt device disconnect to BT HAL framework

[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 ad15ee8..80ffd76 100644 (file)
--- a/bt-service-adaptation/services/bt-request-handler.c
+++ b/bt-service-adaptation/services/bt-request-handler.c
@@ -257,10 +257,21 @@ void _bt_save_invocation_context(GDBusMethodInvocation *invocation, int result,
 static int __bt_bm_request_data(_bt_battery_data_t *latest)
 {
         int ret = _bt_bm_read_data(latest);
-       if (ret == BLUETOOTH_ERROR_NONE)
-               BT_DBG("Received data from battery monitor plugin: %ld %ld %d %d",
+       if (ret == BLUETOOTH_ERROR_NONE) {
+               BT_DBG("Received data from bluetooth battery monitor: %ld %ld %d %d",
                        latest->session_start_time, latest->session_end_time,
                                latest->session_scan_time, latest->session_connected_time);
+
+               if (latest->atm_list == NULL) {
+                       BT_DBG("No app data transaction for this session");
+                       return ret;
+               }
+
+               for (GSList *l = latest->atm_list; l != NULL; l = g_slist_next(l)) {
+                       _bt_battery_app_data_t *t = (_bt_battery_app_data_t *)(l->data);
+                       BT_DBG("%ld %ld %d %d", (long int)(t->uid), (long int)(t->pid), t->rx_bytes, t->tx_bytes);
+               }
+       }
        else
                BT_ERR("Error encountered");
         return ret;
@@ -457,9 +468,29 @@ int __bt_bluez_request(int function_name,
                result = _bt_reset_adapter();
                break;
        case BT_BATTERY_READ_DATA: {
-               _bt_battery_data_t data;
-               result = __bt_bm_request_data(&data);
-               g_array_append_vals(*out_param1, &data, sizeof(_bt_battery_data_t));
+               _bt_battery_data_t *data = NULL;
+               data = g_malloc0(sizeof(_bt_battery_data_t));
+               result = __bt_bm_request_data(data);
+
+               bt_battery_dbus_data_t dbus_data;
+               memset(&dbus_data, 0, sizeof(bt_battery_dbus_data_t));
+               dbus_data.session_start_time = data->session_start_time;
+               dbus_data.session_end_time = data->session_end_time;
+               dbus_data.session_scan_time = data->session_scan_time;
+               dbus_data.session_connected_time = data->session_connected_time;
+
+               /*Populating app data*/
+               int n = 0;
+               for (GSList *l = data->atm_list; l != NULL; l = g_slist_next(l)) {
+                       bt_battery_app_data *t = (bt_battery_app_data *)(l->data);
+                       memcpy(&dbus_data.app_data[n], t, sizeof(bt_battery_app_data));
+                       n++;
+               }
+               dbus_data.num_app = n;
+               g_array_append_vals(*out_param1, &dbus_data, sizeof(bt_battery_dbus_data_t));
+               g_slist_free(data->atm_list);
+               g_free(data);
+               data = NULL;
                break;
        }
        case BT_CHECK_ADAPTER: {
@@ -840,6 +871,13 @@ int __bt_bluez_request(int function_name,
                result = _bt_set_authorization(&address, authorize);
                break;
        }
+       case BT_SET_LE_PRIVACY: {
+              gboolean set_privacy;
+              __bt_service_get_parameters(in_param1, &set_privacy,
+                               sizeof(gboolean));
+              result = _bt_set_le_privacy(set_privacy);
+              break;
+       }
        case BT_ADD_WHITE_LIST: {
                bluetooth_device_address_t address = { {0} };
                int address_type = 0;
@@ -1412,6 +1450,28 @@ int __bt_bluez_request(int function_name,
                result = BLUETOOTH_ERROR_NONE;
                break;
        }
+       case BT_RFCOMM_SEND_RX_DETAILS: {
+               uid_t uid;
+               pid_t pid;
+               int size;
+               __bt_service_get_parameters(in_param1, &uid, sizeof(uid_t));
+               __bt_service_get_parameters(in_param2, &pid, sizeof(pid_t));
+               __bt_service_get_parameters(in_param3, &size, sizeof(int));
+               BT_DBG("Sending details to bluetooth battery monitor: %ld, %ld, %d", (long int)uid, (long int)pid, size);
+               _bt_bm_add_transaction_details(uid, pid, size, RX_DATA);
+               break;
+       }
+       case BT_RFCOMM_SEND_TX_DETAILS: {
+               uid_t uid;
+               pid_t pid;
+               int size;
+               __bt_service_get_parameters(in_param1, &uid, sizeof(uid_t));
+               __bt_service_get_parameters(in_param2, &pid, sizeof(pid_t));
+               __bt_service_get_parameters(in_param3, &size, sizeof(int));
+               BT_DBG("Sending details to bluetooth battery monitor: %ld, %ld, %d", (long int)uid, (long int)pid, size);
+               _bt_bm_add_transaction_details(uid, pid, size, TX_DATA);
+               break;
+        }
        case BT_AUDIO_SELECT_ROLE: {
                bluetooth_audio_role_t role;
 
@@ -3028,6 +3088,15 @@ normal:
                g_array_append_vals(*out_param1, &is_coded_phy_supported, sizeof(gboolean));
                break;
        }
+       case BT_DISCONNECT_DEVICE: {
+               bluetooth_device_address_t address = { {0} };
+
+               __bt_service_get_parameters(in_param1,
+                               &address, sizeof(bluetooth_device_address_t));
+
+               result = _bt_disconnect_device(&address);
+               break;
+       }
        default:
                BT_INFO("UnSupported function [%d]", function_name);
                result = BLUETOOTH_ERROR_NOT_SUPPORT;
@@ -3854,6 +3923,8 @@ gboolean __bt_service_check_privilege(int function_name,
        }
        break;
 
+       case BT_RFCOMM_SEND_RX_DETAILS:
+        case BT_RFCOMM_SEND_TX_DETAILS:
        case BT_ENABLE_ADAPTER:
        case BT_DISABLE_ADAPTER:
        case BT_RESET_ADAPTER:
@@ -3870,6 +3941,7 @@ gboolean __bt_service_check_privilege(int function_name,
 
        case BT_CANCEL_SEARCH_SERVICE:
        case BT_ENABLE_RSSI:
+       case BT_DISCONNECT_DEVICE:
 
        case BT_RFCOMM_ACCEPT_CONNECTION:
        case BT_RFCOMM_REJECT_CONNECTION: