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

Commit ae69274a authored by Chris Manton's avatar Chris Manton
Browse files

Trim back invalid handle definitions 

BTM_SEC_INVALID_HANDLE
BTM_INVALID_HCI_HANDLE

Working towards encapsulation of tACL_CONN

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: I464bf3b8efd457f395a0324eb188760cc1ea020a
parent ec8e4328

system/stack/acl/btm_acl.cc

+3 −3
Original line number Diff line number Diff line
@@ -1277,7 +1277,7 @@ uint16_t btm_get_acl_disc_reason_code(void) { 
 * Description      This function is called to get the handle for an ACL

 *                  connection to a specific remote BD Address.

 *

 * Returns          the handle of the connection, or 0xFFFF if none.

 * Returns          the handle of the connection, or HCI_INVALID_HANDLE if none.

 *

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

uint16_t BTM_GetHCIConnHandle(const RawAddress& remote_bda,
@@ -1294,7 +1294,7 @@ uint16_t BTM_GetHCIConnHandle(const RawAddress& remote_bda, 
  }



  /* If here, no BD Addr found */

  return (0xFFFF);

  return HCI_INVALID_HANDLE;

}



/*******************************************************************************
@@ -2186,7 +2186,7 @@ tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr, tBT_TRANSPORT transport) { 
  } else /* otherwise can disconnect right away */

#endif

  {

    if (hci_handle != 0xFFFF && p_dev_rec &&

    if (hci_handle != HCI_INVALID_HANDLE && p_dev_rec &&

        p_dev_rec->sec_state != BTM_SEC_STATE_DISCONNECTING) {

      btsnd_hcic_disconnect(hci_handle, HCI_ERR_PEER_USER);

    } else {

system/stack/btm/btm_int_types.h

+0 −2
Original line number Diff line number Diff line
@@ -230,8 +230,6 @@ typedef struct { 
/* Define the structures needed by security management

*/



#define BTM_SEC_INVALID_HANDLE 0xFFFF



typedef void(tBTM_SCO_IND_CBACK)(uint16_t sco_inx);



/* MACROs to convert from SCO packet types mask to ESCO and back */

system/stack/btm/btm_sco.cc

+5 −6
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ tBTM_STATUS BTM_CreateSco(const RawAddress* remote_bda, bool is_orig, 
      return BTM_ILLEGAL_VALUE;

    }

    acl_handle = BTM_GetHCIConnHandle(*remote_bda, BT_TRANSPORT_BR_EDR);

    if (acl_handle == 0xFFFF) {

    if (acl_handle == HCI_INVALID_HANDLE) {

      LOG(ERROR) << __func__ << ": cannot find ACL handle for remote device "

                 << remote_bda;

      return BTM_UNKNOWN_ADDR;
@@ -517,7 +517,7 @@ tBTM_STATUS BTM_CreateSco(const RawAddress* remote_bda, bool is_orig, 


      p->p_conn_cb = p_conn_cb;

      p->p_disc_cb = p_disc_cb;

      p->hci_handle = BTM_INVALID_HCI_HANDLE;

      p->hci_handle = HCI_INVALID_HANDLE;

      p->is_orig = is_orig;



      if (p->state != SCO_ST_PEND_UNPARK) {
@@ -863,9 +863,8 @@ tBTM_STATUS BTM_RemoveSco(uint16_t sco_inx) { 
    return (BTM_UNKNOWN_ADDR);



  /* If no HCI handle, simply drop the connection and return */

  if (p->hci_handle == BTM_INVALID_HCI_HANDLE ||

      p->state == SCO_ST_PEND_UNPARK) {

    p->hci_handle = BTM_INVALID_HCI_HANDLE;

  if (p->hci_handle == HCI_INVALID_HANDLE || p->state == SCO_ST_PEND_UNPARK) {

    p->hci_handle = HCI_INVALID_HANDLE;

    p->state = SCO_ST_UNUSED;

    p->esco.p_esco_cback = NULL; /* Deregister the eSCO event callback */

    return (BTM_SUCCESS);
@@ -930,7 +929,7 @@ void btm_sco_removed(uint16_t hci_handle, uint8_t reason) { 
      btm_sco_flush_sco_data(xx);



      p->state = SCO_ST_UNUSED;

      p->hci_handle = BTM_INVALID_HCI_HANDLE;

      p->hci_handle = HCI_INVALID_HANDLE;

      p->rem_bd_known = false;

      p->esco.p_esco_cback = NULL; /* Deregister eSCO callback */

      (*p->p_disc_cb)(xx);

system/stack/btm/btm_sec.cc

+22 −23
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ void BTM_PINCodeReply(const RawAddress& bd_addr, uint8_t res, uint8_t pin_len, 
  }



  if ((btm_cb.pairing_flags & BTM_PAIR_FLAGS_WE_STARTED_DD) &&

      (p_dev_rec->hci_handle == BTM_SEC_INVALID_HANDLE) &&

      (p_dev_rec->hci_handle == HCI_INVALID_HANDLE) &&

      (!btm_cb.security_mode_changed)) {

    /* This is start of the dedicated bonding if local device is 2.0 */

    btm_cb.pin_code_len = pin_len;
@@ -823,10 +823,10 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 
  BTM_TRACE_DEBUG("before update sec_flags=0x%x", p_dev_rec->sec_flags);



  /* Finished if connection is active and already paired */

  if (((p_dev_rec->hci_handle != BTM_SEC_INVALID_HANDLE) &&

  if (((p_dev_rec->hci_handle != HCI_INVALID_HANDLE) &&

       transport == BT_TRANSPORT_BR_EDR &&

       (p_dev_rec->sec_flags & BTM_SEC_AUTHENTICATED)) ||

      ((p_dev_rec->ble_hci_handle != BTM_SEC_INVALID_HANDLE) &&

      ((p_dev_rec->ble_hci_handle != HCI_INVALID_HANDLE) &&

       transport == BT_TRANSPORT_LE &&

       (p_dev_rec->sec_flags & BTM_SEC_LE_AUTHENTICATED))) {

    BTM_TRACE_WARNING("BTM_SecBond -> Already Paired");
@@ -903,7 +903,7 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 


  /* If connection already exists... */

  tACL_CONN* p_acl = btm_bda_to_acl(bd_addr, transport);

  if (p_acl && p_acl->hci_handle != BTM_SEC_INVALID_HANDLE) {

  if (p_acl && p_acl->hci_handle != HCI_INVALID_HANDLE) {

    btm_sec_start_authentication(p_dev_rec);



    btm_sec_change_pairing_state(BTM_PAIR_STATE_WAIT_PIN_REQ);
@@ -1042,7 +1042,7 @@ tBTM_STATUS BTM_SecBondCancel(const RawAddress& bd_addr) { 
  if ((btm_cb.pairing_state != BTM_PAIR_STATE_IDLE) &&

      (btm_cb.pairing_flags & BTM_PAIR_FLAGS_WE_STARTED_DD)) {

    /* If the HCI link is up */

    if (p_dev_rec->hci_handle != BTM_SEC_INVALID_HANDLE) {

    if (p_dev_rec->hci_handle != HCI_INVALID_HANDLE) {

      /* If some other thread disconnecting, we do not send second command */

      if ((p_dev_rec->sec_state == BTM_SEC_STATE_DISCONNECTING) ||

          (p_dev_rec->sec_state == BTM_SEC_STATE_DISCONNECTING_BOTH))
@@ -1139,9 +1139,9 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, 
  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);

  if (!p_dev_rec ||

      (transport == BT_TRANSPORT_BR_EDR &&

       p_dev_rec->hci_handle == BTM_SEC_INVALID_HANDLE) ||

       p_dev_rec->hci_handle == HCI_INVALID_HANDLE) ||

      (transport == BT_TRANSPORT_LE &&

       p_dev_rec->ble_hci_handle == BTM_SEC_INVALID_HANDLE)) {

       p_dev_rec->ble_hci_handle == HCI_INVALID_HANDLE)) {

    /* Connection should be up and runnning */

    BTM_TRACE_WARNING("Security Manager: BTM_SetEncryption not connected");
@@ -1357,7 +1357,7 @@ void BTM_PasskeyReqReply(tBTM_STATUS res, const RawAddress& bd_addr, 
    if (p_dev_rec != NULL) {

      btm_cb.acl_cb_.acl_disc_reason = HCI_ERR_HOST_REJECT_SECURITY;



      if (p_dev_rec->hci_handle != BTM_SEC_INVALID_HANDLE)

      if (p_dev_rec->hci_handle != HCI_INVALID_HANDLE)

        btm_sec_send_hci_disconnect(p_dev_rec, HCI_ERR_AUTH_FAILURE,

                                    p_dev_rec->hci_handle);

      else
@@ -2672,7 +2672,7 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, 
   */

  if (p_dev_rec->link_key_not_sent) {

    /* If HCI connection complete has not arrived, wait for it */

    if (p_dev_rec->hci_handle == BTM_SEC_INVALID_HANDLE) return;

    if (p_dev_rec->hci_handle == HCI_INVALID_HANDLE) return;



    p_dev_rec->link_key_not_sent = false;

    btm_send_link_key_notif(p_dev_rec);
@@ -3297,7 +3297,7 @@ static void btm_sec_auth_collision(uint16_t handle) { 


  if ((bluetooth::common::time_get_os_boottime_ms() -

       btm_cb.collision_start_time) < BTM_SEC_MAX_COLLISION_DELAY) {

    if (handle == BTM_SEC_INVALID_HANDLE) {

    if (handle == HCI_INVALID_HANDLE) {

      p_dev_rec = btm_sec_find_dev_by_sec_state(BTM_SEC_STATE_AUTHENTICATING);

      if (p_dev_rec == NULL)

        p_dev_rec = btm_sec_find_dev_by_sec_state(BTM_SEC_STATE_ENCRYPTING);
@@ -4128,7 +4128,7 @@ void btm_sec_disconnected(uint16_t handle, uint8_t reason) { 
  /* see sec_flags processing in btm_acl_removed */



  if (transport == BT_TRANSPORT_LE) {

    p_dev_rec->ble_hci_handle = BTM_SEC_INVALID_HANDLE;

    p_dev_rec->ble_hci_handle = HCI_INVALID_HANDLE;

    p_dev_rec->sec_flags &= ~(BTM_SEC_LE_AUTHENTICATED | BTM_SEC_LE_ENCRYPTED);

    p_dev_rec->enc_key_size = 0;
@@ -4138,7 +4138,7 @@ void btm_sec_disconnected(uint16_t handle, uint8_t reason) { 
      btm_ble_advertiser_notify_terminated_legacy(HCI_SUCCESS, handle);

    }

  } else {

    p_dev_rec->hci_handle = BTM_SEC_INVALID_HANDLE;

    p_dev_rec->hci_handle = HCI_INVALID_HANDLE;

    p_dev_rec->sec_flags &=

        ~(BTM_SEC_AUTHORIZED | BTM_SEC_AUTHENTICATED | BTM_SEC_ENCRYPTED |

          BTM_SEC_ROLE_SWITCHED | BTM_SEC_16_DIGIT_PIN_AUTHED);
@@ -4655,7 +4655,7 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) { 


  /* If any security is required, get the name first */

  if (!(p_dev_rec->sec_flags & BTM_SEC_NAME_KNOWN) &&

      (p_dev_rec->hci_handle != BTM_SEC_INVALID_HANDLE)) {

      (p_dev_rec->hci_handle != HCI_INVALID_HANDLE)) {

    BTM_TRACE_EVENT("Security Manager: Start get name");

    if (!btm_sec_start_get_name(p_dev_rec)) {

      return (BTM_NO_RESOURCES);
@@ -4673,7 +4673,7 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) { 
       (!(p_dev_rec->sec_flags & BTM_SEC_16_DIGIT_PIN_AUTHED) &&

        (!p_dev_rec->is_originator &&

         (p_dev_rec->security_required & BTM_SEC_IN_MIN_16_DIGIT_PIN)))) &&

      (p_dev_rec->hci_handle != BTM_SEC_INVALID_HANDLE)) {

      (p_dev_rec->hci_handle != HCI_INVALID_HANDLE)) {

    /*

     * We rely on BTM_SEC_16_DIGIT_PIN_AUTHED being set if MITM is in use,

     * as 16 DIGIT is only needed if MITM is not used. Unfortunately, the
@@ -4714,8 +4714,7 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) { 
        (p_dev_rec->security_required & BTM_SEC_OUT_ENCRYPT)) ||

       (!p_dev_rec->is_originator &&

        (p_dev_rec->security_required & BTM_SEC_IN_ENCRYPT))) &&

      (p_dev_rec->hci_handle != BTM_SEC_INVALID_HANDLE)) {



      (p_dev_rec->hci_handle != HCI_INVALID_HANDLE)) {

    BTM_TRACE_EVENT("Security Manager: Start encryption");



    btm_sec_start_encryption(p_dev_rec);
@@ -4822,7 +4821,7 @@ static uint8_t btm_sec_start_authorization(tBTM_SEC_DEV_REC* p_dev_rec) { 
  uint8_t service_id;



  if ((p_dev_rec->sec_flags & BTM_SEC_NAME_KNOWN) ||

      (p_dev_rec->hci_handle == BTM_SEC_INVALID_HANDLE)) {

      (p_dev_rec->hci_handle == HCI_INVALID_HANDLE)) {

    if (!btm_cb.api.p_authorize_callback) return (BTM_MODE_UNSUPPORTED);



    service_id =

system/stack/btu/btu_hcif.cc

+2 −2
Original line number Diff line number Diff line
@@ -1414,14 +1414,14 @@ static void btu_hcif_hdl_command_status(uint16_t opcode, uint8_t status, 
      if (status != HCI_SUCCESS) {

        // Device refused to start authentication

        // This is treated as an authentication failure

        btm_sec_auth_complete(BTM_INVALID_HCI_HANDLE, status);

        btm_sec_auth_complete(HCI_INVALID_HANDLE, status);

      }

      break;

    case HCI_SET_CONN_ENCRYPTION:

      if (status != HCI_SUCCESS) {

        // Device refused to start encryption

        // This is treated as an encryption failure

        btm_sec_encrypt_change(BTM_INVALID_HCI_HANDLE, status, false);

        btm_sec_encrypt_change(HCI_INVALID_HANDLE, status, false);

      }

      break;

    case HCI_RMT_NAME_REQUEST: