Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60315752 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Cleanup LE White List HCI interface 

Replace global functions with callbacks, to reduce interface size.

Test: add/remove at least two devices in whitelist, verify HCI snoop log
Bug: 112827989
Change-Id: Id05c9f4970bbb795309a3a233f83559bcc1c56e2
parent aeb98608

system/stack/btm/btm_ble_bgconn.cc

+31 −44
Original line number Diff line number Diff line
@@ -205,6 +205,21 @@ bool btm_add_dev_to_controller(bool to_add, const RawAddress& bd_addr) { 


  return started;

}



/** White list add complete */

void wl_add_complete(uint8_t* p_data, uint16_t /* evt_len */) {

  uint8_t status;

  STREAM_TO_UINT8(status, p_data);

  VLOG(2) << __func__ << ": status=" << loghex(status);

}



/** White list element remove complete */

void wl_remove_complete(uint8_t* p_data, uint16_t /* evt_len */) {

  uint8_t status;

  STREAM_TO_UINT8(status, p_data);

  VLOG(2) << __func__ << ": status=" << loghex(status);

}



/*******************************************************************************

 *

 * Function         btm_execute_wl_dev_operation
@@ -218,8 +233,9 @@ bool btm_execute_wl_dev_operation(void) { 
       map_it != background_connections.end();) {

    BackgroundConnection* connection = &map_it->second;

    if (connection->pending_removal) {

      btsnd_hcic_ble_remove_from_white_list(connection->addr_type_in_wl,

                                            connection->address);

      btsnd_hcic_ble_remove_from_white_list(

          connection->addr_type_in_wl, connection->address,

          base::BindOnce(&wl_remove_complete));

      map_it = background_connections.erase(map_it);

    } else

      ++map_it;
@@ -229,7 +245,8 @@ bool btm_execute_wl_dev_operation(void) { 
    const bool connected =

        BTM_IsAclConnectionUp(connection->address, BT_TRANSPORT_LE);

    if (!connection->in_controller_wl && !connected) {

      btsnd_hcic_ble_add_white_list(connection->addr_type, connection->address);

      btsnd_hcic_ble_add_white_list(connection->addr_type, connection->address,

                                    base::BindOnce(&wl_add_complete));

      connection->in_controller_wl = true;

      connection->addr_type_in_wl = connection->addr_type;

    } else if (connection->in_controller_wl && connected) {
@@ -237,29 +254,15 @@ bool btm_execute_wl_dev_operation(void) { 
         connection between two LE addresses. Not all controllers handle this

         correctly, therefore we must make sure connected devices are not in

         the white list when bg connection attempt is active. */

      btsnd_hcic_ble_remove_from_white_list(connection->addr_type_in_wl,

                                            connection->address);

      btsnd_hcic_ble_remove_from_white_list(

          connection->addr_type_in_wl, connection->address,

          base::BindOnce(&wl_remove_complete));

      connection->in_controller_wl = false;

    }

  }

  return true;

}



/*******************************************************************************

 *

 * Function         btm_ble_clear_white_list_complete

 *

 * Description      Indicates white list cleared.

 *

 ******************************************************************************/

void btm_ble_clear_white_list_complete(uint8_t* p_data,

                                       UNUSED_ATTR uint16_t evt_len) {

  uint8_t status;



  STREAM_TO_UINT8(status, p_data);

  BTM_TRACE_EVENT("%s status=%d", __func__, status);

}



/*******************************************************************************

 *

 * Function         btm_ble_white_list_init
@@ -271,29 +274,6 @@ void btm_ble_white_list_init(uint8_t white_list_size) { 
  BTM_TRACE_DEBUG("%s white_list_size = %d", __func__, white_list_size);

}



/*******************************************************************************

 *

 * Function         btm_ble_add_2_white_list_complete

 *

 * Description      White list element added

 *

 ******************************************************************************/

void btm_ble_add_2_white_list_complete(uint8_t status) {

  BTM_TRACE_EVENT("%s status=%d", __func__, status);

}



/*******************************************************************************

 *

 * Function         btm_ble_remove_from_white_list_complete

 *

 * Description      White list element removal complete

 *

 ******************************************************************************/

void btm_ble_remove_from_white_list_complete(uint8_t* p,

                                             UNUSED_ATTR uint16_t evt_len) {

  BTM_TRACE_EVENT("%s status=%d", __func__, *p);

}



void btm_ble_create_conn_cancel_complete(uint8_t* p) {

  uint8_t status;

  STREAM_TO_UINT8(status, p);
@@ -598,11 +578,18 @@ void BTM_WhiteListRemove(const RawAddress& address) { 
  btm_ble_resume_bg_conn();

}



/** clear white list complete */

void wl_clear_complete(uint8_t* p_data, uint16_t /* evt_len */) {

  uint8_t status;

  STREAM_TO_UINT8(status, p_data);

  VLOG(2) << __func__ << ": status=" << loghex(status);

}



/** Clear the whitelist, end any pending whitelist connections */

void BTM_WhiteListClear() {

  VLOG(1) << __func__;

  if (!controller_get_interface()->supports_ble()) return;

  btm_ble_stop_auto_conn();

  btsnd_hcic_ble_clear_white_list();

  btsnd_hcic_ble_clear_white_list(base::BindOnce(&wl_clear_complete));

  background_connections_clear();

}

system/stack/btm/btm_ble_int.h

+0 −5
Original line number Diff line number Diff line
@@ -118,11 +118,6 @@ extern uint8_t btm_ble_read_sec_key_size(const RawAddress& bd_addr); 
/* white list function */

extern void btm_update_scanner_filter_policy(tBTM_BLE_SFP scan_policy);

extern void btm_update_adv_filter_policy(tBTM_BLE_AFP adv_policy);

extern void btm_read_white_list_size_complete(uint8_t* p, uint16_t evt_len);

extern void btm_ble_add_2_white_list_complete(uint8_t status);

extern void btm_ble_remove_from_white_list_complete(uint8_t* p,

                                                    uint16_t evt_len);

extern void btm_ble_clear_white_list_complete(uint8_t* p, uint16_t evt_len);

extern void btm_ble_white_list_init(uint8_t white_list_size);



/* background connection function */

system/stack/btm/btm_int.h

+0 −4
Original line number Diff line number Diff line
@@ -181,10 +181,6 @@ extern void btm_dev_init(void); 
extern void btm_read_local_name_timeout(void* data);

extern void btm_read_local_name_complete(uint8_t* p, uint16_t evt_len);



extern void btm_ble_add_2_white_list_complete(uint8_t status);

extern void btm_ble_remove_from_white_list_complete(uint8_t* p,

                                                    uint16_t evt_len);

extern void btm_ble_clear_white_list_complete(uint8_t* p, uint16_t evt_len);

extern void btm_ble_create_conn_cancel_complete(uint8_t* p);

extern bool btm_ble_addr_resolvable(const RawAddress& rpa,

                                    tBTM_SEC_DEV_REC* p_dev_rec);

system/stack/btu/btu_hcif.cc

+0 −12
Original line number Diff line number Diff line
@@ -936,18 +936,6 @@ static void btu_hcif_hdl_command_complete(uint16_t opcode, uint8_t* p, 
      break;



    /* BLE Commands sComplete*/

    case HCI_BLE_ADD_WHITE_LIST:

      btm_ble_add_2_white_list_complete(*p);

      break;



    case HCI_BLE_CLEAR_WHITE_LIST:

      btm_ble_clear_white_list_complete(p, evt_len);

      break;



    case HCI_BLE_REMOVE_WHITE_LIST:

      btm_ble_remove_from_white_list_complete(p, evt_len);

      break;



    case HCI_BLE_RAND:

    case HCI_BLE_ENCRYPT:

      btm_ble_rand_enc_complete(p, opcode, (tBTM_RAND_ENC_CB*)p_cplt_cback);

system/stack/hcic/hciblecmds.cc

+18 −32
Original line number Diff line number Diff line
@@ -244,50 +244,36 @@ void btsnd_hcic_ble_create_conn_cancel(void) { 
  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_ble_clear_white_list(void) {

  BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);

  uint8_t* pp = (uint8_t*)(p + 1);



  p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_CLEAR_WHITE_LIST;

  p->offset = 0;



  UINT16_TO_STREAM(pp, HCI_BLE_CLEAR_WHITE_LIST);

  UINT8_TO_STREAM(pp, HCIC_PARAM_SIZE_CLEAR_WHITE_LIST);



  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

void btsnd_hcic_ble_clear_white_list(

    base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

  btu_hcif_send_cmd_with_cb(FROM_HERE, HCI_BLE_CLEAR_WHITE_LIST, nullptr, 0,

                            std::move(cb));

}



void btsnd_hcic_ble_add_white_list(uint8_t addr_type, const RawAddress& bda) {

  BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);

  uint8_t* pp = (uint8_t*)(p + 1);



  p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_ADD_WHITE_LIST;

  p->offset = 0;



  UINT16_TO_STREAM(pp, HCI_BLE_ADD_WHITE_LIST);

  UINT8_TO_STREAM(pp, HCIC_PARAM_SIZE_ADD_WHITE_LIST);

void btsnd_hcic_ble_add_white_list(

    uint8_t addr_type, const RawAddress& bda,

    base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

  uint8_t param[HCIC_PARAM_SIZE_ADD_WHITE_LIST];

  uint8_t* pp = param;



  UINT8_TO_STREAM(pp, addr_type);

  BDADDR_TO_STREAM(pp, bda);



  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

  btu_hcif_send_cmd_with_cb(FROM_HERE, HCI_BLE_ADD_WHITE_LIST, param,

                            HCIC_PARAM_SIZE_ADD_WHITE_LIST, std::move(cb));

}



void btsnd_hcic_ble_remove_from_white_list(uint8_t addr_type,

                                           const RawAddress& bda) {

  BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);

  uint8_t* pp = (uint8_t*)(p + 1);



  p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_REMOVE_WHITE_LIST;

  p->offset = 0;



  UINT16_TO_STREAM(pp, HCI_BLE_REMOVE_WHITE_LIST);

  UINT8_TO_STREAM(pp, HCIC_PARAM_SIZE_REMOVE_WHITE_LIST);

void btsnd_hcic_ble_remove_from_white_list(

    uint8_t addr_type, const RawAddress& bda,

    base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

  uint8_t param[HCIC_PARAM_SIZE_REMOVE_WHITE_LIST];

  uint8_t* pp = param;



  UINT8_TO_STREAM(pp, addr_type);

  BDADDR_TO_STREAM(pp, bda);



  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

  btu_hcif_send_cmd_with_cb(FROM_HERE, HCI_BLE_REMOVE_WHITE_LIST, param,

                            HCIC_PARAM_SIZE_REMOVE_WHITE_LIST, std::move(cb));

}



void btsnd_hcic_ble_upd_ll_conn_params(uint16_t handle, uint16_t conn_int_min,