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

Commit c6cceff7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Rename acl_is_role_master to acl_br_edr_is_role_master"

parents b77d2107 54509bcb

system/stack/acl/btm_acl.cc

+2 −2
Original line number Diff line number Diff line
@@ -2459,8 +2459,8 @@ bool lmp_version_below(const RawAddress& bda, uint8_t version) { 
  return acl->lmp_version < version;

}



bool acl_is_role_master(const RawAddress& bda, tBT_TRANSPORT transport) {

  tACL_CONN* p = btm_bda_to_acl(bda, transport);

bool acl_br_edr_is_role_master(const RawAddress& bda) {

  tACL_CONN* p = btm_bda_to_acl(bda, BT_TRANSPORT_BR_EDR);

  if (p == nullptr) {

    return false;

  }

system/stack/btm/btm_sec.cc

+2 −2
Original line number Diff line number Diff line
@@ -3452,7 +3452,7 @@ void btm_sec_auth_complete(uint16_t handle, uint8_t status) { 
        BTM_TRACE_DEBUG(

            "link encrypted afer dedic bonding can use SMP_BR_CHNL");



        if (acl_is_role_master(p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR)) {

        if (acl_br_edr_is_role_master(p_dev_rec->bd_addr)) {

          // Encryption is required to start SM over BR/EDR

          // indicate that this is encryption after authentication

          BTM_SetEncryption(p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR, NULL, NULL,
@@ -3583,7 +3583,7 @@ void btm_sec_encrypt_change(uint16_t handle, uint8_t status, 
    }

    if (p_dev_rec->new_encryption_key_is_p256) {

      if (btm_sec_use_smp_br_chnl(p_dev_rec) &&

          acl_is_role_master(p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR) &&

          acl_br_edr_is_role_master(p_dev_rec->bd_addr) &&

          /* if LE key is not known, do deriving */

          (!(p_dev_rec->sec_flags & BTM_SEC_LE_LINK_KEY_KNOWN) ||

           /* or BR key is higher security than existing LE keys */

system/stack/include/acl_api.h

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ void btm_set_packet_types_from_address(const RawAddress& bda, 


bool lmp_version_below(const RawAddress& bda, uint8_t version);



bool acl_is_role_master(const RawAddress& remote_bda, tBT_TRANSPORT transport);

bool acl_br_edr_is_role_master(const RawAddress& bda);



#define BLE_RESOLVE_ADDR_MASK 0xc0

#define BLE_RESOLVE_ADDR_MSB 0x40