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

Commit 8933ac61 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "[redact_log] redact more addresses in VLOG"

parents f3122155 b63a9407

system/stack/acl/btm_acl.cc

+3 −2
Original line number Diff line number Diff line
@@ -1818,7 +1818,7 @@ tBTM_STATUS BTM_ReadTxPower(const RawAddress& remote_bda, 
#define BTM_READ_RSSI_TYPE_CUR 0x00

#define BTM_READ_RSSI_TYPE_MAX 0X01



  VLOG(2) << __func__ << ": RemBdAddr: " << remote_bda;

  VLOG(2) << __func__ << ": RemBdAddr: " << ADDRESS_TO_LOGGABLE_STR(remote_bda);



  /* If someone already waiting on the version, do not allow another */

  if (btm_cb.devcb.p_tx_power_cmpl_cb) return (BTM_BUSY);
@@ -2279,7 +2279,8 @@ void btm_acl_reset_paging(void) { 
 ******************************************************************************/

void btm_acl_paging(BT_HDR* p, const RawAddress& bda) {

  if (!BTM_IsAclConnectionUp(bda, BT_TRANSPORT_BR_EDR)) {

    VLOG(1) << "connecting_bda: " << btm_cb.connecting_bda;

    VLOG(1) << "connecting_bda: "

            << ADDRESS_TO_LOGGABLE_STR(btm_cb.connecting_bda);

    if (btm_cb.paging && bda == btm_cb.connecting_bda) {

      fixed_queue_enqueue(btm_cb.page_queue, p);

    } else {

system/stack/avct/avct_lcb.cc

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ tAVCT_LCB* avct_lcb_by_bd(const RawAddress& bd_addr) { 
    /* if no lcb found */

    p_lcb = NULL;



    VLOG(1) << "No lcb for addr " << bd_addr;

    VLOG(1) << "No lcb for addr " << ADDRESS_TO_LOGGABLE_STR(bd_addr);

  }

  return p_lcb;

}

system/stack/btm/btm_sec.cc

+11 −8
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 
                                      uint8_t* p_pin) {

  tBTM_SEC_DEV_REC* p_dev_rec;

  tBTM_STATUS status;

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

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



  BTM_TRACE_DEBUG("%s: Transport used %d, bd_addr=%s", __func__, transport,

                  ADDRESS_TO_LOGGABLE_CSTR(bd_addr));
@@ -2237,7 +2237,8 @@ static tBTM_STATUS btm_sec_dd_create_conn(tBTM_SEC_DEV_REC* p_dev_rec) { 
  /* set up the control block to indicated dedicated bonding */

  btm_cb.pairing_flags |= BTM_PAIR_FLAGS_DISC_WHEN_DONE;



  VLOG(1) << "Security Manager: " << p_dev_rec->bd_addr;

  VLOG(1) << "Security Manager: "

          << ADDRESS_TO_LOGGABLE_STR(p_dev_rec->bd_addr);



  btm_sec_change_pairing_state(BTM_PAIR_STATE_WAIT_PIN_REQ);
@@ -2808,7 +2809,8 @@ void btm_proc_sp_req_evt(tBTM_SP_EVT event, const uint8_t* p) { 
  /* All events start with bd_addr */

  STREAM_TO_BDADDR(p_bda, p);



  VLOG(2) << " BDA: " << p_bda << " event: 0x" << std::hex << +event

  VLOG(2) << " BDA: " << ADDRESS_TO_LOGGABLE_STR(p_bda) << " event: 0x"

          << std::hex << +event

          << " State: " << btm_pair_state_descr(btm_cb.pairing_state);



  p_dev_rec = btm_find_dev(p_bda);
@@ -3016,7 +3018,7 @@ void btm_rem_oob_req(const uint8_t* p) { 


  STREAM_TO_BDADDR(p_bda, p);



  VLOG(2) << __func__ << " BDA: " << p_bda;

  VLOG(2) << __func__ << " BDA: " << ADDRESS_TO_LOGGABLE_STR(p_bda);

  p_dev_rec = btm_find_dev(p_bda);

  if ((p_dev_rec != NULL) && btm_cb.api.p_sp_callback) {

    evt_data.bd_addr = p_dev_rec->bd_addr;
@@ -3163,7 +3165,7 @@ void btm_sec_auth_complete(uint16_t handle, tHCI_STATUS status) { 
            << btm_pair_state_descr(btm_cb.pairing_state)

            << " handle:" << handle << " status:" << status

            << "dev->sec_state:" << p_dev_rec->sec_state

            << " bda:" << p_dev_rec->bd_addr

            << " bda:" << ADDRESS_TO_LOGGABLE_STR(p_dev_rec->bd_addr)

            << "RName:" << p_dev_rec->sec_bd_name;

  } else {

    VLOG(2) << __func__ << ": Security Manager: in state: "
@@ -3710,7 +3712,7 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, 
      VLOG(1) << __func__

              << ": device security record associated with this bda has been "

                 "removed! bda="

              << bda << ", do not callback!";

              << ADDRESS_TO_LOGGABLE_STR(bda) << ", do not callback!";

      return;

    }
@@ -4044,7 +4046,8 @@ void btm_sec_link_key_notification(const RawAddress& p_bda, 
       ((p_dev_rec->dev_class[1] & BTM_COD_MAJOR_CLASS_MASK) !=

        BTM_COD_MAJOR_PERIPHERAL)) &&

      !ltk_derived_lk) {

    VLOG(2) << __func__ << " Delayed BDA: " << p_bda << " Type:" << +key_type;

    VLOG(2) << __func__ << " Delayed BDA: " << ADDRESS_TO_LOGGABLE_STR(p_bda)

            << " Type:" << +key_type;



    p_dev_rec->link_key_not_sent = true;
@@ -4096,7 +4099,7 @@ void btm_sec_link_key_request(const uint8_t* p_event) { 
  STREAM_TO_BDADDR(bda, p_event);

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda);



  VLOG(2) << __func__ << " bda: " << bda;

  VLOG(2) << __func__ << " bda: " << ADDRESS_TO_LOGGABLE_STR(bda);

  if (!concurrentPeerAuthIsEnabled()) {

    p_dev_rec->sec_state = BTM_SEC_STATE_AUTHENTICATING;

  }

system/stack/gatt/gatt_api.cc

+2 −1
Original line number Diff line number Diff line
@@ -1688,7 +1688,8 @@ void gatt_load_bonded(void) { 
      gatt_bonded_check_add_address(p_dev_rec->bd_addr);

    }

    if (p_dev_rec->is_le_link_key_known()) {

      VLOG(1) << " add bonded BLE " << p_dev_rec->ble.pseudo_addr;

      VLOG(1) << " add bonded BLE "

              << ADDRESS_TO_LOGGABLE_STR(p_dev_rec->ble.pseudo_addr);

      LOG_VERBOSE("Add bonded BLE %s",

                  ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->ble.pseudo_addr));

      gatt_bonded_check_add_address(p_dev_rec->ble.pseudo_addr);

system/stack/l2cap/l2c_ble.cc

+7 −6
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda, uint16_t min_int, 
    return (false);

  }



  VLOG(2) << __func__ << ": BD_ADDR=" << rem_bda << ", min_int=" << min_int

          << ", max_int=" << max_int << ", min_ce_len=" << min_ce_len

          << ", max_ce_len=" << max_ce_len;

  VLOG(2) << __func__ << ": BD_ADDR=" << ADDRESS_TO_LOGGABLE_STR(rem_bda)

          << ", min_int=" << min_int << ", max_int=" << max_int

          << ", min_ce_len=" << min_ce_len << ", max_ce_len=" << max_ce_len;



  p_lcb->min_interval = min_int;

  p_lcb->max_interval = max_int;
@@ -157,13 +157,14 @@ bool L2CA_EnableUpdateBleConnParams(const RawAddress& rem_bda, bool enable) { 
    return false;

  }



  VLOG(2) << __func__ << " - BD_ADDR " << rem_bda

  VLOG(2) << __func__ << " - BD_ADDR " << ADDRESS_TO_LOGGABLE_STR(rem_bda)

          << StringPrintf(" enable %d current upd state 0x%02x", enable,

                          p_lcb->conn_update_mask);



  if (p_lcb->transport != BT_TRANSPORT_LE) {

    LOG(WARNING) << __func__ << " - BD_ADDR " << rem_bda

                 << " not LE, link role " << p_lcb->LinkRole();

    LOG(WARNING) << __func__ << " - BD_ADDR "

                 << ADDRESS_TO_LOGGABLE_STR(rem_bda) << " not LE, link role "

                 << p_lcb->LinkRole();

    return false;

  }