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

Commit 3b273d39 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

ACL: Refactor remote version/feature response 

Separate the packet parsing and handling part, so that we can parse the
packet in GD L2cap and handle it in legacy stack.
When GD L2cap is enabled, don't send these request in legacy stack.

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Test: Pair and connect with a headset
Change-Id: I8be299f1e61cb790ce0d0b7a81d3e6a99bc8d336
parent 8ea3c8a7

system/stack/acl/acl.h

+7 −4
Original line number Diff line number Diff line
@@ -221,12 +221,15 @@ typedef struct { 
  friend void btm_read_automatic_flush_timeout_complete(uint8_t* p);

  friend void btm_read_failed_contact_counter_complete(uint8_t* p);

  friend void btm_read_link_quality_complete(uint8_t* p);

  friend void btm_read_remote_ext_features_complete(uint8_t* p,

                                                    uint8_t evt_len);

  friend void btm_read_remote_ext_features_complete(uint16_t handle,

                                                    uint8_t page_num,

                                                    uint8_t max_page,

                                                    uint8_t* features);

  friend void btm_read_remote_ext_features_failed(uint8_t status,

                                                  uint16_t handle);

  friend void btm_read_remote_features_complete(uint8_t* p);

  friend void btm_read_remote_version_complete(uint8_t* p);

  friend void btm_read_remote_features_complete(uint16_t handle,

                                                uint8_t* features);

  friend void btm_read_remote_version_complete_raw(uint8_t* p);

  friend void btm_read_rssi_complete(uint8_t* p);

  friend void btm_read_tx_power_complete(uint8_t* p, bool is_ble);

system/stack/acl/btm_acl.cc

+46 −20
Original line number Diff line number Diff line
@@ -393,8 +393,11 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle, 
  /* if BR/EDR do something more */

  if (transport == BT_TRANSPORT_BR_EDR) {

    btsnd_hcic_read_rmt_clk_offset(hci_handle);

    if (!bluetooth::shim::is_gd_l2cap_enabled()) {

      // GD L2cap reads this automatically

      btsnd_hcic_rmt_ver_req(hci_handle);

    }

  }



  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(hci_handle);

  if (p_dev_rec == nullptr) {
@@ -844,7 +847,7 @@ void btm_process_remote_version_complete(uint8_t status, uint16_t handle, 
  }

}



void btm_read_remote_version_complete(uint8_t* p) {

void btm_read_remote_version_complete_raw(uint8_t* p) {

  uint8_t status;

  uint16_t handle;

  uint8_t lmp_version;
@@ -857,6 +860,14 @@ void btm_read_remote_version_complete(uint8_t* p) { 
  STREAM_TO_UINT16(manufacturer, p);

  STREAM_TO_UINT16(lmp_subversion, p);



  btm_read_remote_version_complete(status, handle, lmp_version, manufacturer,

                                   lmp_version);

}



void btm_read_remote_version_complete(uint8_t status, uint16_t handle,

                                      uint8_t lmp_version,

                                      uint16_t manufacturer,

                                      uint16_t lmp_subversion) {

  btm_process_remote_version_complete(status, handle, lmp_version, manufacturer,

                                      lmp_subversion);

  maybe_chain_more_commands_after_read_remote_version_complete(status, handle);
@@ -952,6 +963,10 @@ void StackAclBtmAcl::btm_read_remote_features(uint16_t handle) { 
  /* first send read remote supported features HCI command */

  /* because we don't know whether the remote support extended feature command

   */

  if (bluetooth::shim::is_gd_l2cap_enabled()) {

    // GD L2cap reads this automatically

    return;

  }

  btsnd_hcic_rmt_features_req(handle);

}
@@ -966,6 +981,10 @@ void StackAclBtmAcl::btm_read_remote_features(uint16_t handle) { 
 *

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

void btm_read_remote_ext_features(uint16_t handle, uint8_t page_number) {

  if (bluetooth::shim::is_gd_l2cap_enabled()) {

    // GD L2cap reads this automatically

    return;

  }

  btsnd_hcic_rmt_ext_features(handle, page_number);

}
@@ -979,11 +998,9 @@ void btm_read_remote_ext_features(uint16_t handle, uint8_t page_number) { 
 * Returns          void

 *

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

void btm_read_remote_features_complete(uint8_t* p) {

  tACL_CONN* p_acl_cb;

void btm_read_remote_features_complete_raw(uint8_t* p) {

  uint8_t status;

  uint16_t handle;

  uint8_t acl_idx;



  STREAM_TO_UINT8(status, p);
@@ -995,16 +1012,20 @@ void btm_read_remote_features_complete(uint8_t* p) { 


  STREAM_TO_UINT16(handle, p);



  acl_idx = btm_handle_to_acl_index(handle);

  btm_read_remote_features_complete(handle, p);

}



void btm_read_remote_features_complete(uint16_t handle, uint8_t* features) {

  uint16_t acl_idx = btm_handle_to_acl_index(handle);

  if (acl_idx >= MAX_L2CAP_LINKS) {

    LOG_WARN("Unable to find active acl");

    return;

  }



  p_acl_cb = &btm_cb.acl_cb_.acl_db[acl_idx];

  tACL_CONN* p_acl_cb = &btm_cb.acl_cb_.acl_db[acl_idx];



  /* Copy the received features page */

  STREAM_TO_ARRAY(p_acl_cb->peer_lmp_feature_pages[0], p,

  STREAM_TO_ARRAY(p_acl_cb->peer_lmp_feature_pages[0], features,

                  HCI_FEATURE_BYTES_PER_PAGE);



  if ((HCI_LMP_EXTENDED_SUPPORTED(p_acl_cb->peer_lmp_feature_pages[0])) &&
@@ -1036,11 +1057,9 @@ void btm_read_remote_features_complete(uint8_t* p) { 
 * Returns          void

 *

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

void btm_read_remote_ext_features_complete(uint8_t* p, uint8_t evt_len) {

  tACL_CONN* p_acl_cb;

void btm_read_remote_ext_features_complete_raw(uint8_t* p, uint8_t evt_len) {

  uint8_t page_num, max_page;

  uint16_t handle;

  uint8_t acl_idx;



  if (evt_len < HCI_EXT_FEATURES_SUCCESS_EVT_LEN) {

    android_errorWriteLog(0x534e4554, "141552859");
@@ -1053,13 +1072,6 @@ void btm_read_remote_ext_features_complete(uint8_t* p, uint8_t evt_len) { 
  STREAM_TO_UINT8(page_num, p);

  STREAM_TO_UINT8(max_page, p);



  /* Validate parameters */

  acl_idx = btm_handle_to_acl_index(handle);

  if (acl_idx >= MAX_L2CAP_LINKS) {

    LOG_WARN("Unable to find active acl");

    return;

  }



  if (max_page > HCI_EXT_FEATURES_PAGE_MAX) {

    LOG_WARN("Too many max pages read page=%d unknown", max_page);

    return;
@@ -1075,10 +1087,24 @@ void btm_read_remote_ext_features_complete(uint8_t* p, uint8_t evt_len) { 
    LOG_WARN("num_page=%d, max_page=%d invalid", page_num, max_page);

  }



  p_acl_cb = &btm_cb.acl_cb_.acl_db[acl_idx];

  btm_read_remote_ext_features_complete(handle, page_num, max_page, p);

}



void btm_read_remote_ext_features_complete(uint16_t handle, uint8_t page_num,

                                           uint8_t max_page,

                                           uint8_t* features) {

  /* Validate parameters */

  uint16_t acl_idx = btm_handle_to_acl_index(handle);



  if (acl_idx >= MAX_L2CAP_LINKS) {

    LOG_WARN("Unable to find active acl");

    return;

  }



  auto* p_acl_cb = &btm_cb.acl_cb_.acl_db[acl_idx];



  /* Copy the received features page */

  STREAM_TO_ARRAY(p_acl_cb->peer_lmp_feature_pages[page_num], p,

  STREAM_TO_ARRAY(p_acl_cb->peer_lmp_feature_pages[page_num], features,

                  HCI_FEATURE_BYTES_PER_PAGE);



  /* If there is the next remote features page and

system/stack/btu/btu_hcif.cc

+3 −3
Original line number Diff line number Diff line
@@ -297,13 +297,13 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_msg) { 
      btu_hcif_encryption_key_refresh_cmpl_evt(p);

      break;

    case HCI_READ_RMT_FEATURES_COMP_EVT:

      btm_read_remote_features_complete(p);

      btm_read_remote_features_complete_raw(p);

      break;

    case HCI_READ_RMT_EXT_FEATURES_COMP_EVT:

      btu_hcif_read_rmt_ext_features_comp_evt(p, hci_evt_len);

      break;

    case HCI_READ_RMT_VERSION_COMP_EVT:

      btm_read_remote_version_complete(p);

      btm_read_remote_version_complete_raw(p);

      break;

    case HCI_COMMAND_COMPLETE_EVT:

      LOG_ERROR(
@@ -1147,7 +1147,7 @@ static void btu_hcif_read_rmt_ext_features_comp_evt(uint8_t* p, 
  STREAM_TO_UINT8(status, p_cur);



  if (status == HCI_SUCCESS)

    btm_read_remote_ext_features_complete(p, evt_len);

    btm_read_remote_ext_features_complete_raw(p, evt_len);

  else {

    STREAM_TO_UINT16(handle, p_cur);

    btm_read_remote_ext_features_failed(status, handle);

system/stack/include/acl_hci_link_interface.h

+10 −3
Original line number Diff line number Diff line
@@ -45,10 +45,17 @@ void btm_process_clk_off_comp_evt(uint16_t hci_handle, uint16_t clock_offset); 
void btm_read_automatic_flush_timeout_complete(uint8_t* p);

void btm_read_failed_contact_counter_complete(uint8_t* p);

void btm_read_link_quality_complete(uint8_t* p);

void btm_read_remote_ext_features_complete(uint8_t* p, uint8_t evt_len);

void btm_read_remote_ext_features_complete_raw(uint8_t* p, uint8_t evt_len);

void btm_read_remote_ext_features_complete(uint16_t handle, uint8_t page_num,

                                           uint8_t max_page, uint8_t* features);

void btm_read_remote_ext_features_failed(uint8_t status, uint16_t handle);

void btm_read_remote_features_complete(uint8_t* p);

void btm_read_remote_version_complete(uint8_t* p);

void btm_read_remote_features_complete_raw(uint8_t* p);

void btm_read_remote_features_complete(uint16_t handle, uint8_t* features);

void btm_read_remote_version_complete_raw(uint8_t* p);

void btm_read_remote_version_complete(uint8_t status, uint16_t handle,

                                      uint8_t lmp_version,

                                      uint16_t manufacturer,

                                      uint16_t lmp_subversion);

void btm_read_rssi_complete(uint8_t* p);

void btm_read_tx_power_complete(uint8_t* p, bool is_ble);