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

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

Because 'p' is a terrible variable name 

stack/btm/btm_sec
stack/btm/btm_ble

Also co-locate definitions/use

Working towards encapsulation of tACL_CONN

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia293adc25ffc0f5e09dac25219bceb4827315276
parent 0384b527

system/stack/btm/btm_ble.cc

+9 −9
Original line number Diff line number Diff line
@@ -252,17 +252,17 @@ bool BTM_ReadRemoteConnectionAddr(const RawAddress& pseudo_addr, 
  }

  bool st = true;

#if (BLE_PRIVACY_SPT == TRUE)

  tACL_CONN* p = btm_bda_to_acl(pseudo_addr, BT_TRANSPORT_LE);

  tACL_CONN* p_acl = btm_bda_to_acl(pseudo_addr, BT_TRANSPORT_LE);



  if (p == NULL) {

  if (p_acl == NULL) {

    BTM_TRACE_ERROR(

        "BTM_ReadRemoteConnectionAddr can not find connection"

        " with matching address");

    return false;

  }



  conn_addr = p->active_remote_addr;

  *p_addr_type = p->active_remote_addr_type;

  conn_addr = p_acl->active_remote_addr;

  *p_addr_type = p_acl->active_remote_addr_type;

#else

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(pseudo_addr);
@@ -701,17 +701,17 @@ bool BTM_UseLeLink(const RawAddress& bd_addr) { 
  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::BTM_UseLeLink(bd_addr);

  }

  tACL_CONN* p;

  tACL_CONN* p_acl;

  tBT_DEVICE_TYPE dev_type;

  tBLE_ADDR_TYPE addr_type;

  bool use_le = false;



  p = btm_bda_to_acl(bd_addr, BT_TRANSPORT_BR_EDR);

  if (p != NULL) {

  p_acl = btm_bda_to_acl(bd_addr, BT_TRANSPORT_BR_EDR);

  if (p_acl != NULL) {

    return use_le;

  } else {

    p = btm_bda_to_acl(bd_addr, BT_TRANSPORT_LE);

    if (p != NULL) {

    p_acl = btm_bda_to_acl(bd_addr, BT_TRANSPORT_LE);

    if (p_acl != NULL) {

      use_le = true;

    } else {

      BTM_ReadDevInfo(bd_addr, &dev_type, &addr_type);

system/stack/btm/btm_sec.cc

+9 −9
Original line number Diff line number Diff line
@@ -798,7 +798,6 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 
  tBTM_STATUS status;

  uint8_t* p_features;

  uint8_t ii;

  tACL_CONN* p = btm_bda_to_acl(bd_addr, transport);

  VLOG(1) << __func__ << " BDA: " << bd_addr;



  BTM_TRACE_DEBUG("%s: Transport used %d, bd_addr=%s", __func__, transport,
@@ -903,7 +902,8 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 
#endif



  /* If connection already exists... */

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

  tACL_CONN* p_acl = btm_bda_to_acl(bd_addr, transport);

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

    btm_sec_start_authentication(p_dev_rec);



    btm_sec_change_pairing_state(BTM_PAIR_STATE_WAIT_PIN_REQ);
@@ -1189,9 +1189,9 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, 
      p_dev_rec->security_required, p_dev_rec, p_callback);



  if (transport == BT_TRANSPORT_LE) {

    tACL_CONN* p = btm_bda_to_acl(bd_addr, transport);

    if (p) {

      rc = btm_ble_set_encryption(bd_addr, sec_act, p->link_role);

    tACL_CONN* p_acl = btm_bda_to_acl(bd_addr, transport);

    if (p_acl) {

      rc = btm_ble_set_encryption(bd_addr, sec_act, p_acl->link_role);

    } else {

      rc = BTM_WRONG_MODE;

      BTM_TRACE_WARNING("%s: cannot call btm_ble_set_encryption, p is NULL",
@@ -3542,8 +3542,6 @@ void btm_sec_auth_complete(uint16_t handle, uint8_t status) { 
void btm_sec_encrypt_change(uint16_t handle, uint8_t status,

                            uint8_t encr_enable) {

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(handle);

  tACL_CONN* p_acl = NULL;

  uint8_t acl_idx = btm_handle_to_acl_index(handle);

  BTM_TRACE_EVENT(

      "Security Manager: encrypt_change status:%d State:%d, encr_enable = %d",

      status, (p_dev_rec) ? p_dev_rec->sec_state : 0, encr_enable);
@@ -3587,6 +3585,8 @@ void btm_sec_encrypt_change(uint16_t handle, uint8_t status, 
  BTM_TRACE_DEBUG("after update p_dev_rec->sec_flags=0x%x",

                  p_dev_rec->sec_flags);



  uint8_t acl_idx = btm_handle_to_acl_index(handle);

  tACL_CONN* p_acl = NULL;

  if (acl_idx != MAX_L2CAP_LINKS) p_acl = &btm_cb.acl_cb_.acl_db[acl_idx];



  if (p_acl != NULL)
@@ -5482,6 +5482,6 @@ static bool btm_sec_use_smp_br_chnl(tBTM_SEC_DEV_REC* p_dev_rec) { 
 *

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

static bool btm_sec_is_master(tBTM_SEC_DEV_REC* p_dev_rec) {

  tACL_CONN* p = btm_bda_to_acl(p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR);

  return (p && (p->link_role == HCI_ROLE_MASTER));

  tACL_CONN* p_acl = btm_bda_to_acl(p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR);

  return (p_acl && (p_acl->link_role == HCI_ROLE_MASTER));

}