diff options
187 files changed, 2374 insertions, 3169 deletions
diff --git a/flags/bta_dm.aconfig b/flags/bta_dm.aconfig index 269db238e2..ddb3dfe597 100644 --- a/flags/bta_dm.aconfig +++ b/flags/bta_dm.aconfig @@ -42,3 +42,10 @@ flag { description: "Continue service discovery when API cancel device discovery called" bug: "329642681" } + +flag { + name: "separate_service_and_device_discovery" + namespace: "bluetooth" + description: "Separate service and device discovery state machines such that one does not block on another" + bug: "335732980" +} diff --git a/system/bta/ag/bta_ag_act.cc b/system/bta/ag/bta_ag_act.cc index dd80732cce..a4b9c12220 100644 --- a/system/bta/ag/bta_ag_act.cc +++ b/system/bta/ag/bta_ag_act.cc @@ -490,8 +490,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { if (!btif_config_get_bin( p_scb->peer_addr.ToString(), BTIF_STORAGE_KEY_HFP_VERSION, (uint8_t*)&p_scb->peer_version, &version_value_size)) { - log::warn("Failed read cached peer HFP version for {}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr)); + log::warn("Failed read cached peer HFP version for {}", p_scb->peer_addr); p_scb->peer_version = HFP_HSP_VERSION_UNKNOWN; } size_t sdp_features_size = sizeof(p_scb->peer_sdp_features); @@ -512,7 +511,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { } } else { log::warn("Failed read cached peer HFP SDP features for {}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr)); + p_scb->peer_addr); } } @@ -568,8 +567,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { for (tBTA_AG_SCB& ag_scb : bta_ag_cb.scb) { // Cancel any pending collision timers if (ag_scb.in_use && alarm_is_scheduled(ag_scb.collision_timer)) { - log::verbose("cancel collision alarm for {}", - ADDRESS_TO_LOGGABLE_STR(ag_scb.peer_addr)); + log::verbose("cancel collision alarm for {}", ag_scb.peer_addr); alarm_cancel(ag_scb.collision_timer); if (dev_addr != ag_scb.peer_addr && p_scb != &ag_scb) { // Resume outgoing connection if incoming is not on the same device @@ -579,7 +577,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { if (dev_addr == ag_scb.peer_addr && p_scb != &ag_scb) { log::info( "close outgoing connection before accepting {} with conn_handle={}", - ADDRESS_TO_LOGGABLE_STR(ag_scb.peer_addr), ag_scb.conn_handle); + ag_scb.peer_addr, ag_scb.conn_handle); if (!IS_FLAG_ENABLED(close_rfcomm_instead_of_reset)) { // Fail the outgoing connection to clean up any upper layer states bta_ag_rfc_fail(&ag_scb, tBTA_AG_DATA::kEmpty); @@ -591,7 +589,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { if (status != PORT_SUCCESS) { log::warn( "RFCOMM_RemoveConnection failed for {}, handle {}, error {}", - ADDRESS_TO_LOGGABLE_STR(dev_addr), ag_scb.conn_handle, status); + dev_addr, ag_scb.conn_handle, status); } } else if (IS_FLAG_ENABLED(reset_after_collision)) { // As no existing outgoing rfcomm connection, then manual reset current @@ -599,10 +597,8 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { bta_ag_rfc_fail(&ag_scb, tBTA_AG_DATA::kEmpty); } } - log::info("dev_addr={}, peer_addr={}, in_use={}, index={}", - ADDRESS_TO_LOGGABLE_STR(dev_addr), - ADDRESS_TO_LOGGABLE_STR(ag_scb.peer_addr), ag_scb.in_use, - bta_ag_scb_to_idx(p_scb)); + log::info("dev_addr={}, peer_addr={}, in_use={}, index={}", dev_addr, + ag_scb.peer_addr, ag_scb.in_use, bta_ag_scb_to_idx(p_scb)); } p_scb->peer_addr = dev_addr; @@ -665,14 +661,13 @@ void bta_ag_rfc_data(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) { /* read data from rfcomm; if bad status, we're done */ if (PORT_ReadData(p_scb->conn_handle, buf, BTA_AG_RFC_READ_MAX, &len) != PORT_SUCCESS) { - log::error("failed to read data {}", - ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr)); + log::error("failed to read data {}", p_scb->peer_addr); break; } /* if no data, we're done */ if (len == 0) { - log::warn("no data for {}", ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr)); + log::warn("no data for {}", p_scb->peer_addr); break; } diff --git a/system/bta/ag/bta_ag_main.cc b/system/bta/ag/bta_ag_main.cc index 15aaf3bcca..184b72e128 100644 --- a/system/bta/ag/bta_ag_main.cc +++ b/system/bta/ag/bta_ag_main.cc @@ -364,13 +364,13 @@ void bta_ag_collision_cback(tBTA_SYS_CONN_STATUS /* status */, tBTA_SYS_ID id, if (p_scb && (p_scb->state == BTA_AG_OPENING_ST)) { if (id == BTA_ID_SYS) { log::warn("AG found collision (ACL) for handle {} device {}", - unsigned(handle), ADDRESS_TO_LOGGABLE_STR(peer_addr)); + unsigned(handle), peer_addr); } else if (id == BTA_ID_AG) { log::warn("AG found collision (RFCOMM) for handle {} device {}", - unsigned(handle), ADDRESS_TO_LOGGABLE_STR(peer_addr)); + unsigned(handle), peer_addr); } else { log::warn("AG found collision (UNKNOWN) for handle {} device {}", - unsigned(handle), ADDRESS_TO_LOGGABLE_STR(peer_addr)); + unsigned(handle), peer_addr); } bta_ag_sm_execute(p_scb, BTA_AG_COLLISION_EVT, tBTA_AG_DATA::kEmpty); } @@ -388,14 +388,13 @@ void bta_ag_collision_cback(tBTA_SYS_CONN_STATUS /* status */, tBTA_SYS_ID id, ******************************************************************************/ void bta_ag_resume_open(tBTA_AG_SCB* p_scb) { if (p_scb->state == BTA_AG_INIT_ST) { - log::info("Resume connection to {}, handle{}", - ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr), + log::info("Resume connection to {}, handle{}", p_scb->peer_addr, bta_ag_scb_to_idx(p_scb)); tBTA_AG_DATA open_data = {.api_open = {.bd_addr = p_scb->peer_addr}}; bta_ag_sm_execute(p_scb, BTA_AG_API_OPEN_EVT, open_data); } else { - log::verbose("device {} is already in state {}", - ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr), p_scb->state); + log::verbose("device {} is already in state {}", p_scb->peer_addr, + p_scb->state); } } @@ -748,7 +747,7 @@ void bta_ag_sm_execute(tBTA_AG_SCB* p_scb, uint16_t event, log::debug( "Execute AG event handle:0x{:04x} bd_addr:{} state:{}[0x{:02x}] " "event:{}[0x{:04x}] result:{}[0x{:02x}]", - bta_ag_scb_to_idx(p_scb), ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr), + bta_ag_scb_to_idx(p_scb), p_scb->peer_addr, bta_ag_state_str(p_scb->state), p_scb->state, bta_ag_evt_str(event), event, bta_ag_res_str(data.api_result.result), data.api_result.result); @@ -759,7 +758,7 @@ void bta_ag_sm_execute(tBTA_AG_SCB* p_scb, uint16_t event, "State changed handle:0x{:04x} bd_addr:{} " "state_change:{}[0x{:02x}]->{}[0x{:02x}] event:{}[0x{:04x}] " "result:{}[0x{:02x}]", - bta_ag_scb_to_idx(p_scb), ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr), + bta_ag_scb_to_idx(p_scb), p_scb->peer_addr, bta_ag_state_str(previous_state), previous_state, bta_ag_state_str(p_scb->state), p_scb->state, bta_ag_evt_str(previous_event), previous_event, diff --git a/system/bta/ag/bta_ag_rfc.cc b/system/bta/ag/bta_ag_rfc.cc index 0cab796e8a..f26ba86827 100644 --- a/system/bta/ag/bta_ag_rfc.cc +++ b/system/bta/ag/bta_ag_rfc.cc @@ -86,7 +86,7 @@ static void bta_ag_port_cback(uint32_t /* code */, uint16_t port_handle, if (!bta_ag_scb_open(p_scb)) { log::error( "rfcomm data on an unopened control block {} peer_addr {} state {}", - handle, ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr), p_scb->state); + handle, p_scb->peer_addr, p_scb->state); } do_in_main_thread( FROM_HERE, base::BindOnce(&bta_ag_sm_execute_by_handle, handle, @@ -344,7 +344,7 @@ void bta_ag_rfc_do_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { } else { /* RFCOMM create connection failed; send ourselves RFCOMM close event */ log::error("RFCOMM_CreateConnection ERROR {} for {}", status, - ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr)); + p_scb->peer_addr); bta_ag_sm_execute(p_scb, BTA_AG_RFC_CLOSE_EVT, data); } } diff --git a/system/bta/ag/bta_ag_sco.cc b/system/bta/ag/bta_ag_sco.cc index 937ad61468..f81b4fcc48 100644 --- a/system/bta/ag/bta_ag_sco.cc +++ b/system/bta/ag/bta_ag_sco.cc @@ -416,11 +416,8 @@ static void bta_ag_esco_connreq_cback(tBTM_ESCO_EVT event, log::warn( "reject incoming SCO connection, remote_bda={}, active_bda={}, " "current_bda={}", - ADDRESS_TO_LOGGABLE_STR(remote_bda ? *remote_bda - : RawAddress::kEmpty), - ADDRESS_TO_LOGGABLE_STR(active_device_addr), - ADDRESS_TO_LOGGABLE_STR(p_scb ? p_scb->peer_addr - : RawAddress::kEmpty)); + remote_bda ? *remote_bda : RawAddress::kEmpty, active_device_addr, + p_scb ? p_scb->peer_addr : RawAddress::kEmpty); BTM_EScoConnRsp(p_data->conn_evt.sco_inx, HCI_ERR_HOST_REJECT_RESOURCES, (enh_esco_params_t*)nullptr); } @@ -461,9 +458,8 @@ void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) { tBTA_AG_PEER_CODEC esco_codec = UUID_CODEC_CVSD; if (!bta_ag_sco_is_active_device(p_scb->peer_addr)) { - log::warn("device {} is not active, active_device={}", - ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr), - ADDRESS_TO_LOGGABLE_STR(active_device_addr)); + log::warn("device {} is not active, active_device={}", p_scb->peer_addr, + active_device_addr); if (bta_ag_cb.sco.p_curr_scb != nullptr && bta_ag_cb.sco.p_curr_scb->in_use && p_scb == bta_ag_cb.sco.p_curr_scb) { do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_sm_execute, p_scb, @@ -474,8 +470,8 @@ void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) { } /* Make sure this SCO handle is not already in use */ if (p_scb->sco_idx != BTM_INVALID_SCO_INDEX) { - log::error("device {}, index 0x{:04x} already in use!", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr), p_scb->sco_idx); + log::error("device {}, index 0x{:04x} already in use!", p_scb->peer_addr, + p_scb->sco_idx); return; } @@ -856,7 +852,7 @@ static void bta_ag_sco_event(tBTA_AG_SCB* p_scb, uint8_t event) { tBTA_AG_SCO_CB* p_sco = &bta_ag_cb.sco; uint8_t previous_state = p_sco->state; log::info("device:{} index:0x{:04x} state:{}[{}] event:{}[{}]", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr), p_scb->sco_idx, + p_scb->peer_addr, p_scb->sco_idx, bta_ag_sco_state_str(p_sco->state), p_sco->state, bta_ag_sco_evt_str(event), event); @@ -1396,7 +1392,7 @@ bool bta_ag_sco_is_opening(tBTA_AG_SCB* p_scb) { * ******************************************************************************/ void bta_ag_sco_listen(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) { - log::info("{}", ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr)); + log::info("{}", p_scb->peer_addr); bta_ag_sco_event(p_scb, BTA_AG_SCO_LISTEN_E); } @@ -1440,13 +1436,12 @@ void bta_ag_sco_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { /* if another scb using sco, this is a transfer */ if (bta_ag_cb.sco.p_curr_scb && bta_ag_cb.sco.p_curr_scb != p_scb) { - log::info("transfer {} -> {}", - ADDRESS_TO_LOGGABLE_STR(bta_ag_cb.sco.p_curr_scb->peer_addr), - ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr)); + log::info("transfer {} -> {}", bta_ag_cb.sco.p_curr_scb->peer_addr, + p_scb->peer_addr); bta_ag_sco_event(p_scb, BTA_AG_SCO_XFER_E); } else { /* else it is an open */ - log::info("open {}", ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr)); + log::info("open {}", p_scb->peer_addr); bta_ag_sco_event(p_scb, BTA_AG_SCO_OPEN_E); } } @@ -1486,13 +1481,13 @@ void bta_ag_sco_codec_nego(tBTA_AG_SCB* p_scb, bool result) { if (result) { /* Subsequent SCO connection will skip codec negotiation */ log::info("Succeeded for index 0x{:04x}, device {}", p_scb->sco_idx, - ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr)); + p_scb->peer_addr); p_scb->codec_updated = false; bta_ag_sco_event(p_scb, BTA_AG_SCO_CN_DONE_E); } else { /* codec negotiation failed */ log::info("Failed for index 0x{:04x}, device {}", p_scb->sco_idx, - ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr)); + p_scb->peer_addr); bta_ag_sco_event(p_scb, BTA_AG_SCO_CLOSE_E); } } diff --git a/system/bta/ag/bta_ag_sdp.cc b/system/bta/ag/bta_ag_sdp.cc index a4e720a764..e1007a4a8c 100644 --- a/system/bta/ag/bta_ag_sdp.cc +++ b/system/bta/ag/bta_ag_sdp.cc @@ -389,7 +389,7 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { (const uint8_t*)&peer_version, sizeof(peer_version))) { } else { log::warn("Failed to store peer HFP version for {}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr)); + p_scb->peer_addr); } } /* get features if HFP */ @@ -420,7 +420,7 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { sizeof(sdp_features))) { } else { log::warn("Failed to store peer HFP SDP Features for {}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr)); + p_scb->peer_addr); } } if (p_scb->peer_features == 0) { @@ -542,12 +542,11 @@ void bta_ag_do_disc(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { bta_ag_sdp_cback_tbl[bta_ag_scb_to_idx(p_scb) - 1])) { return; } else { - log::error("failed to start SDP discovery for {}", - ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr)); + log::error("failed to start SDP discovery for {}", p_scb->peer_addr); } } else { log::error("failed to init SDP discovery database for {}", - ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr)); + p_scb->peer_addr); } // Failure actions bta_ag_free_db(p_scb, tBTA_AG_DATA::kEmpty); diff --git a/system/bta/av/bta_av_aact.cc b/system/bta/av/bta_av_aact.cc index 7d11db33d7..e9cc567ee7 100644 --- a/system/bta/av/bta_av_aact.cc +++ b/system/bta/av/bta_av_aact.cc @@ -220,13 +220,11 @@ static uint8_t bta_av_get_scb_sep_type(tBTA_AV_SCB* p_scb, * ******************************************************************************/ static void bta_av_save_addr(tBTA_AV_SCB* p_scb, const RawAddress& bd_addr) { - log::verbose("peer={} recfg_sup:{}, suspend_sup:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), p_scb->recfg_sup, - p_scb->suspend_sup); + log::verbose("peer={} recfg_sup:{}, suspend_sup:{}", bd_addr, + p_scb->recfg_sup, p_scb->suspend_sup); if (p_scb->PeerAddress() != bd_addr) { - log::info("reset flags old_addr={} new_addr={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("reset flags old_addr={} new_addr={}", p_scb->PeerAddress(), + bd_addr); /* a new addr, reset the supported flags */ p_scb->recfg_sup = true; p_scb->suspend_sup = true; @@ -249,8 +247,7 @@ static void bta_av_save_addr(tBTA_AV_SCB* p_scb, const RawAddress& bd_addr) { ******************************************************************************/ static void notify_start_failed(tBTA_AV_SCB* p_scb) { log::error("peer {} role:0x{:x} bta_channel:{} bta_handle:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->role, - p_scb->chnl, p_scb->hndl); + p_scb->PeerAddress(), p_scb->role, p_scb->chnl, p_scb->hndl); tBTA_AV bta_av_data = { .start = { @@ -335,7 +332,7 @@ static bool bta_av_next_getcap(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { /* if no streams available then stream open fails */ if (!sent_cmd) { log::error("BTA_AV_STR_GETCAP_FAIL_EVT: peer_addr={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + p_scb->PeerAddress()); bta_av_ssm_execute(p_scb, BTA_AV_STR_GETCAP_FAIL_EVT, p_data); } @@ -361,8 +358,7 @@ void bta_av_proc_stream_evt(uint8_t handle, const RawAddress& bd_addr, log::verbose( "peer_address: {} avdt_handle: {} event=0x{:x} scb_index={} p_scb={}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), handle, event, scb_index, - fmt::ptr(p_scb)); + bd_addr, handle, event, scb_index, fmt::ptr(p_scb)); if (p_data) { if (event == AVDT_SECURITY_IND_EVT) { @@ -385,8 +381,8 @@ void bta_av_proc_stream_evt(uint8_t handle, const RawAddress& bd_addr, p_msg->bd_addr = bd_addr; p_msg->scb_index = scb_index; - log::verbose("stream event bd_addr: {} scb_index: {}", - ADDRESS_TO_LOGGABLE_CSTR(p_msg->bd_addr), scb_index); + log::verbose("stream event bd_addr: {} scb_index: {}", p_msg->bd_addr, + scb_index); if (p_data != NULL) { memcpy(&p_msg->msg, p_data, sizeof(tAVDT_CTRL)); @@ -499,8 +495,7 @@ void bta_av_sink_data_cback(uint8_t handle, BT_HDR* p_pkt, uint32_t time_stamp, ******************************************************************************/ static void bta_av_a2dp_sdp_cback(bool found, tA2DP_Service* p_service, const RawAddress& peer_address) { - log::verbose("peer {} : found={}", ADDRESS_TO_LOGGABLE_CSTR(peer_address), - (found) ? "true" : "false"); + log::verbose("peer {} : found={}", peer_address, (found) ? "true" : "false"); tBTA_AV_SCB* p_scb = NULL; if (peer_address != RawAddress::kEmpty) { @@ -519,11 +514,9 @@ static void bta_av_a2dp_sdp_cback(bool found, tA2DP_Service* p_service, } if (!found) { - log::error("peer {} A2DP service discovery failed", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + log::error("peer {} A2DP service discovery failed", p_scb->PeerAddress()); } - log::verbose("peer {} found={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), + log::verbose("peer {} found={}", p_scb->PeerAddress(), (found) ? "true" : "false"); tBTA_AV_SDP_RES* p_msg = @@ -532,8 +525,7 @@ static void bta_av_a2dp_sdp_cback(bool found, tA2DP_Service* p_service, p_msg->hdr.event = BTA_AV_SDP_DISC_OK_EVT; } else { p_msg->hdr.event = BTA_AV_SDP_DISC_FAIL_EVT; - log::error("BTA_AV_SDP_DISC_FAIL_EVT: peer_addr={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + log::error("BTA_AV_SDP_DISC_FAIL_EVT: peer_addr={}", p_scb->PeerAddress()); } if (found) { if (p_service != NULL) { @@ -549,7 +541,7 @@ static void bta_av_a2dp_sdp_cback(bool found, tA2DP_Service* p_service, sizeof(p_service->avdt_version))) { } else { log::warn("Failed to store peer AVDTP version for {}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + p_scb->PeerAddress()); } } } @@ -599,8 +591,7 @@ void bta_av_switch_role(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { tBTA_AV_RS_RES switch_res = BTA_AV_RS_NONE; tBTA_AV_API_OPEN* p_buf = &p_scb->q_info.open; - log::verbose("peer {} wait:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->wait); + log::verbose("peer {} wait:0x{:x}", p_scb->PeerAddress(), p_scb->wait); if (p_scb->wait & BTA_AV_WAIT_ROLE_SW_RES_START) p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RETRY; @@ -619,8 +610,8 @@ void bta_av_switch_role(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { } } else { /* report failure on OPEN */ - log::error("peer {} role switch failed (wait=0x{:x})", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->wait); + log::error("peer {} role switch failed (wait=0x{:x})", p_scb->PeerAddress(), + p_scb->wait); switch_res = BTA_AV_RS_FAIL; } @@ -649,8 +640,7 @@ void bta_av_role_res(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { bool initiator = false; log::verbose("peer {} q_tag:{}, wait:0x{:x}, role:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->q_tag, - p_scb->wait, p_scb->role); + p_scb->PeerAddress(), p_scb->q_tag, p_scb->wait, p_scb->role); if (p_scb->role & BTA_AV_ROLE_START_INT) initiator = true; if (p_scb->q_tag == BTA_AV_Q_TAG_START) { @@ -709,14 +699,12 @@ void bta_av_role_res(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { } else { log::warn( "peer {} unexpected role switch event: q_tag = {} wait = 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->q_tag, - p_scb->wait); + p_scb->PeerAddress(), p_scb->q_tag, p_scb->wait); } } - log::verbose("peer {} wait:0x{:x}, role:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->wait, - p_scb->role); + log::verbose("peer {} wait:0x{:x}, role:0x{:x}", p_scb->PeerAddress(), + p_scb->wait, p_scb->role); } /******************************************************************************* @@ -730,9 +718,8 @@ void bta_av_role_res(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { * ******************************************************************************/ void bta_av_delay_co(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { - log::verbose("peer {} bta_handle:0x{:x} delay:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - p_data->str_msg.msg.delay_rpt_cmd.delay); + log::verbose("peer {} bta_handle:0x{:x} delay:{}", p_scb->PeerAddress(), + p_scb->hndl, p_data->str_msg.msg.delay_rpt_cmd.delay); p_scb->p_cos->delay(p_scb->hndl, p_scb->PeerAddress(), p_data->str_msg.msg.delay_rpt_cmd.delay); } @@ -755,9 +742,8 @@ void bta_av_do_disc_a2dp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { uint16_t sdp_uuid = 0; /* UUID for which SDP has to be done */ log::verbose("peer_addr: {} use_rc: {} switch_res:{}, oc:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->api_open.bd_addr), - p_data->api_open.use_rc, p_data->api_open.switch_res, - bta_av_cb.audio_open_cnt); + p_data->api_open.bd_addr, p_data->api_open.use_rc, + p_data->api_open.switch_res, bta_av_cb.audio_open_cnt); memcpy(&(p_scb->open_api), &(p_data->api_open), sizeof(tBTA_AV_API_OPEN)); @@ -779,7 +765,7 @@ void bta_av_do_disc_a2dp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { /* report a new failure event */ p_scb->open_status = BTA_AV_FAIL_ROLE; log::error("BTA_AV_SDP_DISC_FAIL_EVT: peer_addr={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + p_scb->PeerAddress()); bta_av_ssm_execute(p_scb, BTA_AV_SDP_DISC_FAIL_EVT, NULL); break; @@ -841,8 +827,7 @@ void bta_av_do_disc_a2dp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::verbose( "Initiate SDP discovery for peer {} : uuid_int=0x{:x} sdp_uuid=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->uuid_int, - sdp_uuid); + p_scb->PeerAddress(), p_scb->uuid_int, sdp_uuid); tA2DP_STATUS find_service_status = A2DP_FindService(sdp_uuid, p_scb->PeerAddress(), &db_params, base::Bind(bta_av_a2dp_sdp_cback)); @@ -850,8 +835,7 @@ void bta_av_do_disc_a2dp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::error( "A2DP_FindService() failed for peer {} uuid_int=0x{:x} sdp_uuid=0x{:x} " ": status={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->uuid_int, - sdp_uuid, find_service_status); + p_scb->PeerAddress(), p_scb->uuid_int, sdp_uuid, find_service_status); bta_av_a2dp_sdp_cback(false, nullptr, p_scb->PeerAddress()); } else { /* only one A2DP find service is active at a time */ @@ -872,7 +856,7 @@ void bta_av_cleanup(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { tBTA_AV_CONN_CHG msg; uint8_t role = BTA_AV_ROLE_AD_INT; - log::info("peer {}", ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + log::info("peer {}", p_scb->PeerAddress()); /* free any buffers */ p_scb->sdp_discovery_started = false; @@ -957,9 +941,8 @@ void bta_av_config_ind(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { local_sep = bta_av_get_scb_sep_type(p_scb, p_msg->handle); p_scb->avdt_label = p_data->str_msg.msg.hdr.label; - log::verbose("peer {} bta_handle:0x{:x} local_sep:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - local_sep); + log::verbose("peer {} bta_handle:0x{:x} local_sep:{}", p_scb->PeerAddress(), + p_scb->hndl, local_sep); log::verbose("codec: {}", A2DP_CodecInfoString(p_evt_cfg->codec_info)); memcpy(p_scb->cfg.codec_info, p_evt_cfg->codec_info, AVDT_CODEC_SIZE); @@ -1037,7 +1020,7 @@ void bta_av_disconnect_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { tBTA_AV_RCB* p_rcb; log::verbose("conn_lcb: 0x{:x} peer_addr: {}", bta_av_cb.conn_lcb, - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + p_scb->PeerAddress()); alarm_cancel(p_scb->link_signalling_timer); alarm_cancel(p_scb->accept_signalling_timer); @@ -1116,8 +1099,8 @@ void bta_av_setconfig_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { bta_av_adjust_seps_idx(p_scb, avdt_handle); log::info( "peer {} bta_handle=0x{:x} avdt_handle={} sep_idx={} cur_psc_mask:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - p_scb->avdt_handle, p_scb->sep_idx, p_scb->cur_psc_mask); + p_scb->PeerAddress(), p_scb->hndl, p_scb->avdt_handle, p_scb->sep_idx, + p_scb->cur_psc_mask); if ((AVDT_TSEP_SNK == local_sep) && (p_data->ci_setconfig.err_code == AVDT_SUCCESS) && @@ -1211,8 +1194,7 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { char remote_name[BD_NAME_LEN] = ""; uint8_t* p; - log::verbose("peer {} bta_handle: 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl); + log::verbose("peer {} bta_handle: 0x{:x}", p_scb->PeerAddress(), p_scb->hndl); msg.hdr.layer_specific = p_scb->hndl; msg.is_up = true; @@ -1227,7 +1209,7 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { interop_match_addr(INTEROP_DISABLE_AVDTP_SUSPEND, &p_scb->PeerAddress())) { log::info("disable AVDTP SUSPEND: interop matched name {} address {}", - remote_name, ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + remote_name, p_scb->PeerAddress()); p_scb->suspend_sup = false; } @@ -1406,8 +1388,7 @@ void bta_av_do_close(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { * ******************************************************************************/ void bta_av_connect_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { - log::verbose("peer {} coll_mask=0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), + log::verbose("peer {} coll_mask=0x{:02x}", p_scb->PeerAddress(), p_scb->coll_mask); p_scb->sdp_discovery_started = false; if (p_scb->coll_mask & BTA_AV_COLL_INC_TMR) { @@ -1432,8 +1413,7 @@ void bta_av_connect_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { * ******************************************************************************/ void bta_av_sdp_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { - log::error("peer_addr={} open_status={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), + log::error("peer_addr={} open_status={}", p_scb->PeerAddress(), p_scb->open_status); if (p_scb->open_status == BTA_AV_SUCCESS) { @@ -1461,8 +1441,7 @@ void bta_av_disc_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { uint16_t uuid_int = p_scb->uuid_int; log::verbose("peer {} bta_handle: 0x{:x} initiator UUID 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - uuid_int); + p_scb->PeerAddress(), p_scb->hndl, uuid_int); /* store number of stream endpoints returned */ p_scb->num_seps = p_data->str_msg.msg.discover_cfm.num_seps; @@ -1524,8 +1503,7 @@ void bta_av_disc_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { } /* else we got discover response but with no streams; we're done */ else { - log::error("BTA_AV_STR_DISC_FAIL_EVT: peer_addr={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + log::error("BTA_AV_STR_DISC_FAIL_EVT: peer_addr={}", p_scb->PeerAddress()); bta_av_ssm_execute(p_scb, BTA_AV_STR_DISC_FAIL_EVT, p_data); } } @@ -1544,8 +1522,7 @@ void bta_av_disc_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { void bta_av_disc_res_as_acp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { uint8_t num_snks = 0, i; - log::verbose("peer {} bta_handle: 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl); + log::verbose("peer {} bta_handle: 0x{:x}", p_scb->PeerAddress(), p_scb->hndl); /* store number of stream endpoints returned */ p_scb->num_seps = p_data->str_msg.msg.discover_cfm.num_seps; @@ -1573,8 +1550,7 @@ void bta_av_disc_res_as_acp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { } /* else we got discover response but with no streams; we're done */ else { - log::error("BTA_AV_STR_DISC_FAIL_EVT: peer_addr={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + log::error("BTA_AV_STR_DISC_FAIL_EVT: peer_addr={}", p_scb->PeerAddress()); bta_av_ssm_execute(p_scb, BTA_AV_STR_DISC_FAIL_EVT, p_data); } } @@ -1596,8 +1572,8 @@ void bta_av_save_caps(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::verbose( "peer {} bta_handle:0x{:x} num_seps:{} sep_info_idx:{} wait:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - p_scb->num_seps, p_scb->sep_info_idx, p_scb->wait); + p_scb->PeerAddress(), p_scb->hndl, p_scb->num_seps, p_scb->sep_info_idx, + p_scb->wait); log::verbose("codec: {}", A2DP_CodecInfoString(p_scb->peer_cap.codec_info)); cfg = p_scb->peer_cap; @@ -1657,8 +1633,7 @@ void bta_av_set_use_rc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { * ******************************************************************************/ void bta_av_cco_close(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { - log::verbose("peer {} bta_handle:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl); + log::verbose("peer {} bta_handle:0x{:x}", p_scb->PeerAddress(), p_scb->hndl); p_scb->p_cos->close(p_scb->hndl, p_scb->PeerAddress()); } @@ -1676,7 +1651,7 @@ void bta_av_open_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { tBTA_AV_SCB* p_opened_scb = NULL; uint8_t idx; - log::error("peer_addr={}", ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + log::error("peer_addr={}", p_scb->PeerAddress()); p_scb->open_status = BTA_AV_FAIL_STREAM; bta_av_cco_close(p_scb, p_data); @@ -1714,9 +1689,9 @@ void bta_av_open_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::error( "there is already an active connection: peer_addr={} chnl={} " "hndl=0x{:x} status={} starting={} edr={}", - ADDRESS_TO_LOGGABLE_CSTR(bta_av_data.open.bd_addr), - bta_av_data.open.chnl, bta_av_data.open.hndl, bta_av_data.open.status, - bta_av_data.open.starting, bta_av_data.open.edr); + bta_av_data.open.bd_addr, bta_av_data.open.chnl, bta_av_data.open.hndl, + bta_av_data.open.status, bta_av_data.open.starting, + bta_av_data.open.edr); (*bta_av_cb.p_cback)(BTA_AV_OPEN_EVT, &bta_av_data); } else { @@ -1746,8 +1721,8 @@ void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { memcpy(cfg.protect_info, p_scb->peer_cap.protect_info, AVDT_PROTECT_SIZE); log::verbose("peer {} bta_handle:0x{:x} num_codec:{} psc_mask=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - p_scb->peer_cap.num_codec, p_scb->cfg.psc_mask); + p_scb->PeerAddress(), p_scb->hndl, p_scb->peer_cap.num_codec, + p_scb->cfg.psc_mask); log::verbose("media type 0x{:x}, 0x{:x}", media_type, p_scb->media_type); log::verbose("codec: {}", A2DP_CodecInfoString(p_scb->cfg.codec_info)); @@ -1782,8 +1757,8 @@ void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::verbose( "peer {} bta_handle:0x{:x} sep_idx:{} sep_info_idx:{} " "cur_psc_mask:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - p_scb->sep_idx, p_scb->sep_info_idx, p_scb->cur_psc_mask); + p_scb->PeerAddress(), p_scb->hndl, p_scb->sep_idx, p_scb->sep_info_idx, + p_scb->cur_psc_mask); if ((uuid_int == UUID_SERVCLASS_AUDIO_SINK) && (p_scb->seps[p_scb->sep_idx].p_app_sink_data_cback != NULL)) { @@ -1867,8 +1842,7 @@ void bta_av_discover_req(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { * ******************************************************************************/ void bta_av_conn_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { - log::error("peer_addr={} open_status={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), + log::error("peer_addr={} open_status={}", p_scb->PeerAddress(), p_scb->open_status); p_scb->open_status = BTA_AV_FAIL_STREAM; @@ -1888,8 +1862,8 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::info( "A2dp stream start peer:{} sco_occupied:{} av_role:0x{:x} started:{} " "wait:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), bta_av_cb.sco_occupied, - p_scb->role, p_scb->started, p_scb->wait); + p_scb->PeerAddress(), bta_av_cb.sco_occupied, p_scb->role, p_scb->started, + p_scb->wait); if (bta_av_cb.sco_occupied) { log::warn("A2dp stream start failed"); bta_av_start_failed(p_scb, p_data); @@ -1902,8 +1876,8 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::warn( "peer {} start stream request ignored: already waiting: " "sco_occupied:{} role:0x{:x} started:{} wait:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), - bta_av_cb.sco_occupied, p_scb->role, p_scb->started, p_scb->wait); + p_scb->PeerAddress(), bta_av_cb.sco_occupied, p_scb->role, + p_scb->started, p_scb->wait); return; } if (p_scb->role & BTA_AV_ROLE_SUSPEND) { @@ -1921,8 +1895,8 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::warn( "peer {} start stream request ignored: already initiated: " "sco_occupied:{} role:0x{:x} started:{} wait:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), bta_av_cb.sco_occupied, - p_scb->role, p_scb->started, p_scb->wait); + p_scb->PeerAddress(), bta_av_cb.sco_occupied, p_scb->role, + p_scb->started, p_scb->wait); return; } @@ -1943,7 +1917,7 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { uint16_t result = AVDT_StartReq(&p_scb->avdt_handle, 1); if (result != AVDT_SUCCESS) { log::error("AVDT_StartReq failed for peer {} result:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), result); + p_scb->PeerAddress(), result); bta_av_start_failed(p_scb, p_data); } else if (p_data) { bta_av_set_use_latency_mode(p_scb, p_data->do_start.use_latency_mode); @@ -1951,8 +1925,8 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::info( "peer {} start requested: sco_occupied:{} role:0x{:x} started:{} " "wait:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), bta_av_cb.sco_occupied, - p_scb->role, p_scb->started, p_scb->wait); + p_scb->PeerAddress(), bta_av_cb.sco_occupied, p_scb->role, p_scb->started, + p_scb->wait); } /******************************************************************************* @@ -1970,8 +1944,8 @@ void bta_av_str_stopped(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { BT_HDR* p_buf; log::info("peer {} bta_handle:0x{:x} audio_open_cnt:{}, p_data {} start:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - bta_av_cb.audio_open_cnt, fmt::ptr(p_data), start); + p_scb->PeerAddress(), p_scb->hndl, bta_av_cb.audio_open_cnt, + fmt::ptr(p_data), start); bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->PeerAddress()); BTM_unblock_role_switch_and_sniff_mode_for(p_scb->PeerAddress()); @@ -2010,8 +1984,7 @@ void bta_av_str_stopped(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { suspend_rsp.hndl = p_scb->hndl; if (p_data && p_data->api_stop.suspend) { - log::verbose("peer {} suspending: {}, sup:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), start, + log::verbose("peer {} suspending: {}, sup:{}", p_scb->PeerAddress(), start, p_scb->suspend_sup); if ((start) && (p_scb->suspend_sup)) { sus_evt = false; @@ -2279,8 +2252,8 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { uint8_t local_tsep = p_scb->seps[p_scb->sep_idx].tsep; log::info("peer {} bta_handle:0x{:x} wait:0x{:x} role:0x{:x} local_tsep:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - p_scb->wait, p_scb->role, local_tsep); + p_scb->PeerAddress(), p_scb->hndl, p_scb->wait, p_scb->role, + local_tsep); p_scb->started = true; @@ -2310,14 +2283,13 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::error( "peer {} role switch failed: bta_handle:0x{:x} wait:0x{:x}, " "role:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - p_scb->wait, p_scb->role); + p_scb->PeerAddress(), p_scb->hndl, p_scb->wait, p_scb->role); p_scb->wait &= ~BTA_AV_WAIT_ROLE_SW_FAILED; p_data = (tBTA_AV_DATA*)&hdr; hdr.offset = BTA_AV_RS_FAIL; } log::verbose("peer {} wait:0x{:x} use_rtp_header_marker_bit:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->wait, + p_scb->PeerAddress(), p_scb->wait, (p_scb->use_rtp_header_marker_bit) ? "true" : "false"); if (p_data && (p_data->hdr.offset != BTA_AV_RS_NONE)) { @@ -2358,9 +2330,8 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { } if (p_scb->wait) { - log::error("peer {} wait:0x{:x} q_tag:{} not started", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->wait, - p_scb->q_tag); + log::error("peer {} wait:0x{:x} q_tag:{} not started", p_scb->PeerAddress(), + p_scb->wait, p_scb->q_tag); /* Clear first bit of p_scb->wait and not to return from this point else * HAL layer gets blocked. And if there is delay in Get Capability response * as @@ -2427,8 +2398,7 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { p_scb->co_started = true; log::verbose("peer {} suspending: {}, role:0x{:x}, init {}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), suspend, - p_scb->role, initiator); + p_scb->PeerAddress(), suspend, p_scb->role, initiator); tBTA_AV bta_av_data = { .start = @@ -2471,8 +2441,8 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { void bta_av_start_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { log::error( "peer {} bta_handle:0x{:x} audio_open_cnt:{} started:{} co_started:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - bta_av_cb.audio_open_cnt, p_scb->started, p_scb->co_started); + p_scb->PeerAddress(), p_scb->hndl, bta_av_cb.audio_open_cnt, + p_scb->started, p_scb->co_started); if (!p_scb->started && !p_scb->co_started) { bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->PeerAddress()); @@ -2497,8 +2467,8 @@ void bta_av_str_closed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { tBTA_AV_EVT event = {}; log::warn("peer {} bta_handle:0x{:x} open_status:{} chnl:{} co_started:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - p_scb->open_status, p_scb->chnl, p_scb->co_started); + p_scb->PeerAddress(), p_scb->hndl, p_scb->open_status, p_scb->chnl, + p_scb->co_started); BTM_unblock_role_switch_and_sniff_mode_for(p_scb->PeerAddress()); if (bta_av_cb.audio_open_cnt <= 1) { @@ -2574,8 +2544,8 @@ void bta_av_suspend_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { uint8_t err_code = p_data->str_msg.msg.hdr.err_code; log::verbose("peer {} bta_handle:0x{:x} audio_open_cnt:{} err_code:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - bta_av_cb.audio_open_cnt, err_code); + p_scb->PeerAddress(), p_scb->hndl, bta_av_cb.audio_open_cnt, + err_code); if (!p_scb->started) { /* handle the condition where there is a collision of SUSPEND req from @@ -2646,9 +2616,8 @@ void bta_av_suspend_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { ******************************************************************************/ void bta_av_rcfg_str_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { p_scb->l2c_cid = AVDT_GetL2CapChannel(p_scb->avdt_handle); - log::verbose("peer {} bta_handle:0x{:x} l2c_cid:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - p_scb->l2c_cid); + log::verbose("peer {} bta_handle:0x{:x} l2c_cid:{}", p_scb->PeerAddress(), + p_scb->hndl, p_scb->l2c_cid); if (p_data != NULL) { // p_data could be NULL if the reconfig was triggered by the local device @@ -2693,8 +2662,7 @@ void bta_av_rcfg_str_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { ******************************************************************************/ void bta_av_rcfg_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::error("num_recfg={} conn_lcb=0x{:x} peer_addr={}", p_scb->num_recfg, - bta_av_cb.conn_lcb, - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + bta_av_cb.conn_lcb, p_scb->PeerAddress()); if (p_scb->num_recfg > BTA_AV_RECONFIG_RETRY) { bta_av_cco_close(p_scb, p_data); @@ -2759,8 +2727,7 @@ void bta_av_rcfg_connect(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { ******************************************************************************/ void bta_av_rcfg_discntd(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { log::error("num_recfg={} conn_lcb=0x{:x} peer_addr={}", p_scb->num_recfg, - bta_av_cb.conn_lcb, - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + bta_av_cb.conn_lcb, p_scb->PeerAddress()); p_scb->num_recfg++; if (p_scb->num_recfg > BTA_AV_RECONFIG_RETRY) { @@ -2811,7 +2778,7 @@ void bta_av_suspend_cont(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { }; (*bta_av_cb.p_cback)(BTA_AV_RECONFIG_EVT, &bta_av_data); log::error("BTA_AV_STR_DISC_FAIL_EVT: peer_addr={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + p_scb->PeerAddress()); bta_av_ssm_execute(p_scb, BTA_AV_STR_DISC_FAIL_EVT, NULL); } else { log::error("suspend rejected, try close"); @@ -2856,7 +2823,7 @@ void bta_av_rcfg_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { (const RawAddress*)&p_scb->PeerAddress())) { log::info( "disable AVDTP RECONFIGURE: interop matched name {} address {}", - remote_name, ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + remote_name, p_scb->PeerAddress()); disable_avdtp_reconfigure = true; } } @@ -2898,8 +2865,7 @@ void bta_av_rcfg_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { ******************************************************************************/ void bta_av_rcfg_open(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* /* p_data */) { log::verbose("peer {} bta_handle:0x{:x} num_disc_snks:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - p_scb->num_disc_snks); + p_scb->PeerAddress(), p_scb->hndl, p_scb->num_disc_snks); if (p_scb->num_disc_snks == 0) { /* Need to update call-out module so that it will be ready for discover */ @@ -3041,8 +3007,7 @@ void bta_av_open_rc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { void bta_av_open_at_inc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { memcpy(&(p_scb->open_api), &(p_data->api_open), sizeof(tBTA_AV_API_OPEN)); - log::verbose("peer {} coll_mask=0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), + log::verbose("peer {} coll_mask=0x{:02x}", p_scb->PeerAddress(), p_scb->coll_mask); if (p_scb->coll_mask & BTA_AV_COLL_INC_TMR) { @@ -3421,8 +3386,7 @@ static void bta_av_offload_codec_builder(tBTA_AV_SCB* p_scb, } } void bta_av_api_set_peer_sep(tBTA_AV_DATA* p_data) { - log::verbose("bd_addr={}, sep:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->peer_sep.addr), + log::verbose("bd_addr={}, sep:{}", p_data->peer_sep.addr, p_data->peer_sep.sep); const tBTA_AV_SCB* p_scb = bta_av_addr_to_scb(p_data->peer_sep.addr); if (!p_scb) { diff --git a/system/bta/av/bta_av_act.cc b/system/bta/av/bta_av_act.cc index c503fd0255..be3ae8ca2e 100644 --- a/system/bta/av/bta_av_act.cc +++ b/system/bta/av/bta_av_act.cc @@ -492,7 +492,7 @@ tBTA_AV_LCB* bta_av_find_lcb(const RawAddress& addr, uint8_t op) { uint8_t mask; tBTA_AV_LCB* p_lcb = NULL; - log::verbose("address: {} op:{}", ADDRESS_TO_LOGGABLE_CSTR(addr), op); + log::verbose("address: {} op:{}", addr, op); for (xx = 0; xx < BTA_AV_NUM_LINKS; xx++) { mask = 1 << xx; /* the used mask for this lcb */ if ((mask & p_cb->conn_lcb) && p_cb->lcb[xx].addr == addr) { @@ -584,9 +584,8 @@ void bta_av_rc_opened(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data) { p_lcb->lidx = BTA_AV_NUM_LINKS + 1; p_cb->rcb[i].lidx = p_lcb->lidx; p_lcb->conn_msk = 1; - log::error("bd_addr: {} rcb[{}].lidx={}, lcb.conn_msk=x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_lcb->addr), i, p_cb->rcb[i].lidx, - p_lcb->conn_msk); + log::error("bd_addr: {} rcb[{}].lidx={}, lcb.conn_msk=x{:x}", p_lcb->addr, + i, p_cb->rcb[i].lidx, p_lcb->conn_msk); disc = p_data->rc_conn_chg.handle | BTA_AV_CHNL_MSK; } @@ -1208,9 +1207,8 @@ static uint8_t bta_av_get_shdl(tBTA_AV_SCB* p_scb) { void bta_av_stream_chg(tBTA_AV_SCB* p_scb, bool started) { uint8_t started_msk = BTA_AV_HNDL_TO_MSK(p_scb->hdi); - log::verbose("peer {} started:{} started_msk:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), started, - started_msk); + log::verbose("peer {} started:{} started_msk:0x{:x}", p_scb->PeerAddress(), + started, started_msk); if (started) { /* Let L2CAP know this channel is processed with high priority */ @@ -1286,9 +1284,8 @@ void bta_av_conn_chg(tBTA_AV_DATA* p_data) { "p_lcb_rc->conn_msk:x{:x}", p_lcb_rc->conn_msk); /* check if the RC is connected to the scb addr */ - log::info("p_lcb_rc->addr: {} conn_chg.peer_addr: {}", - ADDRESS_TO_LOGGABLE_CSTR(p_lcb_rc->addr), - ADDRESS_TO_LOGGABLE_CSTR(p_data->conn_chg.peer_addr)); + log::info("p_lcb_rc->addr: {} conn_chg.peer_addr: {}", p_lcb_rc->addr, + p_data->conn_chg.peer_addr); if (p_lcb_rc->conn_msk && p_lcb_rc->addr == p_data->conn_chg.peer_addr) { @@ -1501,8 +1498,8 @@ void bta_av_api_set_latency(tBTA_AV_DATA* p_data) { */ static uint8_t bta_av_find_lcb_index_by_scb_and_address( const RawAddress& peer_address) { - log::verbose("peer_address: {} conn_lcb: 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_cb.conn_lcb); + log::verbose("peer_address: {} conn_lcb: 0x{:x}", peer_address, + bta_av_cb.conn_lcb); // Find the index if there is already SCB entry for the peer address for (uint8_t index = 0; index < BTA_AV_NUM_LINKS; index++) { @@ -1560,8 +1557,7 @@ void bta_av_sig_chg(tBTA_AV_DATA* p_data) { log::verbose("event: {}", event); if (event == AVDT_CONNECT_IND_EVT) { - log::verbose("AVDT_CONNECT_IND_EVT: peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->str_msg.bd_addr)); + log::verbose("AVDT_CONNECT_IND_EVT: peer {}", p_data->str_msg.bd_addr); p_lcb = bta_av_find_lcb(p_data->str_msg.bd_addr, BTA_AV_LCB_FIND); if (!p_lcb) { @@ -1573,12 +1569,12 @@ void bta_av_sig_chg(tBTA_AV_DATA* p_data) { /* We do not have scb for this avdt connection. */ /* Silently close the connection. */ log::error("av scb not available for avdt connection for {}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->str_msg.bd_addr)); + p_data->str_msg.bd_addr); AVDT_DisconnectReq(p_data->str_msg.bd_addr, NULL); return; } log::info("AVDT_CONNECT_IND_EVT: peer {} selected lcb_index {}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->str_msg.bd_addr), xx); + p_data->str_msg.bd_addr, xx); tBTA_AV_SCB* p_scb = p_cb->p_scb[xx]; mask = 1 << xx; @@ -1657,7 +1653,7 @@ void bta_av_sig_chg(tBTA_AV_DATA* p_data) { p_cb->p_scb[xx] && p_cb->p_scb[xx]->PeerAddress() == p_data->str_msg.bd_addr) { log::warn("Sending AVDT_DISCONNECT_EVT peer_addr={}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->p_scb[xx]->PeerAddress())); + p_cb->p_scb[xx]->PeerAddress()); bta_av_ssm_execute(p_cb->p_scb[xx], BTA_AV_AVDT_DISCONNECT_EVT, NULL); } } @@ -1692,8 +1688,7 @@ void bta_av_signalling_timer(tBTA_AV_DATA* p_data) { p_lcb = &p_cb->lcb[xx]; mask = 1 << xx; log::verbose("index={} conn_lcb=0x{:x} peer={} conn_mask=0x{:x} lidx={}", - xx, p_cb->conn_lcb, ADDRESS_TO_LOGGABLE_CSTR(p_lcb->addr), - p_lcb->conn_msk, p_lcb->lidx); + xx, p_cb->conn_lcb, p_lcb->addr, p_lcb->conn_msk, p_lcb->lidx); if (mask & p_cb->conn_lcb) { /* this entry is used. check if it is connected */ if (!p_lcb->conn_msk) { @@ -1707,8 +1702,7 @@ void bta_av_signalling_timer(tBTA_AV_DATA* p_data) { bta_av_data.pend = pend; log::verbose( "BTA_AV_PENDING_EVT for {} index={} conn_mask=0x{:x} lidx={}", - ADDRESS_TO_LOGGABLE_CSTR(pend.bd_addr), xx, p_lcb->conn_msk, - p_lcb->lidx); + pend.bd_addr, xx, p_lcb->conn_msk, p_lcb->lidx); (*p_cb->p_cback)(BTA_AV_PENDING_EVT, &bta_av_data); } } @@ -2461,8 +2455,7 @@ void bta_av_rc_closed(tBTA_AV_DATA* p_data) { rc_close.rc_handle = BTA_AV_RC_HANDLE_NONE; rc_close.peer_addr = RawAddress::kEmpty; p_scb = NULL; - log::verbose("rc_handle:{}, address:{}", p_msg->handle, - ADDRESS_TO_LOGGABLE_CSTR(p_msg->peer_addr)); + log::verbose("rc_handle:{}, address:{}", p_msg->handle, p_msg->peer_addr); for (i = 0; i < BTA_AV_NUM_RCB; i++) { p_rcb = &p_cb->rcb[i]; log::verbose("rcb[{}] rc_handle:{}, status=0x{:x}, shdl:{}, lidx:{}", i, @@ -2473,7 +2466,7 @@ void bta_av_rc_closed(tBTA_AV_DATA* p_data) { p_scb = bta_av_cb.p_scb[p_rcb->shdl - 1]; if (p_scb && !(p_scb->PeerAddress() == p_msg->peer_addr)) { log::verbose("handle{} {} error p_scb or addr", i, - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + p_scb->PeerAddress()); conn = true; continue; } @@ -2501,8 +2494,7 @@ void bta_av_rc_closed(tBTA_AV_DATA* p_data) { /* if the RCB uses the extra LCB, use the addr for event and clean it */ p_lcb = &p_cb->lcb[BTA_AV_NUM_LINKS]; rc_close.peer_addr = p_msg->peer_addr; - log::info("rc_only closed bd_addr: {}", - ADDRESS_TO_LOGGABLE_CSTR(p_msg->peer_addr)); + log::info("rc_only closed bd_addr: {}", p_msg->peer_addr); p_lcb->conn_msk = 0; p_lcb->lidx = 0; } @@ -2554,8 +2546,7 @@ void bta_av_rc_browse_opened(tBTA_AV_DATA* p_data) { tBTA_AV_RC_CONN_CHG* p_msg = (tBTA_AV_RC_CONN_CHG*)p_data; tBTA_AV_RC_BROWSE_OPEN rc_browse_open; - log::info("peer_addr: {} rc_handle:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_msg->peer_addr), p_msg->handle); + log::info("peer_addr: {} rc_handle:{}", p_msg->peer_addr, p_msg->handle); rc_browse_open.status = BTA_AV_SUCCESS; rc_browse_open.rc_handle = p_msg->handle; @@ -2580,8 +2571,7 @@ void bta_av_rc_browse_closed(tBTA_AV_DATA* p_data) { tBTA_AV_RC_CONN_CHG* p_msg = (tBTA_AV_RC_CONN_CHG*)p_data; tBTA_AV_RC_BROWSE_CLOSE rc_browse_close; - log::info("peer_addr: {} rc_handle:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_msg->peer_addr), p_msg->handle); + log::info("peer_addr: {} rc_handle:{}", p_msg->peer_addr, p_msg->handle); rc_browse_close.rc_handle = p_msg->handle; rc_browse_close.peer_addr = p_msg->peer_addr; diff --git a/system/bta/av/bta_av_api.cc b/system/bta/av/bta_av_api.cc index 334ad0c5b7..e2eb265f4c 100644 --- a/system/bta/av/bta_av_api.cc +++ b/system/bta/av/bta_av_api.cc @@ -155,8 +155,7 @@ void BTA_AvDeregister(tBTA_AV_HNDL hndl) { ******************************************************************************/ void BTA_AvOpen(const RawAddress& bd_addr, tBTA_AV_HNDL handle, bool use_rc, uint16_t uuid) { - log::info("peer {} bta_handle:0x{:x} use_rc={} uuid=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), handle, + log::info("peer {} bta_handle:0x{:x} use_rc={} uuid=0x{:x}", bd_addr, handle, (use_rc) ? "true" : "false", uuid); tBTA_AV_API_OPEN* p_buf = diff --git a/system/bta/av/bta_av_main.cc b/system/bta/av/bta_av_main.cc index 30cf5dd8a4..52bccfe3f8 100644 --- a/system/bta/av/bta_av_main.cc +++ b/system/bta/av/bta_av_main.cc @@ -355,8 +355,7 @@ void tBTA_AV_SCB::OnConnected(const RawAddress& peer_address) { peer_address_ = peer_address; if (peer_address.IsEmpty()) { - log::error("Invalid peer address: {}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::error("Invalid peer address: {}", peer_address); return; } @@ -366,8 +365,7 @@ void tBTA_AV_SCB::OnConnected(const RawAddress& peer_address) { if (!btif_config_get_bin(peer_address_.ToString(), BTIF_STORAGE_KEY_AVDTP_VERSION, (uint8_t*)&avdtp_version, &version_value_size)) { - log::warn("Failed to read cached peer AVDTP version for {}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address_)); + log::warn("Failed to read cached peer AVDTP version for {}", peer_address_); } else { SetAvdtpVersion(avdtp_version); } @@ -380,8 +378,8 @@ void tBTA_AV_SCB::OnDisconnected() { void tBTA_AV_SCB::SetAvdtpVersion(uint16_t avdtp_version) { avdtp_version_ = avdtp_version; - log::info("AVDTP version for {} set to 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address_), avdtp_version_); + log::info("AVDTP version for {} set to 0x{:x}", peer_address_, + avdtp_version_); } /******************************************************************************* @@ -411,8 +409,7 @@ void bta_av_conn_cback(uint8_t /* handle */, const RawAddress& bd_addr, if (p_scb) { log::verbose("bta_handle x{:x}, role x{:x}", p_scb->hndl, p_scb->role); } - log::info("conn_cback bd_addr: {}, scb_index: {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), scb_index); + log::info("conn_cback bd_addr: {}, scb_index: {}", bd_addr, scb_index); bta_sys_sendmsg(p_msg); } } @@ -877,8 +874,8 @@ bool bta_av_chk_start(tBTA_AV_SCB* p_scb) { log::info( "peer {} channel:{} bta_av_cb.audio_open_cnt:{} role:0x{:x} " "features:0x{:x} start:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->chnl, - bta_av_cb.audio_open_cnt, p_scb->role, bta_av_cb.features, start); + p_scb->PeerAddress(), p_scb->chnl, bta_av_cb.audio_open_cnt, p_scb->role, + bta_av_cb.features, start); return start; } @@ -927,8 +924,7 @@ static void bta_av_sys_rs_cback(tBTA_SYS_CONN_STATUS /* status */, uint8_t peer_idx = 0; log::verbose("peer {} new_role:{} hci_status:0x{:x} bta_av_cb.rs_idx:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), new_role, hci_status, - bta_av_cb.rs_idx); + peer_addr, new_role, hci_status, bta_av_cb.rs_idx); for (i = 0; i < BTA_AV_NUM_STRS; i++) { /* loop through all the SCBs to find matching peer addresses and report the @@ -940,8 +936,7 @@ static void bta_av_sys_rs_cback(tBTA_SYS_CONN_STATUS /* status */, (tBTA_AV_ROLE_RES*)osi_malloc(sizeof(tBTA_AV_ROLE_RES)); log::verbose( "peer {} found: new_role:{}, hci_status:0x{:x} bta_handle:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), new_role, hci_status, - p_scb->hndl); + peer_addr, new_role, hci_status, p_scb->hndl); p_buf->hdr.event = BTA_AV_ROLE_CHANGE_EVT; p_buf->hdr.layer_specific = p_scb->hndl; p_buf->new_role = new_role; @@ -968,8 +963,8 @@ static void bta_av_sys_rs_cback(tBTA_SYS_CONN_STATUS /* status */, } if (p_scb && p_scb->q_tag == BTA_AV_Q_TAG_OPEN) { log::verbose("peer {} rs_idx:{}, bta_handle:0x{:x} q_tag:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), - bta_av_cb.rs_idx, p_scb->hndl, p_scb->q_tag); + p_scb->PeerAddress(), bta_av_cb.rs_idx, p_scb->hndl, + p_scb->q_tag); if (HCI_SUCCESS == hci_status || HCI_ERR_NO_CONNECTION == hci_status) { p_scb->q_info.open.switch_res = BTA_AV_RS_OK; @@ -977,9 +972,7 @@ static void bta_av_sys_rs_cback(tBTA_SYS_CONN_STATUS /* status */, log::error( "peer {} (p_scb peer {}) role switch failed: new_role:{} " "hci_status:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), new_role, - hci_status); + peer_addr, p_scb->PeerAddress(), new_role, hci_status); p_scb->q_info.open.switch_res = BTA_AV_RS_FAIL; } @@ -1013,8 +1006,7 @@ static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status, num_sco_links); if (num_sco_links) { bta_av_cb.sco_occupied = true; - log::debug("SCO occupied peer:{} status:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), + log::debug("SCO occupied peer:{} status:{}", peer_addr, bta_sys_conn_status_text(status)); if (bta_av_cb.features & BTA_AV_FEAT_NO_SCO_SSPD) { @@ -1037,8 +1029,7 @@ static void bta_av_sco_chg_cback(tBTA_SYS_CONN_STATUS status, } } else { bta_av_cb.sco_occupied = false; - log::debug("SCO unoccupied peer:{} status:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), + log::debug("SCO unoccupied peer:{} status:{}", peer_addr, bta_sys_conn_status_text(status)); if (bta_av_cb.features & BTA_AV_FEAT_NO_SCO_SSPD) { @@ -1123,8 +1114,7 @@ bool bta_av_switch_if_needed(tBTA_AV_SCB* p_scb) { bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits) { tHCI_ROLE role; if (BTM_GetRole(p_scb->PeerAddress(), &role) != BTM_SUCCESS) { - log::warn("Unable to find link role for device:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + log::warn("Unable to find link role for device:{}", p_scb->PeerAddress()); return true; } @@ -1132,8 +1122,8 @@ bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits) { log::info( "Switch link role to central peer:{} bta_handle:0x{:x} current_role:{} " "conn_audio:0x{:x} bits:{} features:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - RoleText(role), bta_av_cb.conn_audio, bits, bta_av_cb.features); + p_scb->PeerAddress(), p_scb->hndl, RoleText(role), bta_av_cb.conn_audio, + bits, bta_av_cb.features); const tBTM_STATUS status = BTM_SwitchRoleToCentral(p_scb->PeerAddress()); switch (status) { case BTM_CMD_STARTED: @@ -1144,14 +1134,13 @@ bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits) { // a result such that a timer will not start to repeatedly // try something not possible. log::error("Link can never role switch to central device:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress())); + p_scb->PeerAddress()); break; default: /* can not switch role on SCB - start the timer on SCB */ p_scb->wait |= BTA_AV_WAIT_ROLE_SW_RES_START; log::error("Unable to switch role to central device:{} error:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), - btm_status_text(status)); + p_scb->PeerAddress(), btm_status_text(status)); return false; } } diff --git a/system/bta/av/bta_av_ssm.cc b/system/bta/av/bta_av_ssm.cc index a8c0259316..4127f0f965 100644 --- a/system/bta/av/bta_av_ssm.cc +++ b/system/bta/av/bta_av_ssm.cc @@ -424,15 +424,14 @@ static void bta_av_better_stream_state_machine(tBTA_AV_SCB* p_scb, if (previous_state != p_scb->state) { log::info( "peer {} p_scb={:#x}({}) AV event=0x{:x}({}) state={}({}) -> {}({})", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - fmt::ptr(p_scb), event, bta_av_evt_code(event), previous_state, - bta_av_sst_code(previous_state), p_scb->state, - bta_av_sst_code(p_scb->state)); + p_scb->PeerAddress(), p_scb->hndl, fmt::ptr(p_scb), event, + bta_av_evt_code(event), previous_state, bta_av_sst_code(previous_state), + p_scb->state, bta_av_sst_code(p_scb->state)); } else { log::verbose("peer {} p_scb={:#x}({}) AV event=0x{:x}({}) state={}({})", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, - fmt::ptr(p_scb), event, bta_av_evt_code(event), p_scb->state, + p_scb->PeerAddress(), p_scb->hndl, fmt::ptr(p_scb), event, + bta_av_evt_code(event), p_scb->state, bta_av_sst_code(p_scb->state)); } @@ -524,7 +523,7 @@ void bta_av_set_scb_sst_init(tBTA_AV_SCB* p_scb) { log::verbose( "peer {} AV (hndl=0x{:x}) state={}({}) next state={}({}) p_scb={}", - ADDRESS_TO_LOGGABLE_CSTR(p_scb->PeerAddress()), p_scb->hndl, p_scb->state, + p_scb->PeerAddress(), p_scb->hndl, p_scb->state, bta_av_sst_code(p_scb->state), next_state, bta_av_sst_code(next_state), fmt::ptr(p_scb)); diff --git a/system/bta/csis/csis_client.cc b/system/bta/csis/csis_client.cc index 551ac70b53..c149c3b135 100644 --- a/system/bta/csis/csis_client.cc +++ b/system/bta/csis/csis_client.cc @@ -159,8 +159,7 @@ class CsisClientImpl : public CsisClient { std::shared_ptr<bluetooth::csis::CsisGroup> AssignCsisGroup( const RawAddress& address, int group_id, bool create_group_if_non_existing, const bluetooth::Uuid& uuid) { - log::debug("Device: {}, group_id: {}", ADDRESS_TO_LOGGABLE_CSTR(address), - group_id); + log::debug("Device: {}, group_id: {}", address, group_id); auto csis_group = FindCsisGroup(group_id); if (!csis_group) { if (create_group_if_non_existing) { @@ -189,14 +188,14 @@ class CsisClientImpl : public CsisClient { void OnGroupAddedCb(const RawAddress& address, const bluetooth::Uuid& uuid, int group_id) { - log::debug("address: {}, uuid: {}, group_id: {}", - ADDRESS_TO_LOGGABLE_CSTR(address), uuid.ToString(), group_id); + log::debug("address: {}, uuid: {}, group_id: {}", address, uuid.ToString(), + group_id); AssignCsisGroup(address, group_id, true, uuid); } void OnGroupMemberAddedCb(const RawAddress& address, int group_id) { - log::debug("{}, group_id: {}", ADDRESS_TO_LOGGABLE_CSTR(address), group_id); + log::debug("{}, group_id: {}", address, group_id); AssignCsisGroup(address, group_id, false, Uuid::kEmpty); } @@ -206,7 +205,7 @@ class CsisClientImpl : public CsisClient { } void OnGroupMemberRemovedCb(const RawAddress& address, int group_id) { - log::debug("{}, group_id: {}", ADDRESS_TO_LOGGABLE_CSTR(address), group_id); + log::debug("{}, group_id: {}", address, group_id); auto device = FindDeviceByAddress(address); if (device) RemoveCsisDevice(device, group_id); @@ -225,7 +224,7 @@ class CsisClientImpl : public CsisClient { if (!csis_group->IsDeviceInTheGroup(device)) { log::error("the csis group (id: {} ) does contain the device: {}", - group_id, ADDRESS_TO_LOGGABLE_CSTR(address)); + group_id, address); return; } @@ -244,13 +243,12 @@ class CsisClientImpl : public CsisClient { } void Connect(const RawAddress& address) override { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); auto device = FindDeviceByAddress(address); if (device == nullptr) { if (!BTM_IsLinkKeyKnown(address, BT_TRANSPORT_LE)) { - log::error("Connecting {} when not bonded", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Connecting {} when not bonded", address); callbacks_->OnConnectionState(address, ConnectionState::DISCONNECTED); return; } @@ -263,12 +261,11 @@ class CsisClientImpl : public CsisClient { } void Disconnect(const RawAddress& addr) override { - log::debug("{}", ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::debug("{}", addr); auto device = FindDeviceByAddress(addr); if (device == nullptr) { - log::warn("Device not connected to profile {}", - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::warn("Device not connected to profile {}", addr); callbacks_->OnConnectionState(addr, ConnectionState::DISCONNECTED); return; } @@ -284,11 +281,11 @@ class CsisClientImpl : public CsisClient { } void RemoveDevice(const RawAddress& addr) override { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::info("{}", addr); auto device = FindDeviceByAddress(addr); if (device == nullptr) { - log::warn("{} not found", ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::warn("{} not found", addr); return; } @@ -354,9 +351,8 @@ class CsisClientImpl : public CsisClient { CsisLockState target_lock_state = csis_group->GetTargetLockState(); - log::debug("Device {}, target lock: {}, status: 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr), (int)target_lock_state, - (int)status); + log::debug("Device {}, target lock: {}, status: 0x{:02x}", device->addr, + (int)target_lock_state, (int)status); if (target_lock_state == CsisLockState::CSIS_STATE_UNSET) return; if (status != GATT_SUCCESS && @@ -374,8 +370,7 @@ class CsisClientImpl : public CsisClient { HandleCsisLockProcedureError(csis_group, device); if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } return; @@ -434,8 +429,8 @@ class CsisClientImpl : public CsisClient { (std::underlying_type<CsisLockState>::type)lock}; log::info("{}, rank: {}, conn_id: 0x{:04x}, handle: 0x{:04x}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr), csis_instance->GetRank(), - device->conn_id, csis_instance->svc_data.lock_handle.val_hdl); + device->addr, csis_instance->GetRank(), device->conn_id, + csis_instance->svc_data.lock_handle.val_hdl); BtaGattQueue::WriteCharacteristic( device->conn_id, csis_instance->svc_data.lock_handle.val_hdl, value, @@ -575,18 +570,16 @@ class CsisClientImpl : public CsisClient { bool SerializeSets(const RawAddress& addr, std::vector<uint8_t>& out) const { auto device = FindDeviceByAddress(addr); if (device == nullptr) { - log::warn("Skipping unknown device addr= {}", - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::warn("Skipping unknown device addr= {}", addr); return false; } if (device->GetNumberOfCsisInstances() == 0) { - log::warn("No CSIS instances for addr= {}", - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::warn("No CSIS instances for addr= {}", addr); return false; } - log::debug(": device= {}", ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::debug(": device= {}", device->addr); auto num_sets = device->GetNumberOfCsisInstances(); if ((num_sets == 0) || (num_sets > std::numeric_limits<uint8_t>::max())) @@ -674,14 +667,14 @@ class CsisClientImpl : public CsisClient { /* Oportunistic works only for direct connect, * but in fact this is background connect */ - log::info(": {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info(": {}", address); BTA_GATTC_Open(gatt_if_, address, BTM_BLE_DIRECT_CONNECTION, true); } void AddFromStorage(const RawAddress& addr, const std::vector<uint8_t>& in) { auto group_rank_map = DeserializeSets(addr, in); - log::debug("{}, number of groups {}", ADDRESS_TO_LOGGABLE_CSTR(addr), + log::debug("{}, number of groups {}", addr, static_cast<int>(csis_groups_.size())); auto device = FindDeviceByAddress(addr); @@ -864,7 +857,7 @@ class CsisClientImpl : public CsisClient { /* Handle encryption */ void OnEncrypted(std::shared_ptr<CsisDevice>& device) { - log::debug("{}", ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::debug("{}", device->addr); if (device->is_gatt_service_valid) { NotifyCsisDeviceValidAndStoreIfNeeded(device); @@ -945,27 +938,26 @@ class CsisClientImpl : public CsisClient { } if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); return; } if (status == GATT_SUCCESS) { log::info("Successfully registered on ccc: 0x{:04x}, device: {}", handle, - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + device->addr); return; } log::error( "Failed to register for indications: 0x{:04x}, device: {}, status: " "0x{:02x}", - handle, ADDRESS_TO_LOGGABLE_CSTR(device->addr), status); + handle, device->addr, status); auto val_handle = device->FindValueHandleByCccHandle(handle); if (!val_handle) { log::error("Unknown ccc handle: 0x{:04x}, device: {}", handle, - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + device->addr); return; } @@ -1088,13 +1080,11 @@ class CsisClientImpl : public CsisClient { return; } - log::debug("{}, status: 0x{:02x}", ADDRESS_TO_LOGGABLE_CSTR(device->addr), - status); + log::debug("{}, status: 0x{:02x}", device->addr, status); if (status != GATT_SUCCESS) { if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } else { log::error("Could not read characteristic at handle=0x{:04x}", handle); @@ -1137,13 +1127,11 @@ class CsisClientImpl : public CsisClient { return; } - log::info("{}, status 0x{:02x}", ADDRESS_TO_LOGGABLE_CSTR(device->addr), - status); + log::info("{}, status 0x{:02x}", device->addr, status); if (status != GATT_SUCCESS) { if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } else { log::error("Could not read characteristic at handle=0x{:04x}", handle); @@ -1179,12 +1167,11 @@ class CsisClientImpl : public CsisClient { return; } - log::debug("{}, status: 0x{:02x}, rank: {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr), status, value[0]); + log::debug("{}, status: 0x{:02x}, rank: {}", device->addr, status, + value[0]); if (status != GATT_SUCCESS) { if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } else { log::error("Could not read characteristic at handle=0x{:04x}", handle); @@ -1253,7 +1240,7 @@ class CsisClientImpl : public CsisClient { Octet16& sirk) { auto pltk = BTM_BleGetPeerLTK(address); if (!pltk.has_value()) { - log::error("No security for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("No security for {}", address); return false; } @@ -1355,8 +1342,7 @@ class CsisClientImpl : public CsisClient { void OnActiveScanResult(const tBTA_DM_INQ_RES* result) { auto csis_device = FindDeviceByAddress(result->bd_addr); if (csis_device) { - log::debug("Drop same device .. {}", - ADDRESS_TO_LOGGABLE_CSTR(result->bd_addr)); + log::debug("Drop same device .. {}", result->bd_addr); return; } @@ -1365,9 +1351,8 @@ class CsisClientImpl : public CsisClient { */ if (BTM_BleIsLinkKeyKnown(result->bd_addr)) { log::verbose("Device {} already bonded. Identity address: {}", - ADDRESS_TO_LOGGABLE_CSTR(result->bd_addr), - ADDRESS_TO_LOGGABLE_CSTR( - *BTM_BleGetIdentityAddress(result->bd_addr))); + result->bd_addr, + *BTM_BleGetIdentityAddress(result->bd_addr)); return; } @@ -1393,8 +1378,7 @@ class CsisClientImpl : public CsisClient { return csis_group->IsRsiMatching(rsi); }); if (discovered_group_rsi != all_rsi.cend()) { - log::debug("Found set member {}", - ADDRESS_TO_LOGGABLE_CSTR(result->bd_addr)); + log::debug("Found set member {}", result->bd_addr); CacheAndAdvertiseExpectedMember(result->bd_addr, csis_group->GetGroupId()); @@ -1475,8 +1459,8 @@ class CsisClientImpl : public CsisClient { continue; } - log::info("Device {} from inquiry cache match to group id {}", - ADDRESS_TO_LOGGABLE_CSTR(address), csis_group->GetGroupId()); + log::info("Device {} from inquiry cache match to group id {}", address, + csis_group->GetGroupId()); callbacks_->OnSetMemberAvailable(address, csis_group->GetGroupId()); break; } @@ -1506,8 +1490,7 @@ class CsisClientImpl : public CsisClient { auto csis_device = FindDeviceByAddress(result->bd_addr); if (csis_device) { - log::debug("Drop known device {}", - ADDRESS_TO_LOGGABLE_CSTR(result->bd_addr)); + log::debug("Drop known device {}", result->bd_addr); return; } @@ -1516,9 +1499,8 @@ class CsisClientImpl : public CsisClient { */ if (BTM_BleIsLinkKeyKnown(result->bd_addr)) { log::verbose("Device {} already bonded. Identity address: {}", - ADDRESS_TO_LOGGABLE_CSTR(result->bd_addr), - ADDRESS_TO_LOGGABLE_CSTR( - *BTM_BleGetIdentityAddress(result->bd_addr))); + result->bd_addr, + *BTM_BleGetIdentityAddress(result->bd_addr)); return; } @@ -1529,8 +1511,7 @@ class CsisClientImpl : public CsisClient { for (auto& group : csis_groups_) { for (auto& rsi : all_rsi) { if (group->IsRsiMatching(rsi)) { - log::info("Device {} match to group id {}", - ADDRESS_TO_LOGGABLE_CSTR(result->bd_addr), + log::info("Device {} match to group id {}", result->bd_addr, group->GetGroupId()); if (group->GetDesiredSize() > 0 && (group->GetCurrentSize() == group->GetDesiredSize())) { @@ -1585,8 +1566,7 @@ class CsisClientImpl : public CsisClient { return; } - log::debug("{}, status: 0x{:02x}", ADDRESS_TO_LOGGABLE_CSTR(device->addr), - status); + log::debug("{}, status: 0x{:02x}", device->addr, status); if (status != GATT_SUCCESS) { /* TODO handle error codes: @@ -1594,8 +1574,7 @@ class CsisClientImpl : public CsisClient { * kCsisErrorCodeLockOobSirkOnly */ if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } else { log::error("Could not read characteristic at handle=0x{:04x}", handle); @@ -1686,7 +1665,7 @@ class CsisClientImpl : public CsisClient { #ifdef CSIS_DEBUG log::info("SIRK {}, address: {}", base::HexEncode(received_sirk.data(), 16), - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + device->addr); #endif log::verbose("Expected group size {}, actual group Size: {}", @@ -1725,7 +1704,7 @@ class CsisClientImpl : public CsisClient { } void DoDisconnectCleanUp(std::shared_ptr<CsisDevice> device) { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("{}", device->addr); DeregisterNotifications(device); @@ -1773,14 +1752,12 @@ class CsisClientImpl : public CsisClient { "Lock UUID found handle: 0x{:04x}, ccc handle: 0x{:04x}, device: " "{}", csis_inst->svc_data.lock_handle.val_hdl, - csis_inst->svc_data.lock_handle.ccc_hdl, - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + csis_inst->svc_data.lock_handle.ccc_hdl, device->addr); } else if (charac.uuid == kCsisRankUuid) { csis_inst->svc_data.rank_handle = charac.value_handle; log::debug("Rank UUID found handle: 0x{:04x}, device: {}", - csis_inst->svc_data.rank_handle, - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + csis_inst->svc_data.rank_handle, device->addr); } else if (charac.uuid == kCsisSirkUuid) { /* Find the optional CCC descriptor */ uint16_t ccc_handle = @@ -1796,8 +1773,7 @@ class CsisClientImpl : public CsisClient { "SIRK UUID found handle: 0x{:04x}, ccc handle: 0x{:04x}, device: " "{}", csis_inst->svc_data.sirk_handle.val_hdl, - csis_inst->svc_data.sirk_handle.ccc_hdl, - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + csis_inst->svc_data.sirk_handle.ccc_hdl, device->addr); } else if (charac.uuid == kCsisSizeUuid) { /* Find the optional CCC descriptor */ uint16_t ccc_handle = @@ -1813,8 +1789,7 @@ class CsisClientImpl : public CsisClient { "Size UUID found handle: 0x{:04x}, ccc handle: 0x{:04x}, device: " "{}", csis_inst->svc_data.size_handle.val_hdl, - csis_inst->svc_data.size_handle.ccc_hdl, - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + csis_inst->svc_data.size_handle.ccc_hdl, device->addr); } } @@ -1955,9 +1930,8 @@ class CsisClientImpl : public CsisClient { void OnGattConnected(const tBTA_GATTC_OPEN& evt) { log::info("{}, conn_id=0x{:04x}, transport={}, status={}(0x{:02x})", - ADDRESS_TO_LOGGABLE_CSTR(evt.remote_bda), evt.conn_id, - bt_transport_text(evt.transport), gatt_status_text(evt.status), - evt.status); + evt.remote_bda, evt.conn_id, bt_transport_text(evt.transport), + gatt_status_text(evt.status), evt.status); if (evt.transport != BT_TRANSPORT_LE) { log::warn("Only LE connection is allowed (transport {})", @@ -1968,15 +1942,13 @@ class CsisClientImpl : public CsisClient { auto device = FindDeviceByAddress(evt.remote_bda); if (device == nullptr) { - log::debug("Skipping unknown device, address= {}", - ADDRESS_TO_LOGGABLE_CSTR(evt.remote_bda)); + log::debug("Skipping unknown device, address= {}", evt.remote_bda); BTA_GATTC_Close(evt.conn_id); return; } if (evt.status != GATT_SUCCESS) { - log::error("Failed to connect to server device {}", - ADDRESS_TO_LOGGABLE_CSTR(evt.remote_bda)); + log::error("Failed to connect to server device {}", evt.remote_bda); if (device->connecting_actively) callbacks_->OnConnectionState(evt.remote_bda, ConnectionState::DISCONNECTED); @@ -2005,11 +1977,10 @@ class CsisClientImpl : public CsisClient { nullptr, BTM_BLE_SEC_ENCRYPT); log::info("Encryption required for {}. Request result: 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr), result); + device->addr, result); if (result == BTM_ERR_KEY_MISSING) { - log::error("Link key unknown for {}, disconnect profile", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::error("Link key unknown for {}, disconnect profile", device->addr); BTA_GATTC_Close(device->conn_id); } } @@ -2022,7 +1993,7 @@ class CsisClientImpl : public CsisClient { return; } - log::debug("device={}", ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::debug("device={}", device->addr); callbacks_->OnConnectionState(evt.remote_bda, ConnectionState::DISCONNECTED); @@ -2147,11 +2118,10 @@ class CsisClientImpl : public CsisClient { } void OnLeEncryptionComplete(const RawAddress& address, uint8_t status) { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); auto device = FindDeviceByAddress(address); if (device == nullptr) { - log::warn("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Skipping unknown device {}", address); return; } @@ -2171,7 +2141,7 @@ class CsisClientImpl : public CsisClient { void ClearDeviceInformationAndStartSearch( std::shared_ptr<CsisDevice> device) { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("{}", device->addr); if (device->is_gatt_service_valid == false) { log::debug("Device database already invalidated."); return; @@ -2187,24 +2157,22 @@ class CsisClientImpl : public CsisClient { void OnGattServiceChangeEvent(const RawAddress& address) { auto device = FindDeviceByAddress(address); if (!device) { - log::warn("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Skipping unknown device {}", address); return; } - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); ClearDeviceInformationAndStartSearch(device); } void OnGattServiceDiscoveryDoneEvent(const RawAddress& address) { auto device = FindDeviceByAddress(address); if (!device) { - log::warn("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Skipping unknown device {}", address); return; } - log::debug("address={}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("address={}", address); if (!device->is_gatt_service_valid) BTA_GATTC_ServiceSearchRequest(device->conn_id, &kCsisServiceUuid); @@ -2269,12 +2237,11 @@ class CsisClientImpl : public CsisClient { const RawAddress& address, uint8_t sirk_type, Octet16& received_sirk) { - log::info("{}, status: 0x{:02x}", ADDRESS_TO_LOGGABLE_CSTR(address), - status); + log::info("{}, status: 0x{:02x}", address, status); auto device = FindDeviceByAddress(address); if (device == nullptr) { - log::error("Unknown device {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Unknown device {}", address); BTA_DmSirkConfirmDeviceReply(address, false); return; } @@ -2303,8 +2270,7 @@ class CsisClientImpl : public CsisClient { /* Verify if sirk is not all zeros */ Octet16 zero{}; if (memcmp(zero.data(), received_sirk.data(), 16) == 0) { - log::error("Received invalid zero SIRK address: {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Received invalid zero SIRK address: {}", address); BTA_DmSirkConfirmDeviceReply(address, false); return; } @@ -2323,13 +2289,12 @@ class CsisClientImpl : public CsisClient { * match for group. */ log::error("Joining device {}, does not match any existig group", - ADDRESS_TO_LOGGABLE_CSTR(address)); + address); BTA_DmSirkConfirmDeviceReply(address, false); return; } - log::info("Device {}, verified successfully by SIRK", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Device {}, verified successfully by SIRK", address); BTA_DmSirkConfirmDeviceReply(address, true); /* It was temporary device and we can remove it. When upper layer @@ -2341,7 +2306,7 @@ class CsisClientImpl : public CsisClient { void VerifySetMember(const RawAddress& address) { auto device = FindDeviceByAddress(address); - log::info("Device: {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Device: {}", address); /* It's ok for device to not be a CSIS device at all */ if (!device) { @@ -2355,8 +2320,7 @@ class CsisClientImpl : public CsisClient { log::warn( "Device {} (conn_id=0x{:04x}) is already known to CSIS (# of " "instances={}) but it is not scheduled to join any group.", - ADDRESS_TO_LOGGABLE_CSTR(address), device->conn_id, - device->GetNumberOfCsisInstances()); + address, device->conn_id, device->GetNumberOfCsisInstances()); BTA_DmSirkConfirmDeviceReply(address, true); return; } @@ -2365,8 +2329,7 @@ class CsisClientImpl : public CsisClient { address, base::BindOnce(&CsisClientImpl::SirkValueReadCompleteDuringPairing, weak_factory_.GetWeakPtr()))) { - log::error("Could not read SIKR of {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Could not read SIKR of {}", address); BTA_DmSirkConfirmDeviceReply(address, false); return; } diff --git a/system/bta/csis/csis_types.h b/system/bta/csis/csis_types.h index 7104df0315..0fb3a56c58 100644 --- a/system/bta/csis/csis_types.h +++ b/system/bta/csis/csis_types.h @@ -273,8 +273,7 @@ class CsisDevice : public GattServiceDevice { } csis_instances_.insert({handle, csis_instance}); - log::debug("instance added: 0x{:04x}, device {}", handle, - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::debug("instance added: 0x{:04x}, device {}", handle, addr); } void RemoveCsisInstance(int group_id) { @@ -296,14 +295,13 @@ class CsisDevice : public GattServiceDevice { } void SetExpectedGroupIdMember(int group_id) { - log::info("Expected Group ID: {}, for member: {} is set", group_id, - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::info("Expected Group ID: {}, for member: {} is set", group_id, addr); expected_group_id_member_ = group_id; } void SetPairingSirkReadFlag(bool flag) { log::info("Pairing flag for Group ID: {}, member: {} is set to {}", - expected_group_id_member_, ADDRESS_TO_LOGGABLE_CSTR(addr), flag); + expected_group_id_member_, addr, flag); pairing_sirk_read_flag_ = flag; } @@ -426,8 +424,7 @@ class CsisGroup { auto iter = std::find_if( devices_.begin(), devices_.end(), [id, &number_of_connected](auto& d) { if (!d->IsConnected()) { - log::debug("Device {} is not connected in group {}", - ADDRESS_TO_LOGGABLE_CSTR(d->addr), id); + log::debug("Device {} is not connected in group {}", d->addr, id); return false; } auto inst = d->GetCsisInstanceByGroupId(id); @@ -436,8 +433,7 @@ class CsisGroup { return false; } number_of_connected++; - log::debug("Device {}, lock state: {}", - ADDRESS_TO_LOGGABLE_CSTR(d->addr), + log::debug("Device {}, lock state: {}", d->addr, (int)inst->GetLockState()); return inst->GetLockState() == CsisLockState::CSIS_STATE_LOCKED; }); @@ -446,7 +442,7 @@ class CsisGroup { number_of_connected); /* If there is no locked device, we are good to go */ if (iter != devices_.end()) { - log::warn("Device {} is locked", ADDRESS_TO_LOGGABLE_CSTR((*iter)->addr)); + log::warn("Device {} is locked", (*iter)->addr); return false; } diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc index f1f65ef8fb..d80cbeca68 100644 --- a/system/bta/dm/bta_dm_act.cc +++ b/system/bta/dm/bta_dm_act.cc @@ -518,8 +518,8 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { other_transport = connected_with_br_edr ? BT_TRANSPORT_BR_EDR : BT_TRANSPORT_LE; } - log::info("other_address {} with transport {} connected", - ADDRESS_TO_LOGGABLE_CSTR(other_address), other_transport); + log::info("other_address {} with transport {} connected", other_address, + other_transport); /* Take the link down first, and mark the device for removal when * disconnected */ for (int i = 0; i < bta_dm_cb.device_list.count; i++) { @@ -527,8 +527,7 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { if (peer_device.peer_bdaddr == other_address && peer_device.transport == other_transport) { peer_device.conn_state = BTA_DM_UNPAIRING; - log::info("Remove ACL of address {}", - ADDRESS_TO_LOGGABLE_CSTR(other_address)); + log::info("Remove ACL of address {}", other_address); /* Make sure device is not in acceptlist before we disconnect */ GATT_CancelConnect(0, bd_addr, false); @@ -569,15 +568,14 @@ static void handle_role_change(const RawAddress& bd_addr, tHCI_ROLE new_role, log::warn( "Unable to find device for role change peer:{} new_role:{} " "hci_status:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), RoleText(new_role), - hci_error_code_text(hci_status)); + bd_addr, RoleText(new_role), hci_error_code_text(hci_status)); return; } log::info( "Role change callback peer:{} info:{} new_role:{} dev count:{} " "hci_status:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), p_dev->info_text(), RoleText(new_role), + bd_addr, p_dev->info_text(), RoleText(new_role), bta_dm_cb.device_list.count, hci_error_code_text(hci_status)); if (p_dev->is_av_active()) { @@ -619,19 +617,16 @@ void BTA_dm_report_role_change(const RawAddress bd_addr, tHCI_ROLE new_role, void handle_remote_features_complete(const RawAddress& bd_addr) { tBTA_DM_PEER_DEVICE* p_dev = bta_dm_find_peer_device(bd_addr); if (!p_dev) { - log::warn("Unable to find device peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("Unable to find device peer:{}", bd_addr); return; } if (bluetooth::shim::GetController()->SupportsSniffSubrating() && acl_peer_supports_sniff_subrating(bd_addr)) { - log::debug("Device supports sniff subrating peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Device supports sniff subrating peer:{}", bd_addr); p_dev->set_both_device_ssr_capable(); } else { - log::debug("Device does NOT support sniff subrating peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Device does NOT support sniff subrating peer:{}", bd_addr); } } @@ -669,9 +664,8 @@ void bta_dm_acl_up(const RawAddress& bd_addr, tBT_TRANSPORT transport, log::warn("Unable to allocate device resources for new connection"); return; } - log::info("Acl connected peer:{} transport:{} handle:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), bt_transport_text(transport), - acl_handle); + log::info("Acl connected peer:{} transport:{} handle:{}", bd_addr, + bt_transport_text(transport), acl_handle); device->conn_state = BTA_DM_CONNECTED; device->pref_role = BTA_ANY_ROLE; device->reset_device_info(); @@ -779,8 +773,7 @@ static void bta_dm_acl_down(const RawAddress& bd_addr, } } if (remove_device) { - log::info("remove_dev_pending actually removing {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("remove_dev_pending actually removing {}", bd_addr); bta_dm_process_remove_device_no_callback(bd_addr); } @@ -877,7 +870,7 @@ static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, tBTA_SYS_ID id, log::debug("BTA Role management callback count:{} status:{} peer:{}", bta_dm_cb.cur_av_count, bta_sys_conn_status_text(status), - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + peer_addr); p_dev = bta_dm_find_peer_device(peer_addr); if (status == BTA_SYS_CONN_OPEN) { diff --git a/system/bta/dm/bta_dm_disc.cc b/system/bta/dm/bta_dm_disc.cc index 49cecf9093..df44bb23b5 100644 --- a/system/bta/dm/bta_dm_disc.cc +++ b/system/bta/dm/bta_dm_disc.cc @@ -356,8 +356,7 @@ static void bta_dm_discover(tBTA_DM_API_DISCOVER& discover) { log::info( "bta_dm_discovery: starting service discovery to {} , transport: {}", - ADDRESS_TO_LOGGABLE_CSTR(discover.bd_addr), - bt_transport_text(discover.transport)); + discover.bd_addr, bt_transport_text(discover.transport)); bta_dm_discover_services(discover.bd_addr); } @@ -541,7 +540,7 @@ static void store_avrcp_profile_feature(tSDP_DISC_REC* sdp_rec) { log::info("Saving avrcp_features: 0x{:x}", avrcp_features); } else { log::info("Failed to store avrcp_features 0x{:x} for {}", avrcp_features, - ADDRESS_TO_LOGGABLE_CSTR(sdp_rec->remote_bd_addr)); + sdp_rec->remote_bd_addr); } } @@ -582,7 +581,7 @@ static void bta_dm_store_audio_profiles_version() { sizeof(profile_version))) { } else { log::info("Failed to store peer profile version for {}", - ADDRESS_TO_LOGGABLE_CSTR(sdp_rec->remote_bd_addr)); + sdp_rec->remote_bd_addr); } } audio_profile.store_audio_profile_feature(sdp_rec); @@ -972,7 +971,7 @@ static void bta_dm_queue_search(tBTA_DM_API_SEARCH& search) { ******************************************************************************/ static void bta_dm_queue_disc(tBTA_DM_API_DISCOVER& discovery) { log::info("bta_dm_discovery: queuing service discovery to {}", - ADDRESS_TO_LOGGABLE_CSTR(discovery.bd_addr)); + discovery.bd_addr); bta_dm_search_cb.pending_discovery_queue.push(discovery); } @@ -1197,7 +1196,7 @@ static void bta_dm_discover_name(const RawAddress& remote_bd_addr) { const tBT_TRANSPORT transport = bta_dm_determine_discovery_transport(remote_bd_addr); - log::verbose("BDA: {}", ADDRESS_TO_LOGGABLE_STR(remote_bd_addr)); + log::verbose("BDA: {}", remote_bd_addr); bta_dm_search_cb.peer_bdaddr = remote_bd_addr; @@ -1226,7 +1225,7 @@ static void bta_dm_discover_name(const RawAddress& remote_bd_addr) { bluetooth::common::init_flags::sdp_skip_rnr_if_known_is_enabled()) { log::debug( "Security record already known skipping read remote name peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(remote_bd_addr)); + remote_bd_addr); bta_dm_search_cb.name_discover_done = true; } @@ -1287,8 +1286,7 @@ static void bta_dm_discover_services(const RawAddress& remote_bd_addr) { bool sdp_disable = HID_HostSDPDisable(remote_bd_addr); if (sdp_disable) - log::debug("peer:{} with HIDSDPDisable attribute.", - ADDRESS_TO_LOGGABLE_CSTR(remote_bd_addr)); + log::debug("peer:{} with HIDSDPDisable attribute.", remote_bd_addr); /* if application wants to discover service and HIDSDPDisable attribute is false. @@ -1321,7 +1319,7 @@ static void bta_dm_discover_services(const RawAddress& remote_bd_addr) { if (transport == BT_TRANSPORT_LE) { if (bta_dm_search_cb.services_to_search & BTA_BLE_SERVICE_MASK) { log::info("bta_dm_discovery: starting GATT discovery on {}", - ADDRESS_TO_LOGGABLE_CSTR(bta_dm_search_cb.peer_bdaddr)); + bta_dm_search_cb.peer_bdaddr); // set the raw data buffer here memset(g_disc_raw_data_buf, 0, sizeof(g_disc_raw_data_buf)); /* start GATT for service discovery */ @@ -1330,7 +1328,7 @@ static void bta_dm_discover_services(const RawAddress& remote_bd_addr) { } } else { log::info("bta_dm_discovery: starting SDP discovery on {}", - ADDRESS_TO_LOGGABLE_CSTR(bta_dm_search_cb.peer_bdaddr)); + bta_dm_search_cb.peer_bdaddr); bta_dm_search_cb.sdp_results = false; bta_dm_find_services(bta_dm_search_cb.peer_bdaddr); return; @@ -1502,8 +1500,7 @@ static void bta_dm_remname_cback(const tBTM_REMOTE_DEV_NAME* p_remote_name) { log::info( "Remote name request complete peer:{} btm_status:{} hci_status:{} " "name[0]:{:c} length:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_remote_name->bd_addr), - btm_status_text(p_remote_name->status), + p_remote_name->bd_addr, btm_status_text(p_remote_name->status), hci_error_code_text(p_remote_name->hci_status), p_remote_name->remote_bd_name[0], strnlen((const char*)p_remote_name->remote_bd_name, BD_NAME_LEN)); @@ -1521,12 +1518,11 @@ static void bta_dm_remname_cback(const tBTM_REMOTE_DEV_NAME* p_remote_name) { log::info( "Assume command failed due to disconnection hci_status:{} peer:{}", hci_error_code_text(p_remote_name->hci_status), - ADDRESS_TO_LOGGABLE_CSTR(p_remote_name->bd_addr)); + p_remote_name->bd_addr); } else { log::info( "Ignored remote name response for the wrong address exp:{} act:{}", - ADDRESS_TO_LOGGABLE_CSTR(bta_dm_search_cb.peer_bdaddr), - ADDRESS_TO_LOGGABLE_CSTR(p_remote_name->bd_addr)); + bta_dm_search_cb.peer_bdaddr, p_remote_name->bd_addr); return; } } @@ -1867,7 +1863,7 @@ static void btm_dm_start_gatt_discovery(const RawAddress& bd_addr) { log::debug( "Use existing gatt client connection for discovery peer:{} " "transport:{} opportunistic:{:c}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), bt_transport_text(BT_TRANSPORT_LE), + bd_addr, bt_transport_text(BT_TRANSPORT_LE), (kUseOpportunistic) ? 'T' : 'F'); get_gatt_interface().BTA_GATTC_Open(bta_dm_search_cb.client_if, bd_addr, BTM_BLE_DIRECT_CONNECTION, @@ -1876,7 +1872,7 @@ static void btm_dm_start_gatt_discovery(const RawAddress& bd_addr) { log::debug( "Opening new gatt client connection for discovery peer:{} " "transport:{} opportunistic:{:c}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), bt_transport_text(BT_TRANSPORT_LE), + bd_addr, bt_transport_text(BT_TRANSPORT_LE), (!kUseOpportunistic) ? 'T' : 'F'); get_gatt_interface().BTA_GATTC_Open(bta_dm_search_cb.client_if, bd_addr, BTM_BLE_DIRECT_CONNECTION, @@ -1896,9 +1892,8 @@ static void btm_dm_start_gatt_discovery(const RawAddress& bd_addr) { ******************************************************************************/ static void bta_dm_proc_open_evt(tBTA_GATTC_OPEN* p_data) { log::verbose("DM Search state= {} search_cb.peer_dbaddr:{} connected_bda={}", - bta_dm_search_get_state(), - ADDRESS_TO_LOGGABLE_STR(bta_dm_search_cb.peer_bdaddr), - ADDRESS_TO_LOGGABLE_STR(p_data->remote_bda)); + bta_dm_search_get_state(), bta_dm_search_cb.peer_bdaddr, + p_data->remote_bda); log::debug("BTA_GATTC_OPEN_EVT conn_id = {} client_if={} status = {}", p_data->conn_id, p_data->client_if, p_data->status); diff --git a/system/bta/dm/bta_dm_pm.cc b/system/bta/dm/bta_dm_pm.cc index ed0830f4e4..212c2bf890 100644 --- a/system/bta/dm/bta_dm_pm.cc +++ b/system/bta/dm/bta_dm_pm.cc @@ -362,7 +362,7 @@ static void bta_dm_sniff_cback(uint8_t id, uint8_t app_id, tBTA_DM_PEER_DEVICE* p_peer_device = bta_dm_find_peer_device(peer_addr); if (p_peer_device == NULL) { - log::info("No peer device found: {}", ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + log::info("No peer device found: {}", peer_addr); return; } @@ -376,8 +376,7 @@ static void bta_dm_sniff_cback(uint8_t id, uint8_t app_id, } // Handle overflow access if (j > p_bta_dm_pm_cfg[0].app_id) { - log::info("No configuration found for {}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + log::info("No configuration found for {}", peer_addr); return; } const tBTA_DM_PM_CFG* p_pm_cfg = &p_bta_dm_pm_cfg[j]; @@ -446,8 +445,8 @@ static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, const tBTA_SYS_ID id, return; } - log::debug("Stopped all timers for service to device:{} id:{}[{}]", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), BtaIdSysText(id), id); + log::debug("Stopped all timers for service to device:{} id:{}[{}]", peer_addr, + BtaIdSysText(id), id); bta_dm_pm_stop_timer_by_srvc_id(peer_addr, static_cast<uint8_t>(id)); p_dev = bta_dm_find_peer_device(peer_addr); @@ -734,22 +733,20 @@ static void bta_dm_pm_set_mode(const RawAddress& peer_addr, if (pm_action == BTA_DM_PM_PARK) { p_peer_device->pm_mode_attempted = BTA_DM_PM_PARK; bta_dm_pm_park(peer_addr); - log::warn("DEPRECATED Setting link to park mode peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + log::warn("DEPRECATED Setting link to park mode peer:{}", peer_addr); } else if (pm_action & BTA_DM_PM_SNIFF) { /* dont initiate SNIFF, if link_policy has it disabled */ if (BTM_is_sniff_allowed_for(peer_addr)) { log::debug("Link policy allows sniff mode so setting mode peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + peer_addr); p_peer_device->pm_mode_attempted = BTA_DM_PM_SNIFF; bta_dm_pm_sniff(p_peer_device, (uint8_t)(pm_action & 0x0F)); } else { log::debug("Link policy disallows sniff mode, ignore request peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + peer_addr); } } else if (pm_action == BTA_DM_PM_ACTIVE) { - log::debug("Setting link to active mode peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + log::debug("Setting link to active mode peer:{}", peer_addr); bta_dm_pm_active(peer_addr); } } @@ -768,8 +765,7 @@ static bool bta_dm_pm_park(const RawAddress& peer_addr) { /* if not in park mode, switch to park */ if (!BTM_ReadPowerMode(peer_addr, &mode)) { - log::warn("Unable to read power mode for peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + log::warn("Unable to read power mode for peer:{}", peer_addr); } if (mode != BTM_PM_MD_PARK) { @@ -853,8 +849,7 @@ static void bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE* p_peer_dev, uint8_t index) { tBTM_STATUS status; if (!BTM_ReadPowerMode(p_peer_dev->peer_bdaddr, &mode)) { - log::warn("Unable to read power mode for peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer_dev->peer_bdaddr)); + log::warn("Unable to read power mode for peer:{}", p_peer_dev->peer_bdaddr); } tBTM_PM_STATUS mode_status = static_cast<tBTM_PM_STATUS>(mode); log::debug("Current power mode:{}[0x{:x}] peer_info:{}", @@ -873,8 +868,7 @@ static void bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE* p_peer_dev, uint8_t index) { * some agrresive headsets who use sniff latencies more than * DUT supported range of Sniff intervals.*/ if ((mode == BTM_PM_MD_SNIFF) && (p_peer_dev->is_remote_init_sniff())) { - log::debug("Link already in sniff mode peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer_dev->peer_bdaddr)); + log::debug("Link already in sniff mode peer:{}", p_peer_dev->peer_bdaddr); return; } } @@ -896,8 +890,7 @@ static void bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE* p_peer_dev, uint8_t index) { p_peer_dev->reset_sniff_flags(); } else { log::error("Unable to set power mode peer:{} status:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer_dev->peer_bdaddr), - btm_status_text(status)); + p_peer_dev->peer_bdaddr, btm_status_text(status)); p_peer_dev->reset_sniff_flags(); } } @@ -914,8 +907,8 @@ static void bta_dm_pm_ssr(const RawAddress& peer_addr, const int ssr) { int ssr_index = ssr; tBTA_DM_SSR_SPEC* p_spec = &p_bta_dm_ssr_spec[ssr]; - log::debug("Request to put link to device:{} into power_mode:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), p_spec->name); + log::debug("Request to put link to device:{} into power_mode:{}", peer_addr, + p_spec->name); /* go through the connected services */ for (int i = 0; i < bta_dm_conn_srvcs.count; i++) { const tBTA_DM_SRVCS& service = bta_dm_conn_srvcs.conn_srvc[i]; @@ -931,8 +924,7 @@ static void bta_dm_pm_ssr(const RawAddress& peer_addr, const int ssr) { if ((config.id == service.id) && ((config.app_id == BTA_ALL_APP_ID) || (config.app_id == service.app_id))) { log::info("Found connected service:{} app_id:{} peer:{} spec_name:{}", - BtaIdSysText(service.id), service.app_id, - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), + BtaIdSysText(service.id), service.app_id, peer_addr, p_bta_dm_ssr_spec[current_ssr_index].name); break; } @@ -957,8 +949,8 @@ static void bta_dm_pm_ssr(const RawAddress& peer_addr, const int ssr) { log::debug( "Changing sniff subrating specification for {} from {}[{}] ==> " "{}[{}]", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), p_spec->name, ssr_index, - p_spec_cur->name, current_ssr_index); + peer_addr, p_spec->name, ssr_index, p_spec_cur->name, + current_ssr_index); ssr_index = current_ssr_index; p_spec = &p_bta_dm_ssr_spec[ssr_index]; } @@ -978,8 +970,8 @@ static void bta_dm_pm_ssr(const RawAddress& peer_addr, const int ssr) { "Setting sniff subrating for device:{} spec_name:{} " "max_latency(s):{:.2f} min_local_timeout(s):{:.2f} " "min_remote_timeout(s):{:.2f}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), p_spec->name, - ticks_to_seconds(p_spec->max_lat), ticks_to_seconds(p_spec->min_loc_to), + peer_addr, p_spec->name, ticks_to_seconds(p_spec->max_lat), + ticks_to_seconds(p_spec->min_loc_to), ticks_to_seconds(p_spec->min_rmt_to)); /* set the SSR parameters. */ get_btm_client_interface().link_policy.BTM_SetSsrParams( @@ -1007,19 +999,17 @@ void bta_dm_pm_active(const RawAddress& peer_addr) { switch (status) { case BTM_CMD_STORED: log::debug("Active power mode stored for execution later for remote:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + peer_addr); break; case BTM_CMD_STARTED: - log::debug("Active power mode started for remote:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + log::debug("Active power mode started for remote:{}", peer_addr); break; case BTM_SUCCESS: - log::debug("Active power mode already set for device:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + log::debug("Active power mode already set for device:{}", peer_addr); break; default: log::warn("Unable to set active power mode for device:{} status:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), btm_status_text(status)); + peer_addr, btm_status_text(status)); break; } } @@ -1085,13 +1075,12 @@ static void bta_dm_pm_btm_status(const RawAddress& bd_addr, log::debug( "Power mode notification event status:{} peer:{} interval:{} " "hci_status:{}", - power_mode_status_text(status), ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - interval, hci_error_code_text(hci_status)); + power_mode_status_text(status), bd_addr, interval, + hci_error_code_text(hci_status)); tBTA_DM_PEER_DEVICE* p_dev = bta_dm_find_peer_device(bd_addr); if (p_dev == nullptr) { - log::info("Unable to process power event for peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("Unable to process power event for peer:{}", bd_addr); return; } @@ -1137,12 +1126,10 @@ static void bta_dm_pm_btm_status(const RawAddress& bd_addr, } if (interval) { p_dev->set_ssr_active(); - log::debug("Enabling sniff subrating mode for peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Enabling sniff subrating mode for peer:{}", bd_addr); } else { p_dev->reset_ssr_active(); - log::debug("Disabling sniff subrating mode for peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Disabling sniff subrating mode for peer:{}", bd_addr); } break; case BTM_PM_STS_SNIFF: diff --git a/system/bta/dm/bta_dm_sec.cc b/system/bta/dm/bta_dm_sec.cc index eff5988123..829dfaa54e 100644 --- a/system/bta/dm/bta_dm_sec.cc +++ b/system/bta/dm/bta_dm_sec.cc @@ -87,7 +87,7 @@ void bta_dm_ble_sirk_sec_cb_register(tBTA_DM_SEC_CBACK* p_cback) { void bta_dm_ble_sirk_confirm_device_reply(const RawAddress& bd_addr, bool accept) { - log::debug("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("addr:{}", bd_addr); get_btm_client_interface().security.BTM_BleSirkConfirmDeviceReply( bd_addr, accept ? BTM_SUCCESS : BTM_NOT_AUTHORIZED); } @@ -97,9 +97,7 @@ void bta_dm_consolidate(const RawAddress& identity_addr, for (auto i = 0; i < bta_dm_cb.device_list.count; i++) { if (bta_dm_cb.device_list.peer_device[i].peer_bdaddr != rpa) continue; - log::info("consolidating bda_dm_cb record {} -> {}", - ADDRESS_TO_LOGGABLE_CSTR(rpa), - ADDRESS_TO_LOGGABLE_CSTR(identity_addr)); + log::info("consolidating bda_dm_cb record {} -> {}", rpa, identity_addr); bta_dm_cb.device_list.peer_device[i].peer_bdaddr = identity_addr; } } @@ -130,8 +128,8 @@ void bta_dm_remote_key_missing(const RawAddress bd_addr) { void bta_dm_bond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, tBT_TRANSPORT transport, tBT_DEVICE_TYPE device_type) { log::debug("Bonding with peer device:{} type:{} transport:{} type:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), AddressTypeText(addr_type), - bt_transport_text(transport), DeviceTypeText(device_type)); + bd_addr, AddressTypeText(addr_type), bt_transport_text(transport), + DeviceTypeText(device_type)); tBTA_DM_SEC sec_event; @@ -165,7 +163,7 @@ void bta_dm_bond_cancel(const RawAddress& bd_addr) { tBTM_STATUS status; tBTA_DM_SEC sec_event; - log::debug("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("addr:{}", bd_addr); status = get_btm_client_interface().security.BTM_SecBondCancel(bd_addr); @@ -278,8 +276,7 @@ static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class, BTM_CMD_STARTED) return BTM_CMD_STARTED; - log::warn("Failed to start Remote Name Request, addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("Failed to start Remote Name Request, addr:{}", bd_addr); } tBTA_DM_SEC sec_event = {.pin_req = { @@ -379,8 +376,7 @@ static void bta_dm_authentication_complete_cback(const RawAddress& bd_addr, case HCI_ERR_KEY_MISSING: case HCI_ERR_HOST_REJECT_SECURITY: case HCI_ERR_ENCRY_MODE_NOT_ACCEPTABLE: - log::warn("authentication failed entry:{}, reason:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), + log::warn("authentication failed entry:{}, reason:{}", bd_addr, hci_reason_code_text(reason)); break; @@ -499,7 +495,7 @@ static tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event, BT_TRANSPORT_BR_EDR)) == BTM_CMD_STARTED) return BTM_CMD_STARTED; log::warn("Failed to start Remote Name Request, addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->key_notif.bd_addr)); + p_data->key_notif.bd_addr); } else { sec_event.key_notif.bd_addr = p_data->key_notif.bd_addr; sec_event.key_notif.dev_class = p_data->key_notif.dev_class; @@ -552,8 +548,7 @@ static void bta_dm_reset_sec_dev_pending(const RawAddress& remote_bd_addr) { auto& dev = bta_dm_cb.device_list.peer_device[i]; if (dev.peer_bdaddr == remote_bd_addr) { if (dev.remove_dev_pending) { - log::info("Clearing remove_dev_pending for {}", - ADDRESS_TO_LOGGABLE_CSTR(dev.peer_bdaddr)); + log::info("Clearing remove_dev_pending for {}", dev.peer_bdaddr); dev.remove_dev_pending = false; } return; @@ -580,14 +575,13 @@ static void bta_dm_remove_sec_dev_entry(const RawAddress& remote_bd_addr) { get_btm_client_interface().peer.BTM_IsAclConnectionUp( remote_bd_addr, BT_TRANSPORT_BR_EDR)) { log::debug("ACL is not down. Schedule for Dev Removal when ACL closes:{}", - ADDRESS_TO_LOGGABLE_CSTR(remote_bd_addr)); + remote_bd_addr); get_btm_client_interface().security.BTM_SecClearSecurityFlags( remote_bd_addr); for (int i = 0; i < bta_dm_cb.device_list.count; i++) { auto& dev = bta_dm_cb.device_list.peer_device[i]; if (dev.peer_bdaddr == remote_bd_addr) { - log::info("Setting remove_dev_pending for {}", - ADDRESS_TO_LOGGABLE_CSTR(dev.peer_bdaddr)); + log::info("Setting remove_dev_pending for {}", dev.peer_bdaddr); dev.remove_dev_pending = TRUE; break; } @@ -676,8 +670,7 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda, tBTM_STATUS status = BTM_SUCCESS; tBTA_DM_SEC sec_event; - log::debug("addr:{},event:{}", ADDRESS_TO_LOGGABLE_CSTR(bda), - ble_evt_to_text(event)); + log::debug("addr:{},event:{}", bda, ble_evt_to_text(event)); if (!bta_dm_sec_cb.p_sec_cback) return BTM_NOT_AUTHORIZED; @@ -827,9 +820,9 @@ void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport, } log::debug("Encrypted:{:c}, peer:{} transport:{} status:{} callback:{:c}", - result == BTM_SUCCESS ? 'T' : 'F', - ADDRESS_TO_LOGGABLE_CSTR((*bd_addr)), bt_transport_text(transport), - btm_status_text(result), (p_callback) ? 'T' : 'F'); + result == BTM_SUCCESS ? 'T' : 'F', (*bd_addr), + bt_transport_text(transport), btm_status_text(result), + (p_callback) ? 'T' : 'F'); tBTA_STATUS bta_status = BTA_SUCCESS; switch (result) { @@ -859,15 +852,14 @@ void bta_dm_set_encryption(const RawAddress& bd_addr, tBT_TRANSPORT transport, tBTA_DM_ENCRYPT_CBACK* p_callback, tBTM_BLE_SEC_ACT sec_act) { if (p_callback == nullptr) { - log::error("callback is not provided,addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("callback is not provided,addr:{}", bd_addr); return; } tBTA_DM_PEER_DEVICE* device = find_connected_device(bd_addr, transport); if (device == nullptr) { log::error("Unable to find active ACL connection device:{} transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), bt_transport_text(transport)); + bd_addr, bt_transport_text(transport)); return; } @@ -875,7 +867,7 @@ void bta_dm_set_encryption(const RawAddress& bd_addr, tBT_TRANSPORT transport, log::error( "Unable to start encryption as already in progress peer:{} " "transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), bt_transport_text(transport)); + bd_addr, bt_transport_text(transport)); (*p_callback)(bd_addr, transport, BTA_BUSY); return; } @@ -884,11 +876,11 @@ void bta_dm_set_encryption(const RawAddress& bd_addr, tBT_TRANSPORT transport, bd_addr, transport, bta_dm_encrypt_cback, NULL, sec_act) == BTM_CMD_STARTED) { device->p_encrypt_cback = p_callback; - log::debug("Started encryption peer:{} transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), bt_transport_text(transport)); + log::debug("Started encryption peer:{} transport:{}", bd_addr, + bt_transport_text(transport)); } else { log::error("Unable to start encryption process peer:{} transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), bt_transport_text(transport)); + bd_addr, bt_transport_text(transport)); } } diff --git a/system/bta/gatt/bta_gattc_act.cc b/system/bta/gatt/bta_gattc_act.cc index f3eec0a1b3..d6994c9622 100644 --- a/system/bta/gatt/bta_gattc_act.cc +++ b/system/bta/gatt/bta_gattc_act.cc @@ -427,8 +427,7 @@ static void bta_gattc_init_bk_conn(const tBTA_GATTC_API_OPEN* p_data, /* always call open to hold a connection */ if (!GATT_Connect(p_data->client_if, p_data->remote_bda, p_data->connection_type, p_data->transport, false)) { - log::error("Unable to connect to remote bd_addr={}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->remote_bda)); + log::error("Unable to connect to remote bd_addr={}", p_data->remote_bda); bta_gattc_send_open_cback(p_clreg, GATT_ILLEGAL_PARAMETER, p_data->remote_bda, GATT_INVALID_CONN_ID, BT_TRANSPORT_LE, 0); @@ -446,7 +445,7 @@ static void bta_gattc_init_bk_conn(const tBTA_GATTC_API_OPEN* p_data, p_data->client_if, p_data->remote_bda, BT_TRANSPORT_LE); if (!p_clcb) { log::warn("Unable to find connection link for device:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->remote_bda)); + p_data->remote_bda); return; } @@ -475,8 +474,7 @@ void bta_gattc_cancel_bk_conn(const tBTA_GATTC_API_CANCEL_OPEN* p_data) { cb_data.status = GATT_SUCCESS; } else { log::error("failed for client_if={}, remote_bda={}, is_direct=false", - static_cast<int>(p_data->client_if), - ADDRESS_TO_LOGGABLE_CSTR(p_data->remote_bda)); + static_cast<int>(p_data->client_if), p_data->remote_bda); } } p_clreg = bta_gattc_cl_get_regcb(p_data->client_if); @@ -754,15 +752,13 @@ void bta_gattc_cfg_mtu(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data) { p_clcb->bta_conn_id, ¤t_mtu); switch (result) { case MTU_EXCHANGE_DEVICE_DISCONNECTED: - log::info("Device {} disconnected", - ADDRESS_TO_LOGGABLE_CSTR(p_clcb->bda)); + log::info("Device {} disconnected", p_clcb->bda); bta_gattc_cmpl_sendmsg(p_clcb->bta_conn_id, GATTC_OPTYPE_CONFIG, GATT_NO_RESOURCES, NULL); bta_gattc_continue(p_clcb); return; case MTU_EXCHANGE_NOT_ALLOWED: - log::info("Not allowed for BR/EDR devices {}", - ADDRESS_TO_LOGGABLE_CSTR(p_clcb->bda)); + log::info("Not allowed for BR/EDR devices {}", p_clcb->bda); bta_gattc_cmpl_sendmsg(p_clcb->bta_conn_id, GATTC_OPTYPE_CONFIG, GATT_ERR_UNLIKELY, NULL); bta_gattc_continue(p_clcb); @@ -893,7 +889,7 @@ void bta_gattc_continue_discovery_if_needed(const RawAddress& bd_addr, p_srcb->blocked_conn_id = 0; log::info("Received remote version, continue service discovery for {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + bd_addr); tBTA_GATTC_CLCB* p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id); @@ -1399,14 +1395,12 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, const RawAddress& bdaddr, tBT_TRANSPORT transport) { if (connected) { log::info("Connected client_if:{} addr:{}, transport:{} reason:{}", - gattc_if, ADDRESS_TO_LOGGABLE_CSTR(bdaddr), - bt_transport_text(transport), + gattc_if, bdaddr, bt_transport_text(transport), gatt_disconnection_reason_text(reason)); btif_debug_conn_state(bdaddr, BTIF_DEBUG_CONNECTED, GATT_CONN_OK); } else { log::info("Disconnected att_id:{} addr:{}, transport:{} reason:{}", - gattc_if, ADDRESS_TO_LOGGABLE_CSTR(bdaddr), - bt_transport_text(transport), + gattc_if, bdaddr, bt_transport_text(transport), gatt_disconnection_reason_text(reason)); btif_debug_conn_state(bdaddr, BTIF_DEBUG_DISCONNECTED, GATT_CONN_OK); } diff --git a/system/bta/gatt/bta_gattc_api.cc b/system/bta/gatt/bta_gattc_api.cc index b2142942c7..9f173f6b68 100644 --- a/system/bta/gatt/bta_gattc_api.cc +++ b/system/bta/gatt/bta_gattc_api.cc @@ -745,8 +745,7 @@ tGATT_STATUS BTA_GATTC_DeregisterForNotifications(tGATT_IF client_if, tBTA_GATTC_RCB* p_clreg = bta_gattc_cl_get_regcb(client_if); if (p_clreg == NULL) { - log::error("client_if={} not registered bd_addr={}", client_if, - ADDRESS_TO_LOGGABLE_STR(bda)); + log::error("client_if={} not registered bd_addr={}", client_if, bda); return GATT_ILLEGAL_PARAMETER; } @@ -754,13 +753,13 @@ tGATT_STATUS BTA_GATTC_DeregisterForNotifications(tGATT_IF client_if, if (p_clreg->notif_reg[i].in_use && p_clreg->notif_reg[i].remote_bda == bda && p_clreg->notif_reg[i].handle == handle) { - log::verbose("deregistered bd_addr={}", ADDRESS_TO_LOGGABLE_STR(bda)); + log::verbose("deregistered bd_addr={}", bda); memset(&p_clreg->notif_reg[i], 0, sizeof(tBTA_GATTC_NOTIF_REG)); return GATT_SUCCESS; } } - log::error("registration not found bd_addr={}", ADDRESS_TO_LOGGABLE_STR(bda)); + log::error("registration not found bd_addr={}", bda); return GATT_ERROR; } diff --git a/system/bta/gatt/bta_gattc_cache.cc b/system/bta/gatt/bta_gattc_cache.cc index e13c81c36d..d88052647a 100644 --- a/system/bta/gatt/bta_gattc_cache.cc +++ b/system/bta/gatt/bta_gattc_cache.cc @@ -181,8 +181,7 @@ RobustCachingSupport GetRobustCachingSupport(const tBTA_GATTC_CLCB* p_clcb, // support GATT Caching. uint8_t lmp_version = 0; if (!BTM_ReadRemoteVersion(p_clcb->bda, &lmp_version, nullptr, nullptr)) { - log::warn("Could not read remote version for {}", - ADDRESS_TO_LOGGABLE_CSTR(p_clcb->bda)); + log::warn("Could not read remote version for {}", p_clcb->bda); } if (lmp_version < 0x0a) { diff --git a/system/bta/gatt/bta_gattc_utils.cc b/system/bta/gatt/bta_gattc_utils.cc index 5673a4adb9..365cd7ba67 100644 --- a/system/bta/gatt/bta_gattc_utils.cc +++ b/system/bta/gatt/bta_gattc_utils.cc @@ -461,7 +461,7 @@ BtaEnqueuedResult_t bta_gattc_enqueue(tBTA_GATTC_CLCB* p_clcb, log::info( "Already has a pending command to executer. Queuing for later {} conn " "id=0x{:04x}", - ADDRESS_TO_LOGGABLE_CSTR(p_clcb->bda), p_clcb->bta_conn_id); + p_clcb->bda, p_clcb->bta_conn_id); p_clcb->p_q_cmd_queue.push_back(p_data); return ENQUEUED_FOR_LATER; @@ -574,7 +574,7 @@ bool bta_gattc_mark_bg_conn(tGATT_IF client_if, } if (!add) { log::error("unable to find the bg connection mask for bd_addr={}", - ADDRESS_TO_LOGGABLE_STR(remote_bda_ptr)); + remote_bda_ptr); return false; } else /* adding a new device mask */ { diff --git a/system/bta/gatt/bta_gatts_act.cc b/system/bta/gatt/bta_gatts_act.cc index 0068a2f5de..f2ad439b64 100644 --- a/system/bta/gatt/bta_gatts_act.cc +++ b/system/bta/gatt/bta_gatts_act.cc @@ -592,9 +592,8 @@ static void bta_gatts_conn_cback(tGATT_IF gatt_if, const RawAddress& bdaddr, uint8_t evt = connected ? BTA_GATTS_CONNECT_EVT : BTA_GATTS_DISCONNECT_EVT; tBTA_GATTS_RCB* p_reg; - log::verbose("bda={} gatt_if= {}, conn_id={} connected={}", - ADDRESS_TO_LOGGABLE_STR(bdaddr), gatt_if, loghex(conn_id), - connected); + log::verbose("bda={} gatt_if= {}, conn_id={} connected={}", bdaddr, gatt_if, + loghex(conn_id), connected); if (connected) btif_debug_conn_state(bdaddr, BTIF_DEBUG_CONNECTED, GATT_CONN_OK); diff --git a/system/bta/groups/groups.cc b/system/bta/groups/groups.cc index 765bac872b..716ea019fb 100644 --- a/system/bta/groups/groups.cc +++ b/system/bta/groups/groups.cc @@ -120,8 +120,7 @@ class DeviceGroupsImpl : public DeviceGroups { log::assert_that(group, "assert failed: group"); if (group->Contains(addr)) { - log::error("device {} already in the group: {}", - ADDRESS_TO_LOGGABLE_STR(addr), group_id); + log::error("device {} already in the group: {}", addr, group_id); return group->GetGroupId(); } diff --git a/system/bta/has/has_client.cc b/system/bta/has/has_client.cc index c37b8f28ff..904fd8b200 100644 --- a/system/bta/has/has_client.cc +++ b/system/bta/has/has_client.cc @@ -148,11 +148,10 @@ class HasClientImpl : public HasClient { ~HasClientImpl() override = default; void Connect(const RawAddress& address) override { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); if (!BTM_IsLinkKeyKnown(address, BT_TRANSPORT_LE)) { - log::error("Connecting {} when not bonded", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Connecting {} when not bonded", address); callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address); return; } @@ -167,7 +166,7 @@ class HasClientImpl : public HasClient { } if (addresses.empty()) { - log::warn("{} is not part of any set", ADDRESS_TO_LOGGABLE_STR(address)); + log::warn("{} is not part of any set", address); addresses = {address}; } @@ -188,8 +187,7 @@ class HasClientImpl : public HasClient { void AddFromStorage(const RawAddress& address, uint8_t features, uint16_t is_acceptlisted) { - log::debug("{}, features={}, isAcceptlisted={}", - ADDRESS_TO_LOGGABLE_STR(address), loghex(features), + log::debug("{}, features={}, isAcceptlisted={}", address, loghex(features), is_acceptlisted); /* Notify upper layer about the device */ @@ -206,7 +204,7 @@ class HasClientImpl : public HasClient { } void Disconnect(const RawAddress& address) override { - log::debug("{}", ADDRESS_TO_LOGGABLE_STR(address)); + log::debug("{}", address); std::vector<RawAddress> addresses = {address}; auto csis_api = CsisClient::Get(); @@ -218,7 +216,7 @@ class HasClientImpl : public HasClient { } if (addresses.empty()) { - log::warn("{} is not part of any set", ADDRESS_TO_LOGGABLE_STR(address)); + log::warn("{} is not part of any set", address); addresses = {address}; } @@ -226,8 +224,7 @@ class HasClientImpl : public HasClient { auto device = std::find_if(devices_.begin(), devices_.end(), HasDevice::MatchAddress(addr)); if (device == devices_.end()) { - log::warn("Device not connected to profile{}", - ADDRESS_TO_LOGGABLE_STR(addr)); + log::warn("Device not connected to profile{}", addr); return; } @@ -325,8 +322,7 @@ class HasClientImpl : public HasClient { GattStatus2SvcErrorCode(status)); if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } } @@ -360,8 +356,7 @@ class HasClientImpl : public HasClient { callbacks_->OnSetPresetNameError(device->addr, op.index, GattStatus2SvcErrorCode(status)); if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } } @@ -393,12 +388,11 @@ class HasClientImpl : public HasClient { GattStatus2SvcErrorCode(status)); if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } else { log::error("Devices {}: Control point not usable. Disconnecting!", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + device->addr); BTA_GATTC_Close(device->conn_id); } } @@ -442,12 +436,11 @@ class HasClientImpl : public HasClient { } if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } else { log::error("Devices {}: Control point not usable. Disconnecting!", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + device->addr); BTA_GATTC_Close(device->conn_id); } } @@ -467,8 +460,7 @@ class HasClientImpl : public HasClient { HasDevice::MatchAddress(std::get<RawAddress>(operation.addr_or_group))); if (device == devices_.end()) { log::warn("Device not connected to profile addr: {}", - ADDRESS_TO_LOGGABLE_STR( - std::get<RawAddress>(operation.addr_or_group))); + std::get<RawAddress>(operation.addr_or_group)); callbacks_->OnPresetInfoError(device->addr, operation.index, ErrorCode::OPERATION_NOT_POSSIBLE); return; @@ -657,8 +649,7 @@ class HasClientImpl : public HasClient { ErrorCode CpPresetsCycleOperationWriteReq(HasDevice& device, HasCtpOp& operation) { - log::debug("addr: {} operation: {}", ADDRESS_TO_LOGGABLE_STR(device.addr), - operation); + log::debug("addr: {} operation: {}", device.addr, operation); if (!device.IsConnected()) return ErrorCode::OPERATION_NOT_POSSIBLE; @@ -704,8 +695,7 @@ class HasClientImpl : public HasClient { ErrorCode CpWritePresetNameOperationWriteReq(HasDevice& device, HasCtpOp operation) { - log::debug("addr: {} operation: {}", ADDRESS_TO_LOGGABLE_STR(device.addr), - operation); + log::debug("addr: {} operation: {}", device.addr, operation); if (!device.IsConnected()) return ErrorCode::OPERATION_NOT_POSSIBLE; @@ -856,8 +846,7 @@ class HasClientImpl : public HasClient { auto device = std::find_if(devices_.begin(), devices_.end(), HasDevice::MatchAddress(address)); if (device == devices_.end()) { - log::warn("Device not connected to profile{}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::warn("Device not connected to profile{}", address); return; } @@ -871,8 +860,7 @@ class HasClientImpl : public HasClient { true)) { auto* preset = device->GetPreset(preset_index); if (preset == nullptr) { - log::error("Invalid preset request{}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::error("Invalid preset request{}", address); callbacks_->OnPresetInfoError(address, preset_index, ErrorCode::INVALID_PRESET_INDEX); return; @@ -941,8 +929,7 @@ class HasClientImpl : public HasClient { private: void WriteAllNeededCcc(const HasDevice& device) { if (device.conn_id == GATT_INVALID_CONN_ID) { - log::error("Device {} is not connected", - ADDRESS_TO_LOGGABLE_CSTR(device.addr)); + log::error("Device {} is not connected", device.addr); return; } @@ -972,7 +959,7 @@ class HasClientImpl : public HasClient { } void OnEncrypted(HasDevice& device) { - log::debug("{}", ADDRESS_TO_LOGGABLE_STR(device.addr)); + log::debug("{}", device.addr); if (device.isGattServiceValid()) { device.is_connecting_actively = false; @@ -989,7 +976,7 @@ class HasClientImpl : public HasClient { } void NotifyHasDeviceValid(const HasDevice& device) { - log::debug("addr:{}", ADDRESS_TO_LOGGABLE_STR(device.addr)); + log::debug("addr:{}", device.addr); std::vector<uint8_t> preset_indices; preset_indices.reserve(device.has_presets.size()); @@ -1031,8 +1018,7 @@ class HasClientImpl : public HasClient { } if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); return; } @@ -1107,8 +1093,7 @@ class HasClientImpl : public HasClient { if (status != GATT_SUCCESS) { if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } else { log::error("Could not read characteristic at handle=0x{:04x}", handle); @@ -1492,8 +1477,7 @@ class HasClientImpl : public HasClient { if (status != GATT_SUCCESS) { if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("Database out of sync for {}", device->addr); ClearDeviceInformationAndStartSearch(device); } else { log::error("Could not read characteristic at handle=0x{:04x}", handle); @@ -1591,7 +1575,7 @@ class HasClientImpl : public HasClient { /* Cleans up after the device disconnection */ void DoDisconnectCleanUp(HasDevice& device, bool invalidate_gatt_service = true) { - log::debug(": device={}", ADDRESS_TO_LOGGABLE_CSTR(device.addr)); + log::debug(": device={}", device.addr); DeregisterNotifications(device); @@ -1618,7 +1602,7 @@ class HasClientImpl : public HasClient { /* These below are all GATT service discovery, validation, cache & storage */ bool CacheAttributeHandles(const gatt::Service& service, HasDevice* device) { - log::debug("device={}", ADDRESS_TO_LOGGABLE_STR(device->addr)); + log::debug("device={}", device->addr); for (const gatt::Characteristic& charac : service.characteristics) { if (charac.uuid == kUuidActivePresetIndex) { @@ -1668,7 +1652,7 @@ class HasClientImpl : public HasClient { } bool LoadHasDetailsFromStorage(HasDevice* device) { - log::debug("device={}", ADDRESS_TO_LOGGABLE_STR(device->addr)); + log::debug("device={}", device->addr); std::vector<uint8_t> presets_bin; uint8_t active_preset; @@ -1842,9 +1826,8 @@ class HasClientImpl : public HasClient { void OnGattConnected(const tBTA_GATTC_OPEN& evt) { log::info("{}, conn_id=0x{:04x}, transport={}, status={}(0x{:02x})", - ADDRESS_TO_LOGGABLE_CSTR(evt.remote_bda), evt.conn_id, - bt_transport_text(evt.transport), gatt_status_text(evt.status), - evt.status); + evt.remote_bda, evt.conn_id, bt_transport_text(evt.transport), + gatt_status_text(evt.status), evt.status); if (evt.transport != BT_TRANSPORT_LE) { log::warn("Only LE connection is allowed (transport {})", @@ -1856,8 +1839,7 @@ class HasClientImpl : public HasClient { auto device = std::find_if(devices_.begin(), devices_.end(), HasDevice::MatchAddress(evt.remote_bda)); if (device == devices_.end()) { - log::warn("Skipping unknown device, address={}", - ADDRESS_TO_LOGGABLE_STR(evt.remote_bda)); + log::warn("Skipping unknown device, address={}", evt.remote_bda); BTA_GATTC_Close(evt.conn_id); return; } @@ -1895,11 +1877,10 @@ class HasClientImpl : public HasClient { nullptr, BTM_BLE_SEC_ENCRYPT); log::info("Encryption required for {}. Request result: 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(device->addr), result); + device->addr, result); if (result == BTM_ERR_KEY_MISSING) { - log::error("Link key unknown for {}, disconnect profile", - ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::error("Link key unknown for {}, disconnect profile", device->addr); BTA_GATTC_Close(device->conn_id); } } @@ -1912,7 +1893,7 @@ class HasClientImpl : public HasClient { loghex(evt.conn_id)); return; } - log::debug("device={}: reason={}", ADDRESS_TO_LOGGABLE_STR(device->addr), + log::debug("device={}: reason={}", device->addr, loghex(static_cast<int>(evt.reason))); /* Don't notify disconnect state for background connection that failed */ @@ -1990,18 +1971,17 @@ class HasClientImpl : public HasClient { } void OnLeEncryptionComplete(const RawAddress& address, bool success) { - log::debug("{}", ADDRESS_TO_LOGGABLE_STR(address)); + log::debug("{}", address); auto device = std::find_if(devices_.begin(), devices_.end(), HasDevice::MatchAddress(address)); if (device == devices_.end()) { - log::warn("Skipping unknown device{}", ADDRESS_TO_LOGGABLE_STR(address)); + log::warn("Skipping unknown device{}", address); return; } if (!success) { - log::error("Encryption failed for device {}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::error("Encryption failed for device {}", address); BTA_GATTC_Close(device->conn_id); return; @@ -2021,7 +2001,7 @@ class HasClientImpl : public HasClient { return; } - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(device->addr)); + log::info("{}", device->addr); if (!device->isGattServiceValid()) { log::info("Service already invalidated"); @@ -2040,11 +2020,10 @@ class HasClientImpl : public HasClient { auto device = std::find_if(devices_.begin(), devices_.end(), HasDevice::MatchAddress(address)); if (device == devices_.end()) { - log::warn("Skipping unknown device: {}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::warn("Skipping unknown device: {}", address); return; } - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); ClearDeviceInformationAndStartSearch(&(*device)); } @@ -2052,12 +2031,11 @@ class HasClientImpl : public HasClient { auto device = std::find_if(devices_.begin(), devices_.end(), HasDevice::MatchAddress(address)); if (device == devices_.end()) { - log::warn("Skipping unknown device: {}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::warn("Skipping unknown device: {}", address); return; } - log::debug("address={}", ADDRESS_TO_LOGGABLE_STR(address)); + log::debug("address={}", address); if (!device->isGattServiceValid()) BTA_GATTC_ServiceSearchRequest(device->conn_id, diff --git a/system/bta/hearing_aid/hearing_aid.cc b/system/bta/hearing_aid/hearing_aid.cc index 8376f2b2f8..6546e546a5 100644 --- a/system/bta/hearing_aid/hearing_aid.cc +++ b/system/bta/hearing_aid/hearing_aid.cc @@ -200,8 +200,7 @@ class HearingDevices { int read_rssi_start_interval_count = 0; for (auto& d : devices) { - log::debug("device={}, read_rssi_count={}", - ADDRESS_TO_LOGGABLE_CSTR(d.address), d.read_rssi_count); + log::debug("device={}, read_rssi_count={}", d.address, d.read_rssi_count); // Reset the count if (d.read_rssi_count <= 0) { @@ -427,18 +426,18 @@ class HearingAidImpl : public HearingAid { if (overwrite_min_ce_len != -1) { log::warn("min_ce_len={} for device {} is overwritten to {}", min_ce_len, - ADDRESS_TO_LOGGABLE_CSTR(address), overwrite_min_ce_len); + address, overwrite_min_ce_len); min_ce_len = overwrite_min_ce_len; } if (overwrite_max_ce_len != -1) { log::warn("max_ce_len={} for device {} is overwritten to {}", max_ce_len, - ADDRESS_TO_LOGGABLE_CSTR(address), overwrite_max_ce_len); + address, overwrite_max_ce_len); max_ce_len = overwrite_max_ce_len; } log::info( "L2CA_UpdateBleConnParams for device {} min_ce_len:{} max_ce_len:{}", - ADDRESS_TO_LOGGABLE_CSTR(address), min_ce_len, max_ce_len); + address, min_ce_len, max_ce_len); L2CA_UpdateBleConnParams(address, connection_interval, connection_interval, 0x000A, 0x0064 /*1s*/, min_ce_len, max_ce_len); return connection_interval; @@ -455,20 +454,19 @@ class HearingAidImpl : public HearingAid { } void Connect(const RawAddress& address) { - log::debug("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("{}", address); hearingDevices.Add(HearingDevice(address, true)); BTA_GATTC_Open(gatt_if, address, BTM_BLE_DIRECT_CONNECTION, false); } void AddToAcceptlist(const RawAddress& address) { - log::debug("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("{}", address); hearingDevices.Add(HearingDevice(address, true)); BTA_GATTC_Open(gatt_if, address, BTM_BLE_BKG_CONNECT_ALLOW_LIST, false); } void AddFromStorage(const HearingDevice& dev_info, bool is_acceptlisted) { - log::debug("{}, hiSyncId={}, isAcceptlisted={}", - ADDRESS_TO_LOGGABLE_CSTR(dev_info.address), + log::debug("{}, hiSyncId={}, isAcceptlisted={}", dev_info.address, loghex(dev_info.hi_sync_id), is_acceptlisted); if (is_acceptlisted) { hearingDevices.Add(dev_info); @@ -496,13 +494,12 @@ class HearingAidImpl : public HearingAid { /* When Hearing Aid is quickly disabled and enabled in settings, this case * might happen */ log::warn("Closing connection to non hearing-aid device, address={}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + address); BTA_GATTC_Close(conn_id); return; } - log::info("address={}, conn_id={}", ADDRESS_TO_LOGGABLE_CSTR(address), - conn_id); + log::info("address={}, conn_id={}", address, conn_id); if (status != GATT_SUCCESS) { if (!hearingDevice->connecting_actively) { @@ -515,8 +512,7 @@ class HearingAidImpl : public HearingAid { hearingDevice->switch_to_background_connection_after_failure = false; BTA_GATTC_Open(gatt_if, address, BTM_BLE_BKG_CONNECT_ALLOW_LIST, false); } else { - log::info("Failed to connect to Hearing Aid device, bda={}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Failed to connect to Hearing Aid device, bda={}", address); hearingDevices.Remove(address); callbacks->OnConnectionState(ConnectionState::DISCONNECTED, address); @@ -535,9 +531,9 @@ class HearingAidImpl : public HearingAid { if (device.hi_sync_id == hi_sync_id && device.conn_id == 0 && !device.connecting_actively) { log::info( - "Promoting device from the set from background to " - "direct connection, bda={}", - ADDRESS_TO_LOGGABLE_CSTR(device.address)); + "Promoting device from the set from background to direct " + "connection, bda={}", + device.address); device.connecting_actively = true; device.switch_to_background_connection_after_failure = true; BTA_GATTC_Open(gatt_if, device.address, BTM_BLE_DIRECT_CONNECTION, @@ -550,7 +546,7 @@ class HearingAidImpl : public HearingAid { hearingDevice->requested_connection_interval = UpdateBleConnParams(address); if (bluetooth::shim::GetController()->SupportsBle2mPhy()) { - log::info("{} set preferred 2M PHY", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{} set preferred 2M PHY", address); BTM_BleSetPhy(address, PHY_LE_2M, PHY_LE_2M, 0); } @@ -611,8 +607,7 @@ class HearingAidImpl : public HearingAid { case STARTED: if (same_conn_interval) { log::info("Connection update completed. conn_id={}, device={}", - conn_id, - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address)); + conn_id, hearingDevice->address); hearingDevice->connection_update_status = COMPLETED; } else { log::warn( @@ -642,8 +637,7 @@ class HearingAidImpl : public HearingAid { "error status={}, conn_id={},device={}, " "connection_update_status={}", loghex(static_cast<uint8_t>(p_data->conn_update.status)), conn_id, - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address), - hearingDevice->connection_update_status); + hearingDevice->address, hearingDevice->connection_update_status); if (hearingDevice->connection_update_status == STARTED) { // Redo this connection interval change. log::error("Redo Connection Interval change"); @@ -674,17 +668,14 @@ class HearingAidImpl : public HearingAid { void OnReadRssiComplete(const RawAddress& address, int8_t rssi_value) { HearingDevice* hearingDevice = hearingDevices.FindByAddress(address); if (!hearingDevice) { - log::info("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Skipping unknown device {}", address); return; } - log::debug("device={}, rssi={}", ADDRESS_TO_LOGGABLE_CSTR(address), - (int)rssi_value); + log::debug("device={}, rssi={}", address, (int)rssi_value); if (hearingDevice->read_rssi_count <= 0) { - log::error("device={}, invalid read_rssi_count={}", - ADDRESS_TO_LOGGABLE_CSTR(address), + log::error("device={}, invalid read_rssi_count={}", address, hearingDevice->read_rssi_count); return; } @@ -694,8 +685,7 @@ class HearingAidImpl : public HearingAid { if (hearingDevice->read_rssi_count == READ_RSSI_NUM_TRIES) { // Store the timestamp only for the first one after packet flush clock_gettime(CLOCK_REALTIME, &last_log_set.timestamp); - log::info("store time, device={}, rssi={}", - ADDRESS_TO_LOGGABLE_CSTR(address), (int)rssi_value); + log::info("store time, device={}, rssi={}", address, (int)rssi_value); } last_log_set.rssi.emplace_back(rssi_value); @@ -705,8 +695,7 @@ class HearingAidImpl : public HearingAid { void OnEncryptionComplete(const RawAddress& address, bool success) { HearingDevice* hearingDevice = hearingDevices.FindByAddress(address); if (!hearingDevice) { - log::debug("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("Skipping unknown device {}", address); return; } @@ -719,7 +708,7 @@ class HearingAidImpl : public HearingAid { return; } - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); if (hearingDevice->audio_control_point_handle && hearingDevice->audio_status_handle && @@ -728,8 +717,7 @@ class HearingAidImpl : public HearingAid { // Use cached data, jump to read PSM ReadPSM(hearingDevice); } else { - log::info("{}: do BTA_GATTC_ServiceSearchRequest", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}: do BTA_GATTC_ServiceSearchRequest", address); hearingDevice->first_connection = true; BTA_GATTC_ServiceSearchRequest(hearingDevice->conn_id, &HEARING_AID_UUID); } @@ -744,13 +732,12 @@ class HearingAidImpl : public HearingAid { return; } if (status != GATT_SUCCESS) { - log::warn("{} phy update fail with status: {}", - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address), status); + log::warn("{} phy update fail with status: {}", hearingDevice->address, + status); return; } if (tx_phys == PHY_LE_2M && rx_phys == PHY_LE_2M) { - log::info("{} phy update to 2M successful", - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address)); + log::info("{} phy update to 2M successful", hearingDevice->address); hearingDevice->phy_update_retry_remain = PHY_UPDATE_RETRY_LIMIT; return; } @@ -759,7 +746,7 @@ class HearingAidImpl : public HearingAid { log::info( "{} phy update successful but not target phy, try again. tx_phys: " "{},rx_phys: {}", - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address), tx_phys, rx_phys); + hearingDevice->address, tx_phys, rx_phys); BTM_BleSetPhy(hearingDevice->address, PHY_LE_2M, PHY_LE_2M, 0); hearingDevice->phy_update_retry_remain--; } else { @@ -770,11 +757,10 @@ class HearingAidImpl : public HearingAid { void OnServiceChangeEvent(const RawAddress& address) { HearingDevice* hearingDevice = hearingDevices.FindByAddress(address); if (!hearingDevice) { - log::debug("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("Skipping unknown device {}", address); return; } - log::info("address={}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("address={}", address); hearingDevice->first_connection = true; hearingDevice->service_changed_rcvd = true; BtaGattQueue::Clean(hearingDevice->conn_id); @@ -787,18 +773,16 @@ class HearingAidImpl : public HearingAid { void OnServiceDiscDoneEvent(const RawAddress& address) { HearingDevice* hearingDevice = hearingDevices.FindByAddress(address); if (!hearingDevice) { - log::debug("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("Skipping unknown device {}", address); return; } - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); if (hearingDevice->service_changed_rcvd || !(hearingDevice->audio_control_point_handle && hearingDevice->audio_status_handle && hearingDevice->audio_status_ccc_handle && hearingDevice->volume_handle && hearingDevice->read_psm_handle)) { - log::info("{}: do BTA_GATTC_ServiceSearchRequest", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}: do BTA_GATTC_ServiceSearchRequest", address); BTA_GATTC_ServiceSearchRequest(hearingDevice->conn_id, &HEARING_AID_UUID); } } @@ -891,8 +875,7 @@ class HearingAidImpl : public HearingAid { void ReadPSM(HearingDevice* hearingDevice) { if (hearingDevice->read_psm_handle) { log::info("Reading PSM {}, device={}", - loghex(hearingDevice->read_psm_handle), - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address)); + loghex(hearingDevice->read_psm_handle), hearingDevice->address); BtaGattQueue::ReadCharacteristic( hearingDevice->conn_id, hearingDevice->read_psm_handle, HearingAidImpl::OnPsmReadStatic, nullptr); @@ -1049,8 +1032,7 @@ class HearingAidImpl : public HearingAid { } if (status != GATT_SUCCESS) { - log::error("Error reading PSM for device {}", - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address)); + log::error("Error reading PSM for device {}", hearingDevice->address); return; } @@ -1115,8 +1097,7 @@ class HearingAidImpl : public HearingAid { void OnDeviceReady(const RawAddress& address) { HearingDevice* hearingDevice = hearingDevices.FindByAddress(address); if (!hearingDevice) { - log::info("Device not connected to profile {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Device not connected to profile {}", address); return; } @@ -1160,8 +1141,7 @@ class HearingAidImpl : public HearingAid { hearingDevice->connecting_actively = false; hearingDevice->accepting_audio = true; log::info("address={}, hi_sync_id={}, codec_in_use={}, audio_running={}", - ADDRESS_TO_LOGGABLE_CSTR(address), - loghex(hearingDevice->hi_sync_id), loghex(codec_in_use), + address, loghex(hearingDevice->hi_sync_id), loghex(codec_in_use), audio_running); StartSendingAudio(*hearingDevice); @@ -1172,7 +1152,7 @@ class HearingAidImpl : public HearingAid { } void StartSendingAudio(const HearingDevice& hearingDevice) { - log::debug("device={}", ADDRESS_TO_LOGGABLE_CSTR(hearingDevice.address)); + log::debug("device={}", hearingDevice.address); if (encoder_state_left == nullptr) { encoder_state_init(); @@ -1219,10 +1199,9 @@ class HearingAidImpl : public HearingAid { if (!device.playback_started) { log::warn("Playback not started, skip send Stop cmd, device={}", - ADDRESS_TO_LOGGABLE_CSTR(device.address)); + device.address); } else { - log::info("send Stop cmd, device={}", - ADDRESS_TO_LOGGABLE_CSTR(device.address)); + log::info("send Stop cmd, device={}", device.address); device.playback_started = false; device.command_acked = false; BtaGattQueue::WriteCharacteristic(device.conn_id, @@ -1279,8 +1258,7 @@ class HearingAidImpl : public HearingAid { } void SendEnableServiceChangedInd(HearingDevice* device) { - log::debug("Enable service changed ind.{}", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + log::debug("Enable service changed ind.{}", device->address); std::vector<uint8_t> value(2); uint8_t* ptr = value.data(); UINT16_TO_STREAM(ptr, GATT_CHAR_CLIENT_CONFIG_INDICTION); @@ -1297,10 +1275,10 @@ class HearingAidImpl : public HearingAid { if (!audio_running) { if (!device->playback_started) { log::info("Skip Send Start since audio is not running, device={}", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + device->address); } else { log::error("Audio not running but Playback has started, device={}", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + device->address); } return; } @@ -1309,14 +1287,14 @@ class HearingAidImpl : public HearingAid { if (device->playback_started) { log::error("Playback already started, skip send Start cmd, device={}", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + device->address); } else { start[4] = GetOtherSideStreamStatus(device); log::info( "send Start cmd, volume={}, audio type={}, device={}, other side " "streaming={}", - loghex(start[3]), loghex(start[2]), - ADDRESS_TO_LOGGABLE_CSTR(device->address), loghex(start[4])); + loghex(start[3]), loghex(start[2]), device->address, + loghex(start[4])); device->command_acked = false; BtaGattQueue::WriteCharacteristic( device->conn_id, device->audio_control_point_handle, start, @@ -1346,7 +1324,7 @@ class HearingAidImpl : public HearingAid { log::error("Skipping unknown device, conn_id={}", loghex(conn_id)); return; } - log::info("device: {}", ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address)); + log::info("device: {}", hearingDevice->address); hearingDevice->playback_started = true; } @@ -1387,9 +1365,7 @@ class HearingAidImpl : public HearingAid { diff_credit = other_current_credit - target_current_credit; } log::debug("Target({}) Credit: {}, Other({}) Credit: {}, Init Credit: {}", - ADDRESS_TO_LOGGABLE_CSTR(target_side->address), - target_current_credit, - ADDRESS_TO_LOGGABLE_CSTR(other_side->address), + target_side->address, target_current_credit, other_side->address, other_current_credit, init_credit); return diff_credit < (init_credit / 2 - 1); } @@ -1503,12 +1479,11 @@ class HearingAidImpl : public HearingAid { // skip audio packet. if (NeedToDropPacket(left, right) && IsBelowDropFrequency(time_point)) { log::info("{} triggers dropping, {} packets in channel", - ADDRESS_TO_LOGGABLE_CSTR(left->address), packets_in_chans); + left->address, packets_in_chans); need_drop = true; left->audio_stats.trigger_drop_count++; } else { - log::info("{} skipping {} packets", - ADDRESS_TO_LOGGABLE_CSTR(left->address), packets_in_chans); + log::info("{} skipping {} packets", left->address, packets_in_chans); left->audio_stats.packet_flush_count += packets_in_chans; left->audio_stats.frame_flush_count++; L2CA_FlushChannel(cid, 0xffff); @@ -1535,12 +1510,11 @@ class HearingAidImpl : public HearingAid { // skip audio packet. if (NeedToDropPacket(right, left) && IsBelowDropFrequency(time_point)) { log::info("{} triggers dropping, {} packets in channel", - ADDRESS_TO_LOGGABLE_CSTR(right->address), packets_in_chans); + right->address, packets_in_chans); need_drop = true; right->audio_stats.trigger_drop_count++; } else { - log::info("{} skipping {} packets", - ADDRESS_TO_LOGGABLE_CSTR(right->address), packets_in_chans); + log::info("{} skipping {} packets", right->address, packets_in_chans); right->audio_stats.packet_flush_count += packets_in_chans; right->audio_stats.frame_flush_count++; L2CA_FlushChannel(cid, 0xffff); @@ -1586,8 +1560,8 @@ class HearingAidImpl : public HearingAid { HearingDevice* hearingAid) { if (!hearingAid->playback_started || !hearingAid->command_acked) { log::debug("Playback stalled, device={},cmd send={}, cmd acked={}", - ADDRESS_TO_LOGGABLE_CSTR(hearingAid->address), - hearingAid->playback_started, hearingAid->command_acked); + hearingAid->address, hearingAid->playback_started, + hearingAid->command_acked); return; } @@ -1597,8 +1571,7 @@ class HearingAidImpl : public HearingAid { p++; memcpy(p, encoded_data, packet_size); - log::debug("{} : {}", ADDRESS_TO_LOGGABLE_CSTR(hearingAid->address), - base::HexEncode(p, packet_size)); + log::debug("{} : {}", hearingAid->address, base::HexEncode(p, packet_size)); uint16_t result = GAP_ConnWriteData(hearingAid->gap_handle, audio_packet); @@ -1622,13 +1595,12 @@ class HearingAidImpl : public HearingAid { init_credit = L2CA_GetPeerLECocCredit(address, GAP_ConnGetL2CAPCid(gap_handle)); - log::info("GAP_EVT_CONN_OPENED {}, tx_mtu={}, init_credit={}", - ADDRESS_TO_LOGGABLE_CSTR(address), tx_mtu, init_credit); + log::info("GAP_EVT_CONN_OPENED {}, tx_mtu={}, init_credit={}", address, + tx_mtu, init_credit); HearingDevice* hearingDevice = hearingDevices.FindByAddress(address); if (!hearingDevice) { - log::info("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Skipping unknown device {}", address); return; } hearingDevice->gap_opened = true; @@ -1641,8 +1613,8 @@ class HearingAidImpl : public HearingAid { case GAP_EVT_CONN_CLOSED: log::info( "GAP_EVT_CONN_CLOSED: {}, playback_started={}, accepting_audio={}", - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address), - hearingDevice->playback_started, hearingDevice->accepting_audio); + hearingDevice->address, hearingDevice->playback_started, + hearingDevice->accepting_audio); if (!hearingDevice->accepting_audio) { /* Disconnect connection when data channel is not available */ BTA_GATTC_Close(hearingDevice->conn_id); @@ -1777,19 +1749,18 @@ class HearingAidImpl : public HearingAid { void Disconnect(const RawAddress& address) { HearingDevice* hearingDevice = hearingDevices.FindByAddress(address); if (!hearingDevice) { - log::info("Device not connected to profile {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Device not connected to profile {}", address); return; } - log::debug("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("{}", address); bool connected = hearingDevice->accepting_audio; bool connecting_by_user = hearingDevice->connecting_actively; log::info("{}, playback_started={}, accepting_audio={}", - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address), - hearingDevice->playback_started, hearingDevice->accepting_audio); + hearingDevice->address, hearingDevice->playback_started, + hearingDevice->accepting_audio); if (hearingDevice->connecting_actively) { // cancel pending direct connect @@ -1834,8 +1805,7 @@ class HearingAidImpl : public HearingAid { loghex(conn_id)); return; } - log::debug("conn_id={}, remote_bda={}", loghex(conn_id), - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + log::debug("conn_id={}, remote_bda={}", loghex(conn_id), remote_bda); // Inform the other side (if any) of this disconnection std::vector<uint8_t> inform_disconn_state( @@ -1851,7 +1821,7 @@ class HearingAidImpl : public HearingAid { log::info( "Another device from the set is still connected, issuing a direct " "connection, other_device_bda={}", - ADDRESS_TO_LOGGABLE_CSTR(other_connected_device_from_set->address)); + other_connected_device_from_set->address); } // If another device from the pair is still connected, do a direct @@ -1883,7 +1853,7 @@ class HearingAidImpl : public HearingAid { if (hearingDevice->connection_update_status != COMPLETED) { log::info("connection update not completed. Current={}, device={}", hearingDevice->connection_update_status, - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address)); + hearingDevice->address); if (hearingDevice->connection_update_status == STARTED) { OnConnectionUpdateComplete(hearingDevice->conn_id, NULL); @@ -1904,8 +1874,7 @@ class HearingAidImpl : public HearingAid { } hearingDevice->accepting_audio = false; - log::info("device={}, playback_started={}", - ADDRESS_TO_LOGGABLE_CSTR(hearingDevice->address), + log::info("device={}, playback_started={}", hearingDevice->address, hearingDevice->playback_started); hearingDevice->playback_started = false; hearingDevice->command_acked = false; @@ -2007,8 +1976,8 @@ class HearingAidImpl : public HearingAid { return; } // Send the data packet - log::info("Send State Change. device={}, status={}", - ADDRESS_TO_LOGGABLE_CSTR(device->address), loghex(payload[1])); + log::info("Send State Change. device={}, status={}", device->address, + loghex(payload[1])); BtaGattQueue::WriteCharacteristic( device->conn_id, device->audio_control_point_handle, payload, GATT_WRITE_NO_RSP, nullptr, nullptr); @@ -2031,7 +2000,7 @@ class HearingAidImpl : public HearingAid { device->num_intervals_since_last_rssi_read++; if (device->num_intervals_since_last_rssi_read >= PERIOD_TO_READ_RSSI_IN_INTERVALS) { device->num_intervals_since_last_rssi_read = 0; - log::debug("device={}", ADDRESS_TO_LOGGABLE_CSTR(device->address)); + log::debug("device={}", device->address); BTM_ReadRSSI(device->address, read_rssi_cb); } } diff --git a/system/bta/hf_client/bta_hf_client_main.cc b/system/bta/hf_client/bta_hf_client_main.cc index 0cc497ba23..a6d49ce0b3 100644 --- a/system/bta/hf_client/bta_hf_client_main.cc +++ b/system/bta/hf_client/bta_hf_client_main.cc @@ -750,8 +750,7 @@ void bta_hf_client_sm_execute(uint16_t event, tBTA_HF_CLIENT_DATA* p_data) { /* If the state has changed then notify the app of the corresponding change */ if (in_state != client_cb->state) { log::verbose("notifying state change to {} -> {} device {}", in_state, - client_cb->state, - ADDRESS_TO_LOGGABLE_STR(client_cb->peer_addr)); + client_cb->state, client_cb->peer_addr); tBTA_HF_CLIENT evt; memset(&evt, 0, sizeof(evt)); evt.bd_addr = client_cb->peer_addr; @@ -766,8 +765,7 @@ void bta_hf_client_sm_execute(uint16_t event, tBTA_HF_CLIENT_DATA* p_data) { } log::verbose("device {} state change: [{}] -> [{}] after Event [{}]", - ADDRESS_TO_LOGGABLE_STR(client_cb->peer_addr), - bta_hf_client_state_str(in_state), + client_cb->peer_addr, bta_hf_client_state_str(in_state), bta_hf_client_state_str(client_cb->state), bta_hf_client_evt_str(in_event)); } diff --git a/system/bta/hf_client/bta_hf_client_rfc.cc b/system/bta/hf_client/bta_hf_client_rfc.cc index 25c7c134b8..1c7a7c855f 100644 --- a/system/bta/hf_client/bta_hf_client_rfc.cc +++ b/system/bta/hf_client/bta_hf_client_rfc.cc @@ -137,7 +137,7 @@ static void bta_hf_client_mgmt_cback(uint32_t code, uint16_t port_handle) { } else if (client_cb != NULL && port_handle == client_cb->conn_handle) { /* code != PORT_SUC */ log::error("closing port handle {} dev {}", port_handle, - ADDRESS_TO_LOGGABLE_STR(client_cb->peer_addr)); + client_cb->peer_addr); RFCOMM_RemoveServer(port_handle); p_buf->hdr.event = BTA_HF_CLIENT_RFC_CLOSE_EVT; diff --git a/system/bta/hh/bta_hh_act.cc b/system/bta/hh/bta_hh_act.cc index 5781beb9a5..d780c06d15 100644 --- a/system/bta/hh/bta_hh_act.cc +++ b/system/bta/hh/bta_hh_act.cc @@ -520,8 +520,7 @@ void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { log::assert_that(p_cb != nullptr, "assert failed: p_cb != nullptr"); if (p_cb->link_spec.transport == BT_TRANSPORT_LE) { - log::debug("Host initiating close to le device:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec)); + log::debug("Host initiating close to le device:{}", p_cb->link_spec); bta_hh_le_api_disc_act(p_cb); @@ -531,12 +530,10 @@ void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { : p_cb->hid_handle; tHID_STATUS status = HID_HostCloseDev(hid_handle); if (status != HID_SUCCESS) { - log::warn("Failed closing classic device:{} status:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec), + log::warn("Failed closing classic device:{} status:{}", p_cb->link_spec, hid_status_text(status)); } else { - log::debug("Host initiated close to classic device:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec)); + log::debug("Host initiated close to classic device:{}", p_cb->link_spec); } tBTA_HH bta_hh = { .dev_status = {.status = @@ -982,7 +979,7 @@ void bta_hh_maint_dev_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { } } else { log::error("unexpected BT transport: {}", - bt_transport_text(transport).c_str()); + bt_transport_text(transport)); break; } } else /* device already been added */ diff --git a/system/bta/hh/bta_hh_le.cc b/system/bta/hh/bta_hh_le.cc index 57253ea603..413ad99897 100644 --- a/system/bta/hh/bta_hh_le.cc +++ b/system/bta/hh/bta_hh_le.cc @@ -1002,8 +1002,7 @@ static void bta_hh_le_encrypt_cback(const RawAddress* bd_addr, ******************************************************************************/ void bta_hh_security_cmpl(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* /* p_buf */) { - log::verbose("addr:{}, status:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec), - p_cb->status); + log::verbose("addr:{}, status:{}", p_cb->link_spec, p_cb->status); if (p_cb->status == BTA_HH_OK) { if (p_cb->hid_srvc.state < BTA_HH_SERVICE_DISCOVERED) { log::debug("No reports loaded, try to load"); @@ -1100,7 +1099,7 @@ static void bta_hh_clear_service_cache(tBTA_HH_DEV_CB* p_cb) { ******************************************************************************/ void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* /* p_buf */) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec.addrt.bda)); + log::verbose("addr:{}", p_cb->link_spec.addrt.bda); if (BTM_SecIsSecurityPending(p_cb->link_spec.addrt.bda)) { /* if security collision happened, wait for encryption done */ p_cb->security_pending = true; @@ -1109,23 +1108,20 @@ void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb, /* if link has been encrypted */ if (BTM_IsEncrypted(p_cb->link_spec.addrt.bda, BT_TRANSPORT_LE)) { - log::debug("addr:{} already encrypted", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec.addrt.bda)); + log::debug("addr:{} already encrypted", p_cb->link_spec.addrt.bda); p_cb->status = BTA_HH_OK; bta_hh_sm_execute(p_cb, BTA_HH_ENC_CMPL_EVT, NULL); } /* if bonded and link not encrypted */ else if (BTM_IsLinkKeyKnown(p_cb->link_spec.addrt.bda, BT_TRANSPORT_LE)) { - log::debug("addr:{} bonded, not encrypted", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec.addrt.bda)); + log::debug("addr:{} bonded, not encrypted", p_cb->link_spec.addrt.bda); p_cb->status = BTA_HH_ERR_AUTH_FAILED; BTM_SetEncryption(p_cb->link_spec.addrt.bda, BT_TRANSPORT_LE, bta_hh_le_encrypt_cback, NULL, BTM_BLE_SEC_ENCRYPT); } /* unbonded device, report security error here */ else { - log::debug("addr:{} not bonded", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec.addrt.bda)); + log::debug("addr:{} not bonded", p_cb->link_spec.addrt.bda); p_cb->status = BTA_HH_ERR_AUTH_FAILED; bta_hh_clear_service_cache(p_cb); BTM_SetEncryption(p_cb->link_spec.addrt.bda, BT_TRANSPORT_LE, @@ -1149,8 +1145,8 @@ void bta_hh_gatt_open(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_buf) { /* if received invalid callback data , ignore it */ if (p_cb == NULL || p_data == NULL) return; - log::verbose("BTA_GATTC_OPEN_EVT bda={} status={}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->remote_bda), p_data->status); + log::verbose("BTA_GATTC_OPEN_EVT bda={} status={}", p_data->remote_bda, + p_data->status); if (p_data->status == GATT_SUCCESS) { p_cb->hid_handle = bta_hh_le_get_le_dev_hdl(p_cb->index); @@ -1195,15 +1191,14 @@ static void bta_hh_le_close(const tBTA_GATTC_CLOSE& gattc_data) { tBTA_HH_DEV_CB* p_cb = bta_hh_le_find_dev_cb_by_bda(link_spec); if (p_cb == nullptr) { - log::warn("unknown device:{}", - ADDRESS_TO_LOGGABLE_CSTR(gattc_data.remote_bda)); + log::warn("unknown device:{}", gattc_data.remote_bda); return; } if (p_cb->hid_srvc.state == BTA_HH_SERVICE_CHANGED) { /* Service change would have already prompted a local disconnection */ log::warn("Disconnected after service changed indication:{}", - ADDRESS_TO_LOGGABLE_CSTR(gattc_data.remote_bda)); + gattc_data.remote_bda); return; } @@ -1671,8 +1666,7 @@ void bta_hh_le_open_fail(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { base::StringPrintf( "%s reason %s", bt_transport_text(p_cb->link_spec.transport).c_str(), gatt_disconnection_reason_text(le_close->reason).c_str())); - log::warn("Open failed for device:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec.addrt.bda)); + log::warn("Open failed for device:{}", p_cb->link_spec.addrt.bda); /* open failure in the middle of service discovery, clear all services */ if (p_cb->disc_active & BTA_HH_LE_DISC_HIDS) { @@ -1744,8 +1738,7 @@ void bta_hh_gatt_close(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { case GATT_CONN_TIMEOUT: log::debug( "gd_acl: add into acceptlist for reconnection device:{} reason:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec), - gatt_disconnection_reason_text(le_close->reason)); + p_cb->link_spec, gatt_disconnection_reason_text(le_close->reason)); // gd removes from bg list after successful connection // Correct the cached state to allow re-add to acceptlist. bta_hh_le_add_dev_bg_conn(p_cb); @@ -1760,8 +1753,7 @@ void bta_hh_gatt_close(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { log::debug( "gd_acl: SKIP add into acceptlist for reconnection device:{} " "reason:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec), - gatt_disconnection_reason_text(le_close->reason)); + p_cb->link_spec, gatt_disconnection_reason_text(le_close->reason)); break; } } @@ -2118,7 +2110,7 @@ uint8_t bta_hh_le_add_device(tBTA_HH_DEV_CB* p_cb, void bta_hh_le_remove_dev_bg_conn(tBTA_HH_DEV_CB* p_dev_cb) { if (p_dev_cb->in_bg_conn) { log::debug("Removing from background connection device:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_cb->link_spec)); + p_dev_cb->link_spec); p_dev_cb->in_bg_conn = false; BTA_GATTC_CancelOpen(bta_hh_cb.gatt_if, p_dev_cb->link_spec.addrt.bda, @@ -2132,8 +2124,7 @@ void bta_hh_le_remove_dev_bg_conn(tBTA_HH_DEV_CB* p_dev_cb) { static void bta_hh_le_service_changed(tAclLinkSpec link_spec) { tBTA_HH_DEV_CB* p_cb = bta_hh_le_find_dev_cb_by_bda(link_spec); if (p_cb == nullptr) { - log::warn("Received close event with unknown device:{}", - ADDRESS_TO_LOGGABLE_CSTR(link_spec)); + log::warn("Received close event with unknown device:{}", link_spec); return; } @@ -2165,7 +2156,7 @@ static void bta_hh_le_service_changed(tAclLinkSpec link_spec) { static void bta_hh_le_service_discovery_done(tAclLinkSpec link_spec) { tBTA_HH_DEV_CB* p_cb = bta_hh_le_find_dev_cb_by_bda(link_spec); if (p_cb == nullptr) { - log::warn("unknown device:{}", ADDRESS_TO_LOGGABLE_CSTR(link_spec)); + log::warn("unknown device:{}", link_spec); return; } @@ -2315,7 +2306,7 @@ static bool bta_hh_le_iso_data_callback(const RawAddress& addr, tBTA_HH_DEV_CB* p_dev_cb = bta_hh_le_find_dev_cb_by_bda(link_spec); if (p_dev_cb == nullptr) { - log::warn("Device not connected: {}", ADDRESS_TO_LOGGABLE_CSTR(link_spec)); + log::warn("Device not connected: {}", link_spec); return false; } diff --git a/system/bta/hh/bta_hh_utils.cc b/system/bta/hh/bta_hh_utils.cc index 98289d3dff..79d5ff9596 100644 --- a/system/bta/hh/bta_hh_utils.cc +++ b/system/bta/hh/bta_hh_utils.cc @@ -254,7 +254,7 @@ tBTA_HH_STATUS bta_hh_read_ssr_param(const tAclLinkSpec& link_spec, uint16_t* p_min_ssr_tout) { tBTA_HH_DEV_CB* p_cb = bta_hh_get_cb(link_spec); if (p_cb == nullptr) { - log::warn("Unable to find device:{}", ADDRESS_TO_LOGGABLE_CSTR(link_spec)); + log::warn("Unable to find device:{}", link_spec); return BTA_HH_ERR; } @@ -267,7 +267,7 @@ tBTA_HH_STATUS bta_hh_read_ssr_param(const tAclLinkSpec& link_spec, if (get_btm_client_interface().link_controller.BTM_GetLinkSuperTout( p_cb->link_spec.addrt.bda, &ssr_max_latency) != BTM_SUCCESS) { log::warn("Unable to get supervision timeout for peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->link_spec)); + p_cb->link_spec); return BTA_HH_ERR; } ssr_max_latency = BTA_HH_GET_DEF_SSR_MAX_LAT(ssr_max_latency); diff --git a/system/bta/include/bta_jv_api.h b/system/bta/include/bta_jv_api.h index 76ce885d9e..9c6ec12b02 100644 --- a/system/bta/include/bta_jv_api.h +++ b/system/bta/include/bta_jv_api.h @@ -137,7 +137,7 @@ typedef uint8_t tBTA_JV_PM_ID; #endif /* JV pm connection states */ -enum { +typedef enum : uint8_t { BTA_JV_CONN_OPEN = 0, /* Connection opened state */ BTA_JV_CONN_CLOSE, /* Connection closed state */ BTA_JV_APP_OPEN, /* JV Application opened state */ @@ -147,8 +147,28 @@ enum { BTA_JV_CONN_IDLE, /* Connection idle state */ BTA_JV_CONN_BUSY, /* Connection busy state */ BTA_JV_MAX_CONN_STATE /* Max number of connection state */ -}; -typedef uint8_t tBTA_JV_CONN_STATE; +} tBTA_JV_CONN_STATE; + +inline std::string bta_jv_conn_state_text(const tBTA_JV_CONN_STATE& state) { + switch (state) { + CASE_RETURN_STRING(BTA_JV_CONN_OPEN); + CASE_RETURN_STRING(BTA_JV_CONN_CLOSE); + CASE_RETURN_STRING(BTA_JV_APP_OPEN); + CASE_RETURN_STRING(BTA_JV_APP_CLOSE); + CASE_RETURN_STRING(BTA_JV_SCO_OPEN); + CASE_RETURN_STRING(BTA_JV_SCO_CLOSE); + CASE_RETURN_STRING(BTA_JV_CONN_IDLE); + CASE_RETURN_STRING(BTA_JV_CONN_BUSY); + CASE_RETURN_STRING(BTA_JV_MAX_CONN_STATE); + default: + RETURN_UNKNOWN_TYPE_STRING(tBTA_JV_CONN_STATE, state); + } +} + +namespace fmt { +template <> +struct formatter<tBTA_JV_CONN_STATE> : enum_formatter<tBTA_JV_CONN_STATE> {}; +} // namespace fmt /* JV Connection types */ #define BTA_JV_CONN_TYPE_RFCOMM 0 diff --git a/system/bta/jv/bta_jv_act.cc b/system/bta/jv/bta_jv_act.cc index 8967a6227d..3c5ee09d90 100644 --- a/system/bta/jv/bta_jv_act.cc +++ b/system/bta/jv/bta_jv_act.cc @@ -799,15 +799,13 @@ static void bta_jv_start_discovery_cback(const RawAddress& bd_addr, if (!bta_jv_cb.sdp_cb.sdp_active) { log::warn( "Received unexpected service discovery callback bd_addr:{} result:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), sdp_result_text(result), - bta_jv_cb.sdp_cb.sdp_active); + bd_addr, sdp_result_text(result), bta_jv_cb.sdp_cb.sdp_active); } if (bta_jv_cb.sdp_cb.bd_addr != bta_jv_cb.sdp_cb.bd_addr) { log::warn( "Received incorrect service discovery callback expected_bd_addr:{} " "actual_bd_addr:{} result:{}", - ADDRESS_TO_LOGGABLE_CSTR(bta_jv_cb.sdp_cb.bd_addr), - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), sdp_result_text(result), + bta_jv_cb.sdp_cb.bd_addr, bd_addr, sdp_result_text(result), bta_jv_cb.sdp_cb.sdp_active); } @@ -823,7 +821,7 @@ static void bta_jv_start_discovery_cback(const RawAddress& bd_addr, if (result == SDP_SUCCESS || result == SDP_DB_FULL) { log::info( "Received service discovery callback success bd_addr:{} result:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), sdp_result_text(result)); + bd_addr, sdp_result_text(result)); tSDP_PROTOCOL_ELEM pe; tSDP_DISC_REC* p_sdp_rec = NULL; p_sdp_rec = get_legacy_stack_sdp_api()->db.SDP_FindServiceUUIDInDb( @@ -844,19 +842,19 @@ static void bta_jv_start_discovery_cback(const RawAddress& bd_addr, } else { log::warn( "Received service discovery callback failed bd_addr:{} result:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), sdp_result_text(result)); + bd_addr, sdp_result_text(result)); } log::info( "Issuing service discovery complete callback bd_addr:{} result:{} " "status:{} scn:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), sdp_result_text(result), + bd_addr, sdp_result_text(result), bta_jv_status_text(bta_jv.disc_comp.status), bta_jv.disc_comp.scn); bta_jv_cb.p_dm_cback(BTA_JV_DISCOVERY_COMP_EVT, &bta_jv, rfcomm_slot_id); } else { log::warn( "Received service discovery callback when disabled bd_addr:{} " "result:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), sdp_result_text(result)); + bd_addr, sdp_result_text(result)); } // User data memory is allocated in `bta_jv_start_discovery` osi_free(const_cast<void*>(user_data)); @@ -871,10 +869,8 @@ void bta_jv_start_discovery(const RawAddress& bd_addr, uint16_t num_uuid, if (bta_jv_cb.sdp_cb.sdp_active) { log::warn( "Unable to start discovery as already in progress active_bd_addr{} " - "request_bd_addr:{} " - "num:uuid:{} rfcomm_slot_id:{}", - ADDRESS_TO_LOGGABLE_CSTR(bta_jv_cb.sdp_cb.bd_addr), - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), num_uuid, rfcomm_slot_id); + "request_bd_addr:{} num:uuid:{} rfcomm_slot_id:{}", + bta_jv_cb.sdp_cb.bd_addr, bd_addr, num_uuid, rfcomm_slot_id); if (bta_jv_cb.p_dm_cback) { tBTA_JV bta_jv = { .status = tBTA_JV_STATUS::BUSY, @@ -896,7 +892,7 @@ void bta_jv_start_discovery(const RawAddress& bd_addr, uint16_t num_uuid, log::warn( "Unable to initialize service discovery db bd_addr:{} num:uuid:{} " "rfcomm_slot_id:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), num_uuid, rfcomm_slot_id); + bd_addr, num_uuid, rfcomm_slot_id); } /* tell SDP to keep the raw data */ @@ -923,7 +919,7 @@ void bta_jv_start_discovery(const RawAddress& bd_addr, uint16_t num_uuid, log::warn( "Unable to original service discovery bd_addr:{} num:uuid:{} " "rfcomm_slot_id:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), num_uuid, rfcomm_slot_id); + bd_addr, num_uuid, rfcomm_slot_id); /* failed to start SDP. report the failure right away */ if (bta_jv_cb.p_dm_cback) { tBTA_JV bta_jv = { @@ -935,9 +931,8 @@ void bta_jv_start_discovery(const RawAddress& bd_addr, uint16_t num_uuid, } } else { log::info( - "Started service discovery bd_addr:{} num_uuid:{} " - "rfcomm_slot_id:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), num_uuid, rfcomm_slot_id); + "Started service discovery bd_addr:{} num_uuid:{} rfcomm_slot_id:{}", + bd_addr, num_uuid, rfcomm_slot_id); } } diff --git a/system/bta/jv/bta_jv_api.cc b/system/bta/jv/bta_jv_api.cc index b38fc35a00..3cf47a6540 100644 --- a/system/bta/jv/bta_jv_api.cc +++ b/system/bta/jv/bta_jv_api.cc @@ -165,8 +165,8 @@ tBTA_JV_STATUS BTA_JvFreeChannel(uint16_t channel, int conn_type) { tBTA_JV_STATUS BTA_JvStartDiscovery(const RawAddress& bd_addr, uint16_t num_uuid, const Uuid* p_uuid_list, uint32_t rfcomm_slot_id) { - log::verbose("bd_addr:{}, rfcomm_slot_id:{}, num_uuid:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), rfcomm_slot_id, num_uuid); + log::verbose("bd_addr:{}, rfcomm_slot_id:{}, num_uuid:{}", bd_addr, + rfcomm_slot_id, num_uuid); Uuid* uuid_list_copy = new Uuid[num_uuid]; memcpy(uuid_list_copy, p_uuid_list, num_uuid * sizeof(Uuid)); @@ -235,8 +235,7 @@ void BTA_JvL2capConnect(int conn_type, tBTA_SEC sec_mask, tBTA_JV_ROLE role, log::verbose( "conn_type:{}, role:{}, remote_psm:{}, peer_bd_addr:{}, " "l2cap_socket_id:{}", - conn_type, role, remote_psm, ADDRESS_TO_LOGGABLE_CSTR(peer_bd_addr), - l2cap_socket_id); + conn_type, role, remote_psm, peer_bd_addr, l2cap_socket_id); log::assert_that(p_cback != nullptr, "assert failed: p_cback != nullptr"); do_in_main_thread(FROM_HERE, @@ -430,7 +429,7 @@ tBTA_JV_STATUS BTA_JvRfcommConnect(tBTA_SEC sec_mask, tBTA_JV_ROLE role, tBTA_JV_RFCOMM_CBACK* p_cback, uint32_t rfcomm_slot_id) { log::verbose("remote_scn:{}, peer_bd_addr:{}, rfcomm_slot_id:{}", remote_scn, - ADDRESS_TO_LOGGABLE_CSTR(peer_bd_addr), rfcomm_slot_id); + peer_bd_addr, rfcomm_slot_id); if (!p_cback) return tBTA_JV_STATUS::FAILURE; /* Nothing to do */ diff --git a/system/bta/le_audio/broadcaster/state_machine.cc b/system/bta/le_audio/broadcaster/state_machine.cc index 8f2feee284..1353bb0260 100644 --- a/system/bta/le_audio/broadcaster/state_machine.cc +++ b/system/bta/le_audio/broadcaster/state_machine.cc @@ -324,8 +324,7 @@ class BroadcastStateMachineImpl : public BroadcastStateMachine { [](const void*) { /* Already streaming */ }}; void OnAddressResponse(uint8_t addr_type, RawAddress addr) { - log::info("own address={}, type={}", ADDRESS_TO_LOGGABLE_CSTR(addr), - addr_type); + log::info("own address={}, type={}", addr, addr_type); addr_ = addr; addr_type_ = addr_type; } diff --git a/system/bta/le_audio/client.cc b/system/bta/le_audio/client.cc index dad1e1a4e7..4ed0534f9b 100644 --- a/system/bta/le_audio/client.cc +++ b/system/bta/le_audio/client.cc @@ -391,8 +391,8 @@ class LeAudioClientImpl : public LeAudioClient { void OnGroupAddedCb(const RawAddress& address, const bluetooth::Uuid& uuid, int group_id) { - log::info("address: {} group uuid {} group_id: {}", - ADDRESS_TO_LOGGABLE_STR(address), uuid, group_id); + log::info("address: {} group uuid {} group_id: {}", address, uuid, + group_id); /* We are interested in the groups which are in the context of CAP */ if (uuid != bluetooth::le_audio::uuid::kCapServiceUuid) return; @@ -412,15 +412,14 @@ class LeAudioClientImpl : public LeAudioClient { * considering this removing device. */ void SetDeviceAsRemovePendingAndStopGroup(LeAudioDevice* leAudioDevice) { - log::info("device {}", ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + log::info("device {}", leAudioDevice->address_); leAudioDevice->SetConnectionState(DeviceConnectState::REMOVING); leAudioDevice->closing_stream_for_disconnection_ = true; GroupStop(leAudioDevice->group_id_); } void OnGroupMemberAddedCb(const RawAddress& address, int group_id) { - log::info("address: {} group_id: {}", ADDRESS_TO_LOGGABLE_STR(address), - group_id); + log::info("address: {} group_id: {}", address, group_id); auto group = aseGroups_.FindById(group_id); if (!group) { @@ -444,21 +443,20 @@ class LeAudioClientImpl : public LeAudioClient { } void OnGroupMemberRemovedCb(const RawAddress& address, int group_id) { - log::info("address: {} group_id: {}", ADDRESS_TO_LOGGABLE_STR(address), - group_id); + log::info("address: {} group_id: {}", address, group_id); LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); if (!leAudioDevice) return; if (leAudioDevice->group_id_ != group_id) { log::warn("Device: {} not assigned to the group.", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return; } LeAudioDeviceGroup* group = aseGroups_.FindById(group_id); if (group == NULL) { - log::info("device not in the group: {}, {}", - ADDRESS_TO_LOGGABLE_STR(leAudioDevice->address_), group_id); + log::info("device not in the group: {}, {}", leAudioDevice->address_, + group_id); return; } @@ -545,7 +543,7 @@ class LeAudioClientImpl : public LeAudioClient { void OnDeviceAutonomousStateTransitionTimeout(LeAudioDevice* leAudioDevice) { log::error("Device {}, failed to complete autonomous transition", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); DisconnectDevice(leAudioDevice, true); } @@ -646,8 +644,8 @@ class LeAudioClientImpl : public LeAudioClient { /* TODO This part possible to remove as this is to handle adding device to * the group which is unknown and not connected. */ - log::info("leAudioDevice unknown , address: {} group: {}", - ADDRESS_TO_LOGGABLE_STR(address), loghex(group_id)); + log::info("leAudioDevice unknown , address: {} group: {}", address, + loghex(group_id)); if (group_id == bluetooth::groups::kGroupUnknown) return; @@ -766,12 +764,10 @@ class LeAudioClientImpl : public LeAudioClient { LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); LeAudioDeviceGroup* group = aseGroups_.FindById(group_id); - log::info("group_id: {} address: {}", group_id, - ADDRESS_TO_LOGGABLE_STR(address)); + log::info("group_id: {} address: {}", group_id, address); if (!leAudioDevice) { - log::error("Skipping unknown leAudioDevice, address: {}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::error("Skipping unknown leAudioDevice, address: {}", address); return; } @@ -1329,11 +1325,10 @@ class LeAudioClientImpl : public LeAudioClient { } void SetEnableState(const RawAddress& address, bool enabled) override { - log::info("{}: {}", ADDRESS_TO_LOGGABLE_CSTR(address), - (enabled ? "enabled" : "disabled")); + log::info("{}: {}", address, (enabled ? "enabled" : "disabled")); auto leAudioDevice = leAudioDevices_.FindByAddress(address); if (leAudioDevice == nullptr) { - log::warn("{} is null", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("{} is null", address); return; } @@ -1352,7 +1347,7 @@ class LeAudioClientImpl : public LeAudioClient { } void RemoveDevice(const RawAddress& address) override { - log::info(": {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info(": {}", address); LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); if (!leAudioDevice) { return; @@ -1362,7 +1357,7 @@ class LeAudioClientImpl : public LeAudioClient { BTA_GATTC_CancelOpen(gatt_if_, address, false); btif_storage_set_leaudio_autoconnect(address, false); - log::info("{}, state: {}", ADDRESS_TO_LOGGABLE_CSTR(address), + log::info("{}, state: {}", address, bluetooth::common::ToString(leAudioDevice->GetConnectionState())); auto connection_state = leAudioDevice->GetConnectionState(); switch (connection_state) { @@ -1402,13 +1397,12 @@ class LeAudioClientImpl : public LeAudioClient { } void Connect(const RawAddress& address) override { - log::info(": {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info(": {}", address); LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); if (!leAudioDevice) { if (!BTM_IsLinkKeyKnown(address, BT_TRANSPORT_LE)) { - log::error("Connecting {} when not bonded", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Connecting {} when not bonded", address); callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address); return; } @@ -1417,8 +1411,7 @@ class LeAudioClientImpl : public LeAudioClient { auto current_connect_state = leAudioDevice->GetConnectionState(); if ((current_connect_state == DeviceConnectState::CONNECTED) || (current_connect_state == DeviceConnectState::CONNECTING_BY_USER)) { - log::error("Device {} is in invalid state: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), + log::error("Device {} is in invalid state: {}", leAudioDevice->address_, bluetooth::common::ToString(current_connect_state)); return; @@ -1427,8 +1420,7 @@ class LeAudioClientImpl : public LeAudioClient { if (leAudioDevice->group_id_ != bluetooth::groups::kGroupUnknown) { auto group = GetGroupIfEnabled(leAudioDevice->group_id_); if (!group) { - log::warn("{}, trying to connect to disabled group id {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + log::warn("{}, trying to connect to disabled group id {}", address, leAudioDevice->group_id_); callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address); return; @@ -1480,9 +1472,8 @@ class LeAudioClientImpl : public LeAudioClient { "restoring: {}, autoconnect {}, sink_audio_location: {}, " "source_audio_location: {}, sink_supported_context_types : 0x{:04x}, " "source_supported_context_types 0x{:04x}", - ADDRESS_TO_LOGGABLE_CSTR(address), autoconnect, sink_audio_location, - source_audio_location, sink_supported_context_types, - source_supported_context_types); + address, autoconnect, sink_audio_location, source_audio_location, + sink_supported_context_types, source_supported_context_types); leAudioDevices_.Add(address, DeviceConnectState::DISCONNECTED); leAudioDevice = leAudioDevices_.FindByAddress(address); @@ -1575,25 +1566,24 @@ class LeAudioClientImpl : public LeAudioClient { void BackgroundConnectIfNeeded(LeAudioDevice* leAudioDevice) { if (!leAudioDevice->autoconnect_flag_) { log::debug("Device {} not in the background connect", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return; } AddToBackgroundConnectCheckGroupConnected(leAudioDevice); } void Disconnect(const RawAddress& address) override { - log::info(": {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info(": {}", address); LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); if (!leAudioDevice) { - log::warn("leAudioDevice not connected ( {} )", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("leAudioDevice not connected ( {} )", address); callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address); return; } auto connection_state = leAudioDevice->GetConnectionState(); - log::info("{}, state: {}", ADDRESS_TO_LOGGABLE_CSTR(address), + log::info("{}, state: {}", address, bluetooth::common::ToString(connection_state)); switch (connection_state) { @@ -1673,7 +1663,7 @@ class LeAudioClientImpl : public LeAudioClient { case DeviceConnectState::DISCONNECTING_AND_RECOVER: case DeviceConnectState::CONNECTING_AUTOCONNECT: case DeviceConnectState::REMOVING: - log::warn("{}, invalid state {}", ADDRESS_TO_LOGGABLE_CSTR(address), + log::warn("{}, invalid state {}", address, bluetooth::common::ToString(connection_state)); return; } @@ -1981,13 +1971,13 @@ class LeAudioClientImpl : public LeAudioClient { BTA_GATTC_CancelOpen(gatt_if_, address, false); if (group->IsAnyDeviceConnected()) { log::info("Group {} in connected state. Adding {} to allow list", - leAudioDevice->group_id_, ADDRESS_TO_LOGGABLE_CSTR(address)); + leAudioDevice->group_id_, address); BTA_GATTC_Open(gatt_if_, address, BTM_BLE_BKG_CONNECT_ALLOW_LIST, false); } else { log::info( "Adding {} to backgroud connect (default reconnection_mode " "(0x{:02x}))", - ADDRESS_TO_LOGGABLE_CSTR(address), reconnection_mode_); + address, reconnection_mode_); BTA_GATTC_Open(gatt_if_, address, reconnection_mode_, false); } } @@ -1998,8 +1988,8 @@ class LeAudioClientImpl : public LeAudioClient { LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); log::info("{}, conn_id=0x{:04x}, transport={}, status={} (0x{:02x})", - ADDRESS_TO_LOGGABLE_CSTR(address), conn_id, - bt_transport_text(transport), gatt_status_text(status), status); + address, conn_id, bt_transport_text(transport), + gatt_status_text(status), status); if (transport != BT_TRANSPORT_LE) { log::warn("Only LE connection is allowed (transport {})", @@ -2011,8 +2001,8 @@ class LeAudioClientImpl : public LeAudioClient { if (!leAudioDevice) return; if (leAudioDevice->conn_id_ != GATT_INVALID_CONN_ID) { - log::debug("Already connected {}, conn_id=0x{:04x}", - ADDRESS_TO_LOGGABLE_CSTR(address), leAudioDevice->conn_id_); + log::debug("Already connected {}, conn_id=0x{:04x}", address, + leAudioDevice->conn_id_); return; } @@ -2049,7 +2039,7 @@ class LeAudioClientImpl : public LeAudioClient { log::warn( "LeAudio profile is disabled for group_id: {}. {} is not connected", - leAudioDevice->group_id_, ADDRESS_TO_LOGGABLE_CSTR(address)); + leAudioDevice->group_id_, address); return; } } @@ -2066,7 +2056,7 @@ class LeAudioClientImpl : public LeAudioClient { BTA_GATTC_Open(gatt_if_, address, reconnection_mode_, false); if (bluetooth::shim::GetController()->SupportsBle2mPhy()) { - log::info("{} set preferred PHY to 2M", ADDRESS_TO_LOGGABLE_STR(address)); + log::info("{} set preferred PHY to 2M", address); BTM_BleSetPhy(address, PHY_LE_2M, PHY_LE_2M, 0); } @@ -2099,12 +2089,11 @@ class LeAudioClientImpl : public LeAudioClient { int result = BTM_SetEncryption(address, BT_TRANSPORT_LE, nullptr, nullptr, BTM_BLE_SEC_ENCRYPT); - log::info("Encryption required for {}. Request result: 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(address), result); + log::info("Encryption required for {}. Request result: 0x{:02x}", address, + result); if (result == BTM_ERR_KEY_MISSING) { - log::error("Link key unknown for {}, disconnect profile", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Link key unknown for {}, disconnect profile", address); bluetooth::le_audio::MetricsCollector::Get()->OnConnectionStateChanged( leAudioDevice->group_id_, address, ConnectionState::CONNECTED, bluetooth::le_audio::ConnectionStatus::FAILED); @@ -2116,12 +2105,12 @@ class LeAudioClientImpl : public LeAudioClient { void RegisterKnownNotifications(LeAudioDevice* leAudioDevice, bool gatt_register, bool write_ccc) { - log::info("device: {}", ADDRESS_TO_LOGGABLE_STR(leAudioDevice->address_)); + log::info("device: {}", leAudioDevice->address_); if (leAudioDevice->ctp_hdls_.val_hdl == 0) { log::error( "Control point characteristic is mandatory - disconnecting device {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); DisconnectDevice(leAudioDevice); return; } @@ -2179,7 +2168,7 @@ class LeAudioClientImpl : public LeAudioClient { } void OnEncryptionComplete(const RawAddress& address, uint8_t status) { - log::info("{} status 0x{:02x}", ADDRESS_TO_LOGGABLE_CSTR(address), status); + log::info("{} status 0x{:02x}", address, status); LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); if (leAudioDevice == NULL || (leAudioDevice->conn_id_ == GATT_INVALID_CONN_ID)) { @@ -2215,8 +2204,7 @@ class LeAudioClientImpl : public LeAudioClient { */ if (!leAudioDevice->acl_phy_update_done_ && bluetooth::shim::GetController()->SupportsBle2mPhy()) { - log::info("{} set preferred PHY to 2M", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + log::info("{} set preferred PHY to 2M", leAudioDevice->address_); BTM_BleSetPhy(address, PHY_LE_2M, PHY_LE_2M, 0); } @@ -2297,8 +2285,7 @@ class LeAudioClientImpl : public LeAudioClient { void autoConnect(RawAddress address) { auto leAudioDevice = leAudioDevices_.FindByAddress(address); if (leAudioDevice == nullptr) { - log::warn("Device {} not valid anymore", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Device {} not valid anymore", address); return; } @@ -2306,7 +2293,7 @@ class LeAudioClientImpl : public LeAudioClient { } void scheduleAutoConnect(RawAddress& address) { - log::info("Schedule auto connect {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Schedule auto connect {}", address); do_in_main_thread_delayed( FROM_HERE, base::BindOnce(&LeAudioClientImpl::autoConnect, @@ -2315,15 +2302,14 @@ class LeAudioClientImpl : public LeAudioClient { } void recoveryReconnect(RawAddress address) { - log::info("Reconnecting to {} after timeout on state machine.", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Reconnecting to {} after timeout on state machine.", address); LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); if (leAudioDevice == nullptr || leAudioDevice->GetConnectionState() != DeviceConnectState::DISCONNECTING_AND_RECOVER) { log::warn("Device {}, not interested in recovery connect anymore", - ADDRESS_TO_LOGGABLE_CSTR(address)); + address); return; } @@ -2340,7 +2326,7 @@ class LeAudioClientImpl : public LeAudioClient { void scheduleRecoveryReconnect(RawAddress& address) { log::info("Schedule reconnecting to {} after timeout on state machine.", - ADDRESS_TO_LOGGABLE_CSTR(address)); + address); do_in_main_thread_delayed( FROM_HERE, base::BindOnce(&LeAudioClientImpl::recoveryReconnect, @@ -2349,13 +2335,11 @@ class LeAudioClientImpl : public LeAudioClient { } void checkIfGroupMember(RawAddress address) { - log::info("checking being a group member: {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("checking being a group member: {}", address); LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); if (leAudioDevice == nullptr) { - log::warn("Device {}, probably removed", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Device {}, probably removed", address); return; } @@ -2376,7 +2360,7 @@ class LeAudioClientImpl : public LeAudioClient { */ void scheduleGuardForCsisAdd(RawAddress& address) { log::info("Schedule reconnecting to {} after timeout on state machine.", - ADDRESS_TO_LOGGABLE_CSTR(address)); + address); do_in_main_thread_delayed( FROM_HERE, base::BindOnce(&LeAudioClientImpl::checkIfGroupMember, @@ -2389,8 +2373,7 @@ class LeAudioClientImpl : public LeAudioClient { LeAudioDevice* leAudioDevice = leAudioDevices_.FindByConnId(conn_id); if (!leAudioDevice) { - log::error(", skipping unknown leAudioDevice, address: {}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::error(", skipping unknown leAudioDevice, address: {}", address); return; } @@ -2424,8 +2407,7 @@ class LeAudioClientImpl : public LeAudioClient { auto connection_state = leAudioDevice->GetConnectionState(); log::info("{}, autoconnect {}, reason 0x{:02x}, connection state {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), - leAudioDevice->autoconnect_flag_, reason, + leAudioDevice->address_, leAudioDevice->autoconnect_flag_, reason, bluetooth::common::ToString(connection_state)); if (connection_state == DeviceConnectState::DISCONNECTING_AND_RECOVER) { @@ -2504,7 +2486,7 @@ class LeAudioClientImpl : public LeAudioClient { if (write_ccc == false) { log::verbose("CCC is not written to {} (0x{:04x}), handle 0x{:04x}", - ADDRESS_TO_LOGGABLE_CSTR(address), conn_id, ccc_handle); + address, conn_id, ccc_handle); return true; } @@ -2539,7 +2521,7 @@ class LeAudioClientImpl : public LeAudioClient { return; } - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + log::info("{}", leAudioDevice->address_); if (leAudioDevice->known_service_handles_ == false) { log::debug("Database already invalidated"); @@ -2566,8 +2548,8 @@ class LeAudioClientImpl : public LeAudioClient { void OnServiceChangeEvent(const RawAddress& address) { LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); if (!leAudioDevice) { - log::warn("Skipping unknown leAudioDevice {} ({})", - ADDRESS_TO_LOGGABLE_CSTR(address), fmt::ptr(leAudioDevice)); + log::warn("Skipping unknown leAudioDevice {} ({})", address, + fmt::ptr(leAudioDevice)); return; } @@ -2599,7 +2581,7 @@ class LeAudioClientImpl : public LeAudioClient { */ if (mtu < 64) { log::error("Device {} MTU is too low ({}). Disconnecting from LE Audio", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), mtu); + leAudioDevice->address_, mtu); Disconnect(leAudioDevice->address_); return; } @@ -2616,8 +2598,7 @@ class LeAudioClientImpl : public LeAudioClient { } log::info("{}, tx_phy: {:#x}, rx_phy: {:#x} , status: {:#x}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), tx_phy, rx_phy, - status); + leAudioDevice->address_, tx_phy, rx_phy, status); if (status == 0) { leAudioDevice->acl_phy_update_done_ = true; @@ -2627,8 +2608,8 @@ class LeAudioClientImpl : public LeAudioClient { void OnGattServiceDiscoveryDone(const RawAddress& address) { LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address); if (!leAudioDevice || (leAudioDevice->conn_id_ == GATT_INVALID_CONN_ID)) { - log::verbose("skipping unknown leAudioDevice, address {} ({})", - ADDRESS_TO_LOGGABLE_CSTR(address), fmt::ptr(leAudioDevice)); + log::verbose("skipping unknown leAudioDevice, address {} ({})", address, + fmt::ptr(leAudioDevice)); return; } @@ -2646,8 +2627,7 @@ class LeAudioClientImpl : public LeAudioClient { void disconnectInvalidDevice(LeAudioDevice* leAudioDevice, std::string error_string, LeAudioHealthDeviceStatType stat) { - log::error("{}, {}", ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), - error_string); + log::error("{}, {}", leAudioDevice->address_, error_string); if (leAudioHealthStatus_) { leAudioHealthStatus_->AddStatisticForDevice(leAudioDevice, stat); } @@ -2695,23 +2675,22 @@ class LeAudioClientImpl : public LeAudioClient { bluetooth::le_audio::uuid::kPublishedAudioCapabilityServiceUuid) { log::info( "Found Audio Capability service, handle: 0x{:04x}, device: {}", - tmp.handle, ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + tmp.handle, leAudioDevice->address_); pac_svc = &tmp; } else if (tmp.uuid == bluetooth::le_audio::uuid::kAudioStreamControlServiceUuid) { log::info( "Found Audio Stream Endpoint service, handle: 0x{:04x}, device: {}", - tmp.handle, ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + tmp.handle, leAudioDevice->address_); ase_svc = &tmp; } else if (tmp.uuid == bluetooth::csis::kCsisServiceUuid) { log::info( "Found CSIS service, handle: 0x{:04x}, is primary: {}, device: {}", - tmp.handle, tmp.is_primary, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + tmp.handle, tmp.is_primary, leAudioDevice->address_); if (tmp.is_primary) csis_primary_handles.push_back(tmp.handle); } else if (tmp.uuid == bluetooth::le_audio::uuid::kCapServiceUuid) { log::info("Found CAP service, handle: 0x{:04x}, device: {}", tmp.handle, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); /* Try to find context for CSIS instances */ for (auto& included_srvc : tmp.included_services) { @@ -2728,7 +2707,7 @@ class LeAudioClientImpl : public LeAudioClient { log::info( "Found Telephony and Media Audio service, handle: 0x{:04x}, " "device: {}", - tmp.handle, ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + tmp.handle, leAudioDevice->address_); tmas_svc = &tmp; } } @@ -2783,8 +2762,7 @@ class LeAudioClientImpl : public LeAudioClient { log::info( "Found Sink PAC characteristic, handle: 0x{:04x}, ccc handle: " "0x{:04x}, addr: {}", - charac.value_handle, hdl_pair.ccc_hdl, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + charac.value_handle, hdl_pair.ccc_hdl, leAudioDevice->address_); } else if (charac.uuid == bluetooth::le_audio::uuid:: kSourcePublishedAudioCapabilityCharacteristicUuid) { @@ -2816,8 +2794,7 @@ class LeAudioClientImpl : public LeAudioClient { log::info( "Found Source PAC characteristic, handle: 0x{:04x}, ccc handle: " "0x{:04x}, addr: {}", - charac.value_handle, hdl_pair.ccc_hdl, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + charac.value_handle, hdl_pair.ccc_hdl, leAudioDevice->address_); } else if (charac.uuid == bluetooth::le_audio::uuid:: kSinkAudioLocationCharacteristicUuid) { leAudioDevice->snk_audio_locations_hdls_.val_hdl = charac.value_handle; @@ -2848,7 +2825,7 @@ class LeAudioClientImpl : public LeAudioClient { "handle: 0x{:04x}, addr: {}", charac.value_handle, leAudioDevice->snk_audio_locations_hdls_.ccc_hdl, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); } else if (charac.uuid == bluetooth::le_audio::uuid:: kSourceAudioLocationCharacteristicUuid) { leAudioDevice->src_audio_locations_hdls_.val_hdl = charac.value_handle; @@ -2879,7 +2856,7 @@ class LeAudioClientImpl : public LeAudioClient { "ccc handle: 0x{:04x}, addr: {}", charac.value_handle, leAudioDevice->src_audio_locations_hdls_.ccc_hdl, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); } else if (charac.uuid == bluetooth::le_audio::uuid:: kAudioContextAvailabilityCharacteristicUuid) { @@ -2910,7 +2887,7 @@ class LeAudioClientImpl : public LeAudioClient { "Found Audio Availability Context characteristic, handle: " "0x{:04x}, ccc handle: 0x{:04x}, addr: {}", charac.value_handle, leAudioDevice->audio_avail_hdls_.ccc_hdl, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); } else if (charac.uuid == bluetooth::le_audio::uuid:: kAudioSupportedContextCharacteristicUuid) { leAudioDevice->audio_supp_cont_hdls_.val_hdl = charac.value_handle; @@ -2939,7 +2916,7 @@ class LeAudioClientImpl : public LeAudioClient { "Found Audio Supported Context characteristic, handle: 0x{:04x}, " "ccc handle: 0x{:04x}, addr: {}", charac.value_handle, leAudioDevice->audio_supp_cont_hdls_.ccc_hdl, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); } } @@ -2981,7 +2958,7 @@ class LeAudioClientImpl : public LeAudioClient { "Found ASE characteristic, handle: 0x{:04x}, ccc handle: 0x{:04x}, " "direction: {}, addr: {}", charac.value_handle, ccc_handle, direction, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); } else if (charac.uuid == bluetooth::le_audio::uuid:: kAudioStreamEndpointControlPointCharacteristicUuid) { @@ -3006,7 +2983,7 @@ class LeAudioClientImpl : public LeAudioClient { "Found ASE Control Point characteristic, handle: 0x{:04x}, ccc " "handle: 0x{:04x}, addr: {}", charac.value_handle, leAudioDevice->ctp_hdls_.ccc_hdl, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); } } @@ -3025,8 +3002,7 @@ class LeAudioClientImpl : public LeAudioClient { log::info( "Found Telephony and Media Profile characteristic, handle: " "0x{:04x}, device: {}", - leAudioDevice->tmap_role_hdl_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->tmap_role_hdl_, leAudioDevice->address_); } } } @@ -3058,13 +3034,13 @@ class LeAudioClientImpl : public LeAudioClient { /* CSIS will trigger adding to group */ if (leAudioDevice->csis_member_) { log::info("{}, waiting for CSIS to create group for device", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); scheduleGuardForCsisAdd(leAudioDevice->address_); return; } log::info("{} Not a CSIS member. Create group by our own", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); /* If there is no Csis just add device by our own */ DeviceGroups::Get()->AddDevice(leAudioDevice->address_, @@ -3083,14 +3059,14 @@ class LeAudioClientImpl : public LeAudioClient { if (status == GATT_DATABASE_OUT_OF_SYNC) { log::info("Database out of sync for {}, conn_id: 0x{:04x}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), conn_id); + leAudioDevice->address_, conn_id); ClearDeviceInformationAndStartSearch(leAudioDevice); return; } if (status == GATT_SUCCESS) { log::info("Successfully registered on ccc: 0x{:04x}, device: {}", hdl, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); if (leAudioDevice->ctp_hdls_.ccc_hdl == hdl && leAudioDevice->known_service_handles_ && @@ -3106,7 +3082,7 @@ class LeAudioClientImpl : public LeAudioClient { log::error( "Failed to register for indications: 0x{:04x}, device: {}, status: " "0x{:02x}", - hdl, ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), status); + hdl, leAudioDevice->address_, status); ase_it = std::find_if(leAudioDevice->ases_.begin(), leAudioDevice->ases_.end(), @@ -3116,7 +3092,7 @@ class LeAudioClientImpl : public LeAudioClient { if (ase_it == leAudioDevice->ases_.end()) { log::error("Unknown ccc handle: 0x{:04x}, device: {}", hdl, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return; } @@ -3138,7 +3114,7 @@ class LeAudioClientImpl : public LeAudioClient { auto device_available_contexts = leAudioDevice->GetAvailableContexts(); if (!group_metadata_contexts.test_any(device_available_contexts)) { log::info("{} does is not have required context type", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return; } @@ -3204,8 +3180,7 @@ class LeAudioClientImpl : public LeAudioClient { if (!groupStateMachine_->AttachToStream(group, leAudioDevice, std::move(ccids))) { log::warn("Could not add device {} to the group {} streaming.", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), - group->group_id_); + leAudioDevice->address_, group->group_id_); scheduleAttachDeviceToTheStream(leAudioDevice->address_); } else { stream_setup_start_timestamp_ = @@ -3217,15 +3192,14 @@ class LeAudioClientImpl : public LeAudioClient { LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(addr); if (leAudioDevice == nullptr || leAudioDevice->conn_id_ == GATT_INVALID_CONN_ID) { - log::info("Device {} not available anymore", - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::info("Device {} not available anymore", addr); return; } AttachToStreamingGroupIfNeeded(leAudioDevice); } void scheduleAttachDeviceToTheStream(const RawAddress& addr) { - log::info("Device {} scheduler for stream", ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::info("Device {} scheduler for stream", addr); do_in_main_thread_delayed( FROM_HERE, base::BindOnce(&LeAudioClientImpl::restartAttachToTheStream, @@ -3268,7 +3242,7 @@ class LeAudioClientImpl : public LeAudioClient { void connectionReady(LeAudioDevice* leAudioDevice) { log::debug( - "{}, {}", ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), + "{}, {}", leAudioDevice->address_, bluetooth::common::ToString(leAudioDevice->GetConnectionState())); if (IS_FLAG_ENABLED(le_audio_fast_bond_params)) { @@ -5209,14 +5183,14 @@ class LeAudioClientImpl : public LeAudioClient { if (status == GATT_DATABASE_OUT_OF_SYNC) { log::info("Database out of sync for {}, re-discovering", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); instance->ClearDeviceInformationAndStartSearch(leAudioDevice); return; } if (status != GATT_SUCCESS || len != 2) { log::error("Could not read CCC for {}, disconnecting", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); instance->Disconnect(leAudioDevice->address_); return; } @@ -5224,7 +5198,7 @@ class LeAudioClientImpl : public LeAudioClient { uint16_t val = *(uint16_t*)value; if (val == 0) { log::info("{} forgot CCC values. Re-subscribing", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); instance->RegisterKnownNotifications(leAudioDevice, false, true); } else { instance->connectionReady(leAudioDevice); @@ -5270,8 +5244,7 @@ class LeAudioClientImpl : public LeAudioClient { void LeAudioHealthSendRecommendation(const RawAddress& address, int group_id, LeAudioHealthBasedAction action) { - log::debug("{}, {}, {}", ADDRESS_TO_LOGGABLE_CSTR(address), group_id, - ToString(action)); + log::debug("{}, {}, {}", address, group_id, ToString(action)); if (address != RawAddress::kEmpty && leAudioDevices_.FindByAddress(address)) { @@ -5449,7 +5422,7 @@ class LeAudioClientImpl : public LeAudioClient { if (device->closing_stream_for_disconnection_) { device->closing_stream_for_disconnection_ = false; log::info("Disconnecting group id: {}, address: {}", group->group_id_, - ADDRESS_TO_LOGGABLE_CSTR(device->address_)); + device->address_); bool force_acl_disconnect = device->autoconnect_flag_ && group->IsEnabled(); DisconnectDevice(device, force_acl_disconnect); @@ -5467,7 +5440,7 @@ class LeAudioClientImpl : public LeAudioClient { if (leAudioDevice->closing_stream_for_disconnection_) { leAudioDevice->closing_stream_for_disconnection_ = false; log::debug("Disconnecting group id: {}, address: {}", group->group_id_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); bool force_acl_disconnect = leAudioDevice->autoconnect_flag_ && group->IsEnabled(); DisconnectDevice(leAudioDevice, force_acl_disconnect); @@ -5963,16 +5936,16 @@ class LeAudioClientImpl : public LeAudioClient { tmpDevice = group->GetNextDevice(tmpDevice)) { log::info( "tmpDevice->acl_asymmetric_: {}, asymmetric: {}, address: {}, " - "acl_connected: {} ", + "acl_connected: {}", tmpDevice->acl_asymmetric_ == asymmetric, asymmetric, - ADDRESS_TO_LOGGABLE_CSTR(tmpDevice->address_), + tmpDevice->address_, BTM_IsAclConnectionUp(tmpDevice->address_, BT_TRANSPORT_LE)); if (tmpDevice->acl_asymmetric_ == asymmetric || !BTM_IsAclConnectionUp(tmpDevice->address_, BT_TRANSPORT_LE)) continue; log::info("SetAsymmetricBlePhy: {} for {}", asymmetric, - ADDRESS_TO_LOGGABLE_CSTR(tmpDevice->address_)); + tmpDevice->address_); BTM_BleSetPhy(tmpDevice->address_, PHY_LE_2M, asymmetric ? PHY_LE_1M : PHY_LE_2M, 0); tmpDevice->acl_asymmetric_ = asymmetric; diff --git a/system/bta/le_audio/codec_manager.cc b/system/bta/le_audio/codec_manager.cc index f1392a2863..0468dc5463 100644 --- a/system/bta/le_audio/codec_manager.cc +++ b/system/bta/le_audio/codec_manager.cc @@ -807,7 +807,7 @@ struct codec_manager_impl { log::debug("Print adsp_capabilities:"); for (auto& adsp : adsp_capabilities) { - log::debug("'{}':", adsp.name.c_str()); + log::debug("'{}':", adsp.name); for (auto direction : {le_audio::types::kLeAudioDirectionSink, le_audio::types::kLeAudioDirectionSource}) { log::debug( diff --git a/system/bta/le_audio/device_groups.cc b/system/bta/le_audio/device_groups.cc index 8d63971095..cfc9589b42 100644 --- a/system/bta/le_audio/device_groups.cc +++ b/system/bta/le_audio/device_groups.cc @@ -198,8 +198,7 @@ bool LeAudioDeviceGroup::Activate( bool activated = leAudioDevice.lock()->ActivateConfiguredAses( context_type, metadata_context_types, ccid_lists); - log::info("Device {} is {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice.lock().get()->address_), + log::info("Device {} is {}", leAudioDevice.lock().get()->address_, activated ? "activated" : " not activated"); if (activated) { if (!cig.AssignCisIds(leAudioDevice.lock().get())) { @@ -1045,12 +1044,12 @@ void LeAudioDeviceGroup::CigConfiguration::GenerateCisIds( bool LeAudioDeviceGroup::CigConfiguration::AssignCisIds( LeAudioDevice* leAudioDevice) { log::assert_that(leAudioDevice, "invalid device"); - log::info("device: {}", ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + log::info("device: {}", leAudioDevice->address_); struct ase* ase = leAudioDevice->GetFirstActiveAse(); if (!ase) { log::error("Device {} shouldn't be called without an active ASE", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return false; } @@ -1177,7 +1176,7 @@ void LeAudioDeviceGroup::AssignCisConnHandlesToAses( LeAudioDevice* leAudioDevice) { log::assert_that(leAudioDevice, "Invalid device"); log::info("group: {}, group_id: {}, device: {}", fmt::ptr(this), group_id_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); /* Assign all CIS connection handles to ases */ struct bluetooth::le_audio::types::ase* ase = @@ -1223,8 +1222,7 @@ void LeAudioDeviceGroup::CigConfiguration::UnassignCis( log::assert_that(leAudioDevice, "Invalid device"); log::info("Group {}, group_id {}, device: {}", fmt::ptr(group_), - group_->group_id_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + group_->group_id_, leAudioDevice->address_); for (struct bluetooth::le_audio::types::cis& cis_entry : cises) { if (cis_entry.addr == leAudioDevice->address_) { @@ -1492,8 +1490,7 @@ bool LeAudioDeviceGroup::ConfigureAses( * connected */ if (dev->GetConnectionState() != DeviceConnectState::CONNECTED) { - log::warn("Device {}, in the state {}", - ADDRESS_TO_LOGGABLE_CSTR(dev->address_), + log::warn("Device {}, in the state {}", dev->address_, bluetooth::common::ToString(dev->GetConnectionState())); return; } @@ -1741,8 +1738,7 @@ void LeAudioDeviceGroup::Disable(int gatt_if) { device_iter.lock()->autoconnect_flag_ = false; log::info("Group {} in state {}. Removing {} from background connect", - group_id_, bluetooth::common::ToString(GetState()), - ADDRESS_TO_LOGGABLE_CSTR(address)); + group_id_, bluetooth::common::ToString(GetState()), address); BTA_GATTC_CancelOpen(gatt_if, address, false); @@ -1767,8 +1763,7 @@ void LeAudioDeviceGroup::Enable(int gatt_if, device_iter.lock()->autoconnect_flag_ = true; log::info("Group {} in state {}. Adding {} from background connect", - group_id_, bluetooth::common::ToString(GetState()), - ADDRESS_TO_LOGGABLE_CSTR(address)); + group_id_, bluetooth::common::ToString(GetState()), address); if (connection_state == DeviceConnectState::DISCONNECTED) { BTA_GATTC_Open(gatt_if, address, reconnection_mode, false); @@ -1794,8 +1789,7 @@ void LeAudioDeviceGroup::AddToAllowListNotConnectedGroupMembers(int gatt_if) { auto address = device_iter.lock()->address_; log::info("Group {} in state {}. Adding {} to allow list", group_id_, - bluetooth::common::ToString(GetState()), - ADDRESS_TO_LOGGABLE_CSTR(address)); + bluetooth::common::ToString(GetState()), address); /* When adding set members to allow list, let use direct connect first. * When it fails (i.e. device is not advertising), it will go to background @@ -1818,7 +1812,7 @@ void LeAudioDeviceGroup::ApplyReconnectionMode( false); log::info("Group {} in state {}. Adding {} to default reconnection mode", group_id_, bluetooth::common::ToString(GetState()), - ADDRESS_TO_LOGGABLE_CSTR(device_iter.lock()->address_)); + device_iter.lock()->address_); device_iter.lock()->SetConnectionState( DeviceConnectState::CONNECTING_AUTOCONNECT); } diff --git a/system/bta/le_audio/devices.cc b/system/bta/le_audio/devices.cc index 2b09afef63..2c5f64fa16 100644 --- a/system/bta/le_audio/devices.cc +++ b/system/bta/le_audio/devices.cc @@ -351,9 +351,8 @@ bool LeAudioDevice::ConfigureAses( log::debug( "device={}, activated ASE id={}, direction={}, max_sdu_size={}, " "cis_id={}, target_latency={}", - ADDRESS_TO_LOGGABLE_CSTR(address_), ase->id, - (direction == 1 ? "snk" : "src"), ase->qos_config.max_sdu_size, - ase->cis_id, ents[i].qos.target_latency); + address_, ase->id, (direction == 1 ? "snk" : "src"), + ase->qos_config.max_sdu_size, ase->cis_id, ents[i].qos.target_latency); /* Try to use the already active ASE */ ase = GetNextActiveAseWithSameDirection(ase); @@ -369,7 +368,7 @@ bool LeAudioDevice::ConfigureAses( /* LeAudioDevice Class methods implementation */ void LeAudioDevice::SetConnectionState(DeviceConnectState state) { - log::debug("{}, {} --> {}", ADDRESS_TO_LOGGABLE_CSTR(address_), + log::debug("{}, {} --> {}", address_, bluetooth::common::ToString(connection_state_), bluetooth::common::ToString(state)); LeAudioLogHistory::Get()->AddLogHistory( @@ -709,7 +708,7 @@ bool LeAudioDevice::IsReadyToSuspendStream(void) { bool LeAudioDevice::HaveAllActiveAsesCisEst(void) const { if (ases_.empty()) { - log::warn("No ases for device {}", ADDRESS_TO_LOGGABLE_CSTR(address_)); + log::warn("No ases for device {}", address_); /* If there is no ASEs at all, it means we are good here - meaning, it is * not waiting for any CIS to be established. */ @@ -992,13 +991,13 @@ bool LeAudioDevice::ActivateConfiguredAses( const BidirectionalPair<AudioContexts>& metadata_context_types, BidirectionalPair<std::vector<uint8_t>> ccid_lists) { if (conn_id_ == GATT_INVALID_CONN_ID) { - log::warn("Device {} is not connected", ADDRESS_TO_LOGGABLE_CSTR(address_)); + log::warn("Device {} is not connected", address_); return false; } bool ret = false; - log::info("Configuring device {}", ADDRESS_TO_LOGGABLE_CSTR(address_)); + log::info("Configuring device {}", address_); for (auto& ase : ases_) { if (ase.state == AseState::BTA_LE_AUDIO_ASE_STATE_CODEC_CONFIGURED && ase.configured_for_context_type == context_type) { @@ -1024,8 +1023,8 @@ void LeAudioDevice::DeactivateAllAses(void) { log::warn( "{}, ase_id: {}, ase.cis_id: {}, cis_handle: 0x{:02x}, " "ase.cis_state={}, ase.data_path_state={}", - ADDRESS_TO_LOGGABLE_CSTR(address_), ase.id, ase.cis_id, - ase.cis_conn_hdl, bluetooth::common::ToString(ase.cis_state), + address_, ase.id, ase.cis_id, ase.cis_conn_hdl, + bluetooth::common::ToString(ase.cis_state), bluetooth::common::ToString(ase.data_path_state)); } if (alarm_is_scheduled(ase.autonomous_operation_timer_)) { @@ -1119,8 +1118,8 @@ void LeAudioDevices::Add(const RawAddress& address, DeviceConnectState state, int group_id) { auto device = FindByAddress(address); if (device != nullptr) { - log::error("address: {} is already assigned to group: {}", - ADDRESS_TO_LOGGABLE_STR(address), device->group_id_); + log::error("address: {} is already assigned to group: {}", address, + device->group_id_); return; } @@ -1135,7 +1134,7 @@ void LeAudioDevices::Remove(const RawAddress& address) { }); if (iter == leAudioDevices_.end()) { - log::error("no such address: {}", ADDRESS_TO_LOGGABLE_STR(address)); + log::error("no such address: {}", address); return; } diff --git a/system/bta/le_audio/le_audio_health_status.cc b/system/bta/le_audio/le_audio_health_status.cc index c53b28aacd..027254b22c 100644 --- a/system/bta/le_audio/le_audio_health_status.cc +++ b/system/bta/le_audio/le_audio_health_status.cc @@ -47,7 +47,7 @@ class LeAudioHealthStatusImpl : public LeAudioHealthStatus { } void RemoveStatistics(const RawAddress& address, int group_id) override { - log::debug("{}, group_id: {}", ADDRESS_TO_LOGGABLE_CSTR(address), group_id); + log::debug("{}, group_id: {}", address, group_id); remove_device(address); remove_group(group_id); } @@ -60,15 +60,14 @@ class LeAudioHealthStatusImpl : public LeAudioHealthStatus { } const RawAddress& address = device->address_; - log::debug("{}, {}", ADDRESS_TO_LOGGABLE_CSTR(address), ToString(type)); + log::debug("{}, {}", address, ToString(type)); auto dev = find_device(address); if (dev == nullptr) { add_device(address); dev = find_device(address); if (dev == nullptr) { - log::error("Could not add device {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Could not add device {}", address); return; } } @@ -233,8 +232,7 @@ class LeAudioHealthStatusImpl : public LeAudioHealthStatus { void send_recommendation_for_device(const RawAddress& address, LeAudioHealthBasedAction recommendation) { - log::debug("{}, {}", ADDRESS_TO_LOGGABLE_CSTR(address), - ToString(recommendation)); + log::debug("{}, {}", address, ToString(recommendation)); /* Notify new user about known groups */ for (auto& cb : callbacks_) { cb.Run(address, kGroupUnknown, recommendation); diff --git a/system/bta/le_audio/state_machine.cc b/system/bta/le_audio/state_machine.cc index d3d94c4739..02ac297e5e 100644 --- a/system/bta/le_audio/state_machine.cc +++ b/system/bta/le_audio/state_machine.cc @@ -150,7 +150,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { bool AttachToStream(LeAudioDeviceGroup* group, LeAudioDevice* leAudioDevice, BidirectionalPair<std::vector<uint8_t>> ccids) override { log::info("group id: {} device: {}", group->group_id_, - ADDRESS_TO_LOGGABLE_STR(leAudioDevice->address_)); + leAudioDevice->address_); /* This function is used to attach the device to the stream. * Limitation here is that device should be previously in the streaming @@ -171,7 +171,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { auto device_available_contexts = leAudioDevice->GetAvailableContexts(); if (!group_metadata_contexts.test_any(device_available_contexts)) { log::info("{} does is not have required context type", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return false; } @@ -416,8 +416,8 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { auto state = static_cast<AseState>(arh.state); log::info("{} , ASE id: {}, state changed {} -> {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id, - ToString(ase->state), ToString(state)); + leAudioDevice->address_, ase->id, ToString(ase->state), + ToString(state)); log_history_->AddLogHistory( kLogAseStateNotif, leAudioDevice->group_id_, leAudioDevice->address_, @@ -779,8 +779,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { FreeLinkQualityReports(leAudioDevice); if (!group) { log::error("group is null for device: {} group_id: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), - leAudioDevice->group_id_); + leAudioDevice->address_, leAudioDevice->group_id_); /* mark ASEs as not used. */ leAudioDevice->DeactivateAllAses(); return; @@ -826,8 +825,8 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { log::debug( "device: {}, group connected: {}, all active ase disconnected:: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), - group->IsAnyDeviceConnected(), group->HaveAllCisesDisconnected()); + leAudioDevice->address_, group->IsAnyDeviceConnected(), + group->HaveAllCisesDisconnected()); if (group->IsAnyDeviceConnected()) { /* @@ -884,7 +883,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { DsaModes dsa_modes = leAudioDevice->GetDsaModes(); if (dsa_modes.empty()) { log::warn("DSA mode not supported by this LE Audio device: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); group->dsa_.active = false; return; } @@ -894,7 +893,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { std::find(dsa_modes.begin(), dsa_modes.end(), DsaMode::ISO_HW) == dsa_modes.end()) { log::warn("DSA mode not supported by this LE Audio device: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); group->dsa_.active = false; return; } @@ -919,7 +918,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { log::verbose( "DSA mode supported on this LE Audio device: {}, apply data path: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), data_path_id); + leAudioDevice->address_, data_path_id); LeAudioLogHistory::Get()->AddLogHistory( kLogStateMachineTag, group->group_id_, RawAddress::kEmpty, @@ -959,9 +958,8 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { if (ases_pair.source) ases_pair.source->cis_state = CisState::ASSIGNED; log::warn("{}: failed to create CIS 0x{:04x}, status: {} (0x{:02x})", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), - event->cis_conn_hdl, ErrorCodeText((ErrorCode)event->status), - event->status); + leAudioDevice->address_, event->cis_conn_hdl, + ErrorCodeText((ErrorCode)event->status), event->status); if (event->status == HCI_ERR_CONN_FAILED_ESTABLISHMENT && ((leAudioDevice->cis_failed_to_be_established_retry_cnt_++) < @@ -969,7 +967,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { (CisCreateForDevice(group, leAudioDevice))) { log::info("Retrying ({}) to create CIS for {}", leAudioDevice->cis_failed_to_be_established_retry_cnt_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return; } @@ -1068,8 +1066,8 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { if (value.size() > (leAudioDevice->mtu_ - 3)) { log::warn("{}, using long write procedure ({} > {})", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), - static_cast<int>(value.size()), (leAudioDevice->mtu_ - 3)); + leAudioDevice->address_, static_cast<int>(value.size()), + (leAudioDevice->mtu_ - 3)); /* Note, that this type is actually LONG WRITE. * Meaning all the Prepare Writes plus Execute is handled in the stack @@ -1753,8 +1751,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { void SetAseState(LeAudioDevice* leAudioDevice, struct ase* ase, AseState state) { - log::info("{}, ase_id: {}, {} -> {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id, + log::info("{}, ase_id: {}, {} -> {}", leAudioDevice->address_, ase->id, ToString(ase->state), ToString(state)); log_history_->AddLogHistory( @@ -1784,7 +1781,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { /* More ASEs notification from this device has to come for this group */ log::debug("Wait for more ASE to configure for device {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return; } @@ -1793,8 +1790,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { */ if (group->GetTargetState() != AseState::BTA_LE_AUDIO_ASE_STATE_IDLE) { log::debug("Autonomus change of stated for device {}, ase id: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), - ase->id); + leAudioDevice->address_, ase->id); return; } @@ -1833,7 +1829,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { "ase_id: {}", ToString(ase->state), ToString(AseState::BTA_LE_AUDIO_ASE_STATE_IDLE), - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id); + leAudioDevice->address_, ase->id); group->PrintDebugState(); break; case AseState::BTA_LE_AUDIO_ASE_STATE_ENABLING: @@ -1843,7 +1839,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { "the stream.", ToString(ase->state), ToString(AseState::BTA_LE_AUDIO_ASE_STATE_IDLE), - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id); + leAudioDevice->address_, ase->id); group->PrintDebugState(); StopStream(group); break; @@ -1904,8 +1900,8 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { log::assert_that(ase, "shouldn't be called without an active ASE"); for (; ase != nullptr; ase = leAudioDevice->GetNextActiveAse(ase)) { log::debug("device: {}, ase_id: {}, cis_id: {}, ase state: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id, - ase->cis_id, ToString(ase->state)); + leAudioDevice->address_, ase->id, ase->cis_id, + ToString(ase->state)); conf.ase_id = ase->id; conf.target_latency = ase->target_latency; conf.target_phy = group->GetTargetPhy(ase->direction); @@ -2025,7 +2021,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { /* This is autonomus change of the remote device */ log::debug( "Autonomus change for device {}, ase id {}. Just store it.", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id); + leAudioDevice->address_, ase->id); /* Since at least one ASE is in configured state, we should admit * group is configured state */ @@ -2037,7 +2033,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { /* More ASEs notification from this device has to come for this group */ log::debug("More Ases to be configured for the device {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return; } @@ -2054,7 +2050,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { log::debug( "Device {} initiated configured state but it is not yet ready " "to be configured", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); } return; } @@ -2148,7 +2144,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { log::debug( "Device {} initiated configured state but it is not yet ready " "to be configured", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); } return; } @@ -2203,7 +2199,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { "ase_id: {}", ToString(ase->state), ToString(AseState::BTA_LE_AUDIO_ASE_STATE_CODEC_CONFIGURED), - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id); + leAudioDevice->address_, ase->id); group->PrintDebugState(); break; case AseState::BTA_LE_AUDIO_ASE_STATE_RELEASING: @@ -2216,7 +2212,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { /* More ASEs notification from this device has to come for this group */ log::debug("Wait for more ASE to configure for device {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return; } @@ -2225,8 +2221,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { */ if (group->GetTargetState() != AseState::BTA_LE_AUDIO_ASE_STATE_IDLE) { log::debug("Autonomus change of stated for device {}, ase id: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), - ase->id); + leAudioDevice->address_, ase->id); return; } @@ -2236,7 +2231,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { log::debug( "There is at least one active device {}, wait to become " "inactive", - ADDRESS_TO_LOGGABLE_CSTR(activeDevice->address_)); + activeDevice->address_); return; } } @@ -2270,7 +2265,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { "the stream", ToString(ase->state), ToString(AseState::BTA_LE_AUDIO_ASE_STATE_CODEC_CONFIGURED), - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id); + leAudioDevice->address_, ase->id); group->PrintDebugState(); StopStream(group); break; @@ -2376,7 +2371,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { log::info("Unexpected state transition from {} to {}, {}, ase_id: {}", ToString(ase->state), ToString(AseState::BTA_LE_AUDIO_ASE_STATE_QOS_CONFIGURED), - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id); + leAudioDevice->address_, ase->id); group->PrintDebugState(); break; case AseState::BTA_LE_AUDIO_ASE_STATE_IDLE: @@ -2387,7 +2382,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { "ase_id: {}", ToString(ase->state), ToString(AseState::BTA_LE_AUDIO_ASE_STATE_QOS_CONFIGURED), - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id); + leAudioDevice->address_, ase->id); group->PrintDebugState(); break; case AseState::BTA_LE_AUDIO_ASE_STATE_ENABLING: @@ -2396,7 +2391,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { "the stream.", ToString(ase->state), ToString(AseState::BTA_LE_AUDIO_ASE_STATE_QOS_CONFIGURED), - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id); + leAudioDevice->address_, ase->id); StopStream(group); break; } @@ -2453,8 +2448,8 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { log::assert_that(ase, "shouldn't be called without an active ASE"); do { log::debug("device: {}, ase_id: {}, cis_id: {}, ase state: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id, - ase->cis_id, ToString(ase->state)); + leAudioDevice->address_, ase->id, ase->cis_id, + ToString(ase->state)); conf.ase_id = ase->id; conf.metadata = ase->metadata; confs.push_back(conf); @@ -2472,7 +2467,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { WriteToControlPoint(leAudioDevice, value); log::info("group_id: {}, {}", leAudioDevice->group_id_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); log_history_->AddLogHistory(kLogControlPointCmd, leAudioDevice->group_id_, leAudioDevice->address_, msg_stream.str(), extra_stream.str()); @@ -2506,15 +2501,15 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { std::vector<uint8_t> ids; do { log::debug("device: {}, ase_id: {}, cis_id: {}, ase state: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id, - ase->cis_id, ToString(ase->state)); + leAudioDevice->address_, ase->id, ase->cis_id, + ToString(ase->state)); ids.push_back(ase->id); msg_stream << "ASE_ID " << +ase->id << ", "; } while ((ase = leAudioDevice->GetNextActiveAse(ase))); log::info("group_id: {}, {}", leAudioDevice->group_id_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); std::vector<uint8_t> value; bluetooth::le_audio::client_parser::ascs::PrepareAseCtpDisable(ids, value); @@ -2552,8 +2547,8 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { do { log::debug("device: {}, ase_id: {}, cis_id: {}, ase state: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id, - ase->cis_id, ToString(ase->state)); + leAudioDevice->address_, ase->id, ase->cis_id, + ToString(ase->state)); ids.push_back(ase->id); stream << "ASE_ID " << +ase->id << ","; } while ((ase = leAudioDevice->GetNextActiveAse(ase))); @@ -2563,7 +2558,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { WriteToControlPoint(leAudioDevice, value); log::info("group_id: {}, {}", leAudioDevice->group_id_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); log_history_->AddLogHistory(kLogControlPointCmd, leAudioDevice->group_id_, leAudioDevice->address_, stream.str()); } @@ -2584,8 +2579,8 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { for (struct ase* ase = leAudioDevice->GetFirstActiveAse(); ase != nullptr; ase = leAudioDevice->GetNextActiveAse(ase)) { log::debug("device: {}, ase_id: {}, cis_id: {}, ase state: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id, - ase->cis_id, ToString(ase->state)); + leAudioDevice->address_, ase->id, ase->cis_id, + ToString(ase->state)); /* Fill in the whole group dependent ASE parameters */ if (!group->GetPresentationDelay(&ase->qos_config.presentation_delay, @@ -2654,7 +2649,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { WriteToControlPoint(leAudioDevice, value); log::info("group_id: {}, {}", leAudioDevice->group_id_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); log_history_->AddLogHistory(kLogControlPointCmd, group->group_id_, leAudioDevice->address_, msg_stream.str(), extra_stream.str()); @@ -2679,8 +2674,8 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { for (struct ase* ase = leAudioDevice->GetFirstActiveAse(); ase != nullptr; ase = leAudioDevice->GetNextActiveAse(ase)) { log::debug("device: {}, ase_id: {}, cis_id: {}, ase state: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id, - ase->cis_id, ToString(ase->state)); + leAudioDevice->address_, ase->id, ase->cis_id, + ToString(ase->state)); if (ase->state != AseState::BTA_LE_AUDIO_ASE_STATE_ENABLING && ase->state != AseState::BTA_LE_AUDIO_ASE_STATE_STREAMING) { @@ -2740,7 +2735,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { WriteToControlPoint(leAudioDevice, value); log::info("group_id: {}, {}", leAudioDevice->group_id_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); log_history_->AddLogHistory(kLogControlPointCmd, leAudioDevice->group_id_, leAudioDevice->address_, msg_stream.str(), @@ -2770,7 +2765,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { WriteToControlPoint(leAudioDevice, value); log::info("group_id: {}, {}", leAudioDevice->group_id_, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); log_history_->AddLogHistory(kLogControlPointCmd, leAudioDevice->group_id_, leAudioDevice->address_, stream.str()); } @@ -2856,7 +2851,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { log::error( "{}, ase_id: {}, moving from QoS Configured to Streaming is " "impossible.", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id); + leAudioDevice->address_, ase->id); group->PrintDebugState(); StopStream(group); break; @@ -2876,9 +2871,8 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { if (group->GetState() == AseState::BTA_LE_AUDIO_ASE_STATE_STREAMING) { /* We are here because of the reconnection of the single device */ - log::info("{}, Ase id: {}, ase state: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), ase->id, - bluetooth::common::ToString(ase->state)); + log::info("{}, Ase id: {}, ase state: {}", leAudioDevice->address_, + ase->id, bluetooth::common::ToString(ase->state)); cancel_watchdog_if_needed(group->group_id_); state_machine_callbacks_->StatusReportCb( group->group_id_, GroupStreamStatus::STREAMING); @@ -3010,8 +3004,7 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { log::debug( "Group id: {}, {}, ase id: {}, cis_handle: 0x{:04x}, direction: {}, " "data_path_state: {}, cis_state: {}", - group->group_id_, ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), - ase->id, ase->cis_conn_hdl, + group->group_id_, leAudioDevice->address_, ase->id, ase->cis_conn_hdl, ase->direction == bluetooth::le_audio::types::kLeAudioDirectionSink ? "sink" : "source", diff --git a/system/bta/le_audio/state_machine_test.cc b/system/bta/le_audio/state_machine_test.cc index 774cd01742..ff428f8403 100644 --- a/system/bta/le_audio/state_machine_test.cc +++ b/system/bta/le_audio/state_machine_test.cc @@ -1205,8 +1205,7 @@ class StateMachineTestBase : public Test { ase_p += 3; if (caching) { - log::info("Device: {}", - ADDRESS_TO_LOGGABLE_STR(device->address_)); + log::info("Device: {}", device->address_); if (cached_ase_to_cis_id_map_.count(device->address_) > 0) { auto ase_list = cached_ase_to_cis_id_map_.at(device->address_); if (ase_list.count(ase_id) > 0) { @@ -1494,8 +1493,7 @@ class StateMachineTestBase : public Test { this](LeAudioDevice* device, std::vector<uint8_t> value, GATT_WRITE_OP_CB cb, void* cb_data) { if (dev != nullptr && device != dev) { - log::info("Do nothing for {}", - ADDRESS_TO_LOGGABLE_CSTR(dev->address_)); + log::info("Do nothing for {}", dev->address_); return; } @@ -4292,8 +4290,8 @@ TEST_F(StateMachineTest, testHandlingCachedCodecConfig2Devices) { LeAudioGroupStateMachine::Get()->StopStream(group); for (auto& ase : firstDevice->ases_) { - log::debug("{} , {}, {}", ADDRESS_TO_LOGGABLE_CSTR(firstDevice->address_), - ase.id, bluetooth::common::ToString(ase.state)); + log::debug("{} , {}, {}", firstDevice->address_, ase.id, + bluetooth::common::ToString(ase.state)); ASSERT_EQ(ase.state, types::AseState::BTA_LE_AUDIO_ASE_STATE_RELEASING); // Simulate autonomus configured state. InjectAseStateNotification(&ase, firstDevice, group, @@ -4311,8 +4309,8 @@ TEST_F(StateMachineTest, testHandlingCachedCodecConfig2Devices) { bluetooth::le_audio::GroupStreamStatus::CONFIGURED_AUTONOMOUS)) .Times(1); for (auto& ase : secondDevice->ases_) { - log::debug("{} , {}, {}", ADDRESS_TO_LOGGABLE_CSTR(firstDevice->address_), - ase.id, bluetooth::common::ToString(ase.state)); + log::debug("{} , {}, {}", firstDevice->address_, ase.id, + bluetooth::common::ToString(ase.state)); ASSERT_EQ(ase.state, types::AseState::BTA_LE_AUDIO_ASE_STATE_RELEASING); // Simulate autonomus configured state. InjectAseStateNotification(&ase, secondDevice, group, diff --git a/system/bta/le_audio/storage_helper.cc b/system/bta/le_audio/storage_helper.cc index 45483cec76..8ad74bf057 100644 --- a/system/bta/le_audio/storage_helper.cc +++ b/system/bta/le_audio/storage_helper.cc @@ -146,7 +146,7 @@ bool SerializeSinkPacs(const bluetooth::le_audio::LeAudioDevice* leAudioDevice, return false; } log::verbose("Device {}, num of PAC characteristics: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), + leAudioDevice->address_, static_cast<int>(leAudioDevice->snk_pacs_.size())); return serializePacs(leAudioDevice->snk_pacs_, out); } @@ -159,7 +159,7 @@ bool SerializeSourcePacs( return false; } log::verbose("Device {}, num of PAC characteristics: {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), + leAudioDevice->address_, static_cast<int>(leAudioDevice->src_pacs_.size())); return serializePacs(leAudioDevice->src_pacs_, out); } @@ -181,7 +181,7 @@ bool deserializePacs(LeAudioDevice* leAudioDevice, if (magic != LEAUDIO_PACS_STORAGE_CURRENT_LAYOUT_MAGIC) { log::error("Invalid magic ({}!={}) for device {}", magic, LEAUDIO_PACS_STORAGE_CURRENT_LAYOUT_MAGIC, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return false; } @@ -191,7 +191,7 @@ bool deserializePacs(LeAudioDevice* leAudioDevice, if (in.size() < LEAUDIO_STORAGE_HEADER_WITH_ENTRIES_SZ + (num_of_pacs_chars * LEAUDIO_PACS_ENTRY_SZ)) { log::error("Invalid persistent storage data for device {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return false; } @@ -262,13 +262,11 @@ bool SerializeAses(const bluetooth::le_audio::LeAudioDevice* leAudioDevice, } auto num_of_ases = leAudioDevice->ases_.size(); - log::debug("device: {}, number of ases {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_), + log::debug("device: {}, number of ases {}", leAudioDevice->address_, static_cast<int>(num_of_ases)); if (num_of_ases == 0 || (num_of_ases > std::numeric_limits<uint8_t>::max())) { - log::warn("No ases available for device {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + log::warn("No ases available for device {}", leAudioDevice->address_); return false; } @@ -312,7 +310,7 @@ bool DeserializeAses(bluetooth::le_audio::LeAudioDevice* leAudioDevice, if (in.size() < LEAUDIO_STORAGE_HEADER_WITH_ENTRIES_SZ + LEAUDIO_ASES_ENTRY_SZ) { log::warn("There is not single ASE stored for device {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return false; } @@ -333,12 +331,12 @@ bool DeserializeAses(bluetooth::le_audio::LeAudioDevice* leAudioDevice, if (in.size() < LEAUDIO_STORAGE_HEADER_WITH_ENTRIES_SZ + (num_of_ases * LEAUDIO_ASES_ENTRY_SZ)) { log::error("Invalid persistent storage data for device {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return false; } log::debug("Loading {} Ases for device {}", num_of_ases, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); /* sets entries */ while (num_of_ases--) { uint16_t handle; @@ -382,7 +380,7 @@ bool SerializeHandles(const LeAudioDevice* leAudioDevice, if (leAudioDevice->ctp_hdls_.val_hdl == 0 || leAudioDevice->ctp_hdls_.ccc_hdl == 0) { log::warn("Invalid control point handles for device {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return false; } @@ -415,7 +413,7 @@ bool DeserializeHandles(LeAudioDevice* leAudioDevice, if (in.size() != LEAUDIO_STORAGE_HANDLES_ENTRIES_SZ) { log::warn("There is not single ASE stored for device {}", - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return false; } @@ -427,7 +425,7 @@ bool DeserializeHandles(LeAudioDevice* leAudioDevice, if (magic != LEAUDIO_HANDLES_STORAGE_CURRENT_LAYOUT_MAGIC) { log::error("Invalid magic ({}!={}) for device {}", magic, LEAUDIO_PACS_STORAGE_CURRENT_LAYOUT_MAGIC, - ADDRESS_TO_LOGGABLE_CSTR(leAudioDevice->address_)); + leAudioDevice->address_); return false; } diff --git a/system/bta/ras/ras_client.cc b/system/bta/ras/ras_client.cc index b479932b0d..8187d240d4 100644 --- a/system/bta/ras/ras_client.cc +++ b/system/bta/ras/ras_client.cc @@ -85,10 +85,10 @@ class RasClientImpl : public bluetooth::ras::RasClient { } void Connect(const RawAddress& address) override { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); tBLE_BD_ADDR ble_bd_addr; ResolveAddress(ble_bd_addr, address); - log::info("resolve {}", ADDRESS_TO_LOGGABLE_CSTR(ble_bd_addr.bda)); + log::info("resolve {}", ble_bd_addr.bda); auto tracker = FindTrackerByAddress(ble_bd_addr.bda); if (tracker == nullptr) { @@ -111,34 +111,31 @@ class RasClientImpl : public bluetooth::ras::RasClient { OnGattNotification(p_data->notify); } break; default: - log::warn("Unhandled event: {}", gatt_client_event_text(event).c_str()); + log::warn("Unhandled event: {}", gatt_client_event_text(event)); } } void OnGattConnected(const tBTA_GATTC_OPEN& evt) { - log::info("{}, conn_id=0x{:04x}, transport:{}, status:{}", - ADDRESS_TO_LOGGABLE_CSTR(evt.remote_bda), evt.conn_id, - bt_transport_text(evt.transport).c_str(), - gatt_status_text(evt.status).c_str()); + log::info("{}, conn_id=0x{:04x}, transport:{}, status:{}", evt.remote_bda, + evt.conn_id, bt_transport_text(evt.transport), + gatt_status_text(evt.status)); if (evt.transport != BT_TRANSPORT_LE) { log::warn("Only LE connection is allowed (transport {})", - bt_transport_text(evt.transport).c_str()); + bt_transport_text(evt.transport)); BTA_GATTC_Close(evt.conn_id); return; } auto tracker = FindTrackerByAddress(evt.remote_bda); if (tracker == nullptr) { - log::warn("Skipping unknown device, address: {}", - ADDRESS_TO_LOGGABLE_CSTR(evt.remote_bda)); + log::warn("Skipping unknown device, address: {}", evt.remote_bda); BTA_GATTC_Close(evt.conn_id); return; } if (evt.status != GATT_SUCCESS) { - log::error("Failed to connect to server device {}", - ADDRESS_TO_LOGGABLE_CSTR(evt.remote_bda)); + log::error("Failed to connect to server device {}", evt.remote_bda); return; } tracker->conn_id_ = evt.conn_id; @@ -211,7 +208,7 @@ class RasClientImpl : public bluetooth::ras::RasClient { uint16_t uuid_16bit = characteristic->uuid.As16Bit(); log::debug("Handle uuid 0x{:04x}, {}, size {}", uuid_16bit, - getUuidName(characteristic->uuid).c_str(), evt.len); + getUuidName(characteristic->uuid), evt.len); switch (uuid_16bit) { case kRasOnDemandDataCharacteristic16bit: { @@ -323,7 +320,7 @@ class RasClientImpl : public bluetooth::ras::RasClient { const uint8_t* value) { if (status != GATT_SUCCESS) { log::error("Fail to write conn_id {}, status {}, handle {}", conn_id, - gatt_status_text(status).c_str(), handle); + gatt_status_text(status), handle); auto tracker = FindTrackerByHandle(conn_id); if (tracker == nullptr) { log::warn("Can't find tracker for conn_id:{}", conn_id); @@ -367,8 +364,7 @@ class RasClientImpl : public bluetooth::ras::RasClient { tGATT_STATUS register_status = BTA_GATTC_RegisterForNotifications( gatt_if_, tracker->address_, characteristic->value_handle); if (register_status != GATT_SUCCESS) { - log::error("Fail to register, {}", - gatt_status_text(register_status).c_str()); + log::error("Fail to register, {}", gatt_status_text(register_status)); return; } @@ -394,7 +390,7 @@ class RasClientImpl : public bluetooth::ras::RasClient { void OnDescriptorWrite(uint16_t conn_id, tGATT_STATUS status, uint16_t handle, uint16_t len, const uint8_t* value, void* data) { log::info("conn_id:{}, handle:{}, status:{}", conn_id, handle, - gatt_status_text(status).c_str()); + gatt_status_text(status)); } void ListCharacteristic(const gatt::Service* service) { @@ -403,11 +399,11 @@ class RasClientImpl : public bluetooth::ras::RasClient { "Characteristic uuid:0x{:04x}, handle:0x{:04x}, properties:0x{:02x}, " "{}", characteristic.uuid.As16Bit(), characteristic.value_handle, - characteristic.properties, getUuidName(characteristic.uuid).c_str()); + characteristic.properties, getUuidName(characteristic.uuid)); for (auto& descriptor : characteristic.descriptors) { log::info("\tDescriptor uuid: 0x{:04x}, handle:{}, {}", descriptor.uuid.As16Bit(), descriptor.handle, - getUuidName(descriptor.uuid).c_str()); + getUuidName(descriptor.uuid)); } } } @@ -423,7 +419,7 @@ class RasClientImpl : public bluetooth::ras::RasClient { uint8_t* value, void* data) { log::info("conn_id: {}, handle: {}, len: {}", conn_id, handle, len); if (status != GATT_SUCCESS) { - log::error("Fail with status {}", gatt_status_text(status).c_str()); + log::error("Fail with status {}", gatt_status_text(status)); return; } auto tracker = FindTrackerByHandle(conn_id); @@ -439,7 +435,7 @@ class RasClientImpl : public bluetooth::ras::RasClient { uint16_t uuid_16bit = characteristic->uuid.As16Bit(); log::info("Handle uuid 0x{:04x}, {}", uuid_16bit, - getUuidName(characteristic->uuid).c_str()); + getUuidName(characteristic->uuid)); switch (uuid_16bit) { case kRasFeaturesCharacteristic16bit: { @@ -448,9 +444,8 @@ class RasClientImpl : public bluetooth::ras::RasClient { return; } STREAM_TO_UINT32(tracker->remote_supported_features_, value); - log::info( - "Remote supported features : {}", - getFeaturesString(tracker->remote_supported_features_).c_str()); + log::info("Remote supported features : {}", + getFeaturesString(tracker->remote_supported_features_)); } break; default: log::warn("Unexpected UUID"); diff --git a/system/bta/ras/ras_server.cc b/system/bta/ras/ras_server.cc index 151df2c5a3..364801c61b 100644 --- a/system/bta/ras/ras_server.cc +++ b/system/bta/ras/ras_server.cc @@ -75,15 +75,13 @@ class RasServerImpl : public bluetooth::ras::RasServer { void PushProcedureData(RawAddress address, uint16_t procedure_counter, bool is_last, std::vector<uint8_t> data) { - log::info("{}, counter:{}, is_last:{}, with size {}", - ADDRESS_TO_LOGGABLE_STR(address), procedure_counter, is_last, - data.size()); + log::info("{}, counter:{}, is_last:{}, with size {}", address, + procedure_counter, is_last, data.size()); tBLE_BD_ADDR ble_bd_addr; ResolveAddress(ble_bd_addr, address); if (trackers_.find(ble_bd_addr.bda) == trackers_.end()) { - log::warn("Can't find tracker for {}", - ADDRESS_TO_LOGGABLE_STR(ble_bd_addr.bda)); + log::warn("Can't find tracker for {}", ble_bd_addr.bda); return; } std::lock_guard<std::mutex> lock(data_mutex_); @@ -164,8 +162,7 @@ class RasServerImpl : public bluetooth::ras::RasServer { void OnGattConnect(tBTA_GATTS* p_data) { auto address = p_data->conn.remote_bda; - log::info("Address: {}, conn_id:{}", ADDRESS_TO_LOGGABLE_STR(address), - p_data->conn.conn_id); + log::info("Address: {}, conn_id:{}", address, p_data->conn.conn_id); if (p_data->conn.transport == BT_TRANSPORT_BR_EDR) { log::warn("Skip BE/EDR connection"); return; @@ -273,7 +270,7 @@ class RasServerImpl : public bluetooth::ras::RasServer { void OnReadCharacteristic(tBTA_GATTS* p_data) { uint16_t read_req_handle = p_data->req_data.p_data->read_req.handle; - log::info("read_req_handle: 0x{:04x}, ", read_req_handle); + log::info("read_req_handle: 0x{:04x},", read_req_handle); tGATTS_RSP p_msg; p_msg.attr_value.handle = read_req_handle; @@ -358,8 +355,7 @@ class RasServerImpl : public bluetooth::ras::RasServer { switch (uuid.As16Bit()) { case kRasControlPointCharacteristic16bit: { if (trackers_.find(p_data->req_data.remote_bda) == trackers_.end()) { - log::warn("Can't find trackers for {}", - ADDRESS_TO_LOGGABLE_STR(p_data->req_data.remote_bda)); + log::warn("Can't find trackers for {}", p_data->req_data.remote_bda); BTA_GATTS_SendRsp(conn_id, p_data->req_data.trans_id, GATT_ILLEGAL_PARAMETER, &p_msg); return; diff --git a/system/bta/sys/bta_sys_conn.cc b/system/bta/sys/bta_sys_conn.cc index 2fa81b8dcd..bf3fb7f3bc 100644 --- a/system/bta/sys/bta_sys_conn.cc +++ b/system/bta/sys/bta_sys_conn.cc @@ -76,9 +76,8 @@ void bta_sys_role_chg_register(tBTA_SYS_ROLE_SWITCH_CBACK* p_cback) { ******************************************************************************/ void bta_sys_notify_role_chg(const RawAddress& peer_addr, tHCI_ROLE new_role, tHCI_STATUS hci_status) { - log::debug("Role changed peer:{} new_role:{} hci_status:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), RoleText(new_role), - hci_error_code_text(hci_status)); + log::debug("Role changed peer:{} new_role:{} hci_status:{}", peer_addr, + RoleText(new_role), hci_error_code_text(hci_status)); if (bta_sys_cb.p_role_cb) { bta_sys_cb.p_role_cb(BTA_SYS_ROLE_CHANGE, new_role, hci_status, peer_addr); } diff --git a/system/bta/vc/device.cc b/system/bta/vc/device.cc index c42a1ce8a8..d47eb5a91b 100644 --- a/system/bta/vc/device.cc +++ b/system/bta/vc/device.cc @@ -50,7 +50,7 @@ void VolumeControlDevice::DeregisterNotifications(tGATT_IF gatt_if) { } void VolumeControlDevice::Disconnect(tGATT_IF gatt_if) { - log::info("{}", ADDRESS_TO_LOGGABLE_STR(address)); + log::info("{}", address); if (IsConnected()) { DeregisterNotifications(gatt_if); @@ -423,7 +423,7 @@ bool VolumeControlDevice::IsEncryptionEnabled() { bool VolumeControlDevice::EnableEncryption() { int result = BTM_SetEncryption(address, BT_TRANSPORT_LE, nullptr, nullptr, BTM_BLE_SEC_ENCRYPT); - log::info("{}: result=0x{:02x}", ADDRESS_TO_LOGGABLE_CSTR(address), result); + log::info("{}: result=0x{:02x}", address, result); return result != BTM_ERR_KEY_MISSING; } diff --git a/system/bta/vc/vc.cc b/system/bta/vc/vc.cc index 1acdf2b17b..c01f679d9b 100644 --- a/system/bta/vc/vc.cc +++ b/system/bta/vc/vc.cc @@ -106,18 +106,17 @@ class VolumeControlImpl : public VolumeControl { /* Oportunistic works only for direct connect, * but in fact this is background connect */ - log::info(": {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info(": {}", address); BTA_GATTC_Open(gatt_if_, address, BTM_BLE_DIRECT_CONNECTION, true); } void Connect(const RawAddress& address) override { - log::info(": {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info(": {}", address); auto device = volume_control_devices_.FindByAddress(address); if (!device) { if (!BTM_IsLinkKeyKnown(address, BT_TRANSPORT_LE)) { - log::error("Connecting {} when not bonded", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Connecting {} when not bonded", address); callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address); return; } @@ -126,8 +125,8 @@ class VolumeControlImpl : public VolumeControl { device->connecting_actively = true; if (device->IsConnected()) { - log::warn("address={}, connection_id={} already connected.", - ADDRESS_TO_LOGGABLE_STR(address), device->connection_id); + log::warn("address={}, connection_id={} already connected.", address, + device->connection_id); if (device->IsReady()) { callbacks_->OnConnectionState(ConnectionState::CONNECTED, @@ -144,7 +143,7 @@ class VolumeControlImpl : public VolumeControl { } void AddFromStorage(const RawAddress& address) { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); volume_control_devices_.Add(address, false); StartOpportunisticConnect(address); } @@ -153,8 +152,8 @@ class VolumeControlImpl : public VolumeControl { tGATT_IF /*client_if*/, RawAddress address, tBT_TRANSPORT transport, uint16_t /*mtu*/) { log::info("{}, conn_id=0x{:04x}, transport={}, status={}(0x{:02x})", - ADDRESS_TO_LOGGABLE_CSTR(address), connection_id, - bt_transport_text(transport), gatt_status_text(status), status); + address, connection_id, bt_transport_text(transport), + gatt_status_text(status), status); if (transport != BT_TRANSPORT_LE) { log::warn("Only LE connection is allowed (transport {})", @@ -166,8 +165,7 @@ class VolumeControlImpl : public VolumeControl { VolumeControlDevice* device = volume_control_devices_.FindByAddress(address); if (!device) { - log::error("Skipping unknown device, address={}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::error("Skipping unknown device, address={}", address); return; } @@ -190,8 +188,7 @@ class VolumeControlImpl : public VolumeControl { } if (!device->EnableEncryption()) { - log::error("Link key is not known for {}, disconnect profile", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Link key is not known for {}, disconnect profile", address); device->Disconnect(gatt_if_); } } @@ -200,8 +197,7 @@ class VolumeControlImpl : public VolumeControl { VolumeControlDevice* device = volume_control_devices_.FindByAddress(address); if (!device) { - log::error("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::error("Skipping unknown device {}", address); return; } @@ -214,7 +210,7 @@ class VolumeControlImpl : public VolumeControl { return; } - log::info("{} status: {}", ADDRESS_TO_LOGGABLE_STR(address), success); + log::info("{} status: {}", address, success); if (device->HasHandles()) { device->EnqueueInitialRequests(gatt_if_, chrc_read_callback_static, @@ -232,7 +228,7 @@ class VolumeControlImpl : public VolumeControl { return; } - log::info("address={}", ADDRESS_TO_LOGGABLE_CSTR(device->address)); + log::info("address={}", device->address); if (device->known_service_handles_ == false) { log::info("Device already is waiting for new services"); return; @@ -251,8 +247,7 @@ class VolumeControlImpl : public VolumeControl { VolumeControlDevice* device = volume_control_devices_.FindByAddress(address); if (!device) { - log::error("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::error("Skipping unknown device {}", address); return; } @@ -263,8 +258,7 @@ class VolumeControlImpl : public VolumeControl { VolumeControlDevice* device = volume_control_devices_.FindByAddress(address); if (!device) { - log::error("Skipping unknown device {}", - ADDRESS_TO_LOGGABLE_STR(address)); + log::error("Skipping unknown device {}", address); return; } @@ -322,8 +316,7 @@ class VolumeControlImpl : public VolumeControl { if (status != GATT_SUCCESS) { log::info("status=0x{:02x}", static_cast<int>(status)); if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + log::info("Database out of sync for {}", device->address); ClearDeviceInformationAndStartSearch(device); } return; @@ -378,9 +371,8 @@ class VolumeControlImpl : public VolumeControl { void HandleAutonomusVolumeChange(VolumeControlDevice* device, bool is_volume_change, bool is_mute_change) { - log::debug("{}, is volume change: {}, is mute change: {}", - ADDRESS_TO_LOGGABLE_CSTR(device->address), is_volume_change, - is_mute_change); + log::debug("{}, is volume change: {}, is mute change: {}", device->address, + is_volume_change, is_mute_change); if (!is_volume_change && !is_mute_change) { log::error("Autonomous change but volume and mute did not changed."); @@ -398,8 +390,7 @@ class VolumeControlImpl : public VolumeControl { auto group_id = csis_api->GetGroupId(device->address, le_audio::uuid::kCapServiceUuid); if (group_id == bluetooth::groups::kGroupUnknown) { - log::warn("No group for device {}", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + log::warn("No group for device {}", device->address); callbacks_->OnVolumeStateChanged(device->address, device->volume, device->mute, true); return; @@ -463,8 +454,7 @@ class VolumeControlImpl : public VolumeControl { loghex(device->mute), loghex(device->change_counter)); if (!device->IsReady()) { - log::info("Device: {} is not ready yet.", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + log::info("Device: {} is not ready yet.", device->address); return; } @@ -484,7 +474,7 @@ class VolumeControlImpl : public VolumeControl { }); if (op == ongoing_operations_.end()) { log::debug("Could not find operation id for device: {}. Autonomus change", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + device->address); HandleAutonomusVolumeChange(device, is_volume_change, is_mute_change); return; } @@ -536,8 +526,7 @@ class VolumeControlImpl : public VolumeControl { loghex(offset->offset), loghex(offset->change_counter)); if (!device->IsReady()) { - log::info("Device: {} is not ready yet.", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + log::info("Device: {} is not ready yet.", device->address); return; } @@ -560,8 +549,7 @@ class VolumeControlImpl : public VolumeControl { log::info("id {}location {}", loghex(offset->id), loghex(offset->location)); if (!device->IsReady()) { - log::info("Device: {} is not ready yet.", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + log::info("Device: {} is not ready yet.", device->address); return; } @@ -594,8 +582,7 @@ class VolumeControlImpl : public VolumeControl { log::info("{}", description); if (!device->IsReady()) { - log::info("Device: {} is not ready yet.", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + log::info("Device: {} is not ready yet.", device->address); return; } @@ -617,7 +604,7 @@ class VolumeControlImpl : public VolumeControl { if (status != GATT_SUCCESS) { if (status == GATT_DATABASE_OUT_OF_SYNC) { log::info("Database out of sync for {}, conn_id: 0x{:04x}", - ADDRESS_TO_LOGGABLE_CSTR(device->address), connection_id); + device->address, connection_id); ClearDeviceInformationAndStartSearch(device); } else { log::error( @@ -629,7 +616,7 @@ class VolumeControlImpl : public VolumeControl { } log::info("Successfully registered on ccc: 0x{:04x}, device: {}", handle, - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + device->address); verify_device_ready(device, handle); } @@ -651,25 +638,23 @@ class VolumeControlImpl : public VolumeControl { } void Disconnect(const RawAddress& address) override { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); VolumeControlDevice* device = volume_control_devices_.FindByAddress(address); if (!device) { - log::warn("Device not connected to profile {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Device not connected to profile {}", address); callbacks_->OnConnectionState(ConnectionState::DISCONNECTED, address); return; } - log::info("GAP_EVT_CONN_CLOSED: {}", - ADDRESS_TO_LOGGABLE_STR(device->address)); + log::info("GAP_EVT_CONN_CLOSED: {}", device->address); device->connecting_actively = false; device_cleanup_helper(device, true); } void Remove(const RawAddress& address) override { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("{}", address); /* Removes all registrations for connection. */ BTA_GATTC_CancelOpen(gatt_if_, address, false); @@ -769,8 +754,7 @@ class VolumeControlImpl : public VolumeControl { for (auto const& addr : devices) { auto it = find(op->devices_.begin(), op->devices_.end(), addr); if (it != op->devices_.end()) { - log::debug("Removing {} from operation", - ADDRESS_TO_LOGGABLE_CSTR(*it)); + log::debug("Removing {} from operation", *it); op->devices_.erase(it); } } @@ -802,15 +786,14 @@ class VolumeControlImpl : public VolumeControl { RemoveDeviceFromOperationList(device->address, PTR_TO_INT(data)); if (status == GATT_DATABASE_OUT_OF_SYNC) { - log::info("Database out of sync for {}", - ADDRESS_TO_LOGGABLE_CSTR(device->address)); + log::info("Database out of sync for {}", device->address); ClearDeviceInformationAndStartSearch(device); } } static void operation_timeout_callback(void* data) { if (!instance) { - log::warn(" There is no instance."); + log::warn("There is no instance."); return; } instance->OperationMonitorTimeoutFired(PTR_TO_INT(data)); @@ -828,7 +811,7 @@ class VolumeControlImpl : public VolumeControl { log::warn("Operation {} is taking too long for devices:", operation_id); for (const auto& addr : op->devices_) { - log::warn(" {},", ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::warn("{},", addr); } alarm_set_on_mloop(op->operation_timeout_, kOperationMonitorTimeoutMs, operation_timeout_callback, INT_TO_PTR(operation_id)); @@ -842,7 +825,7 @@ class VolumeControlImpl : public VolumeControl { auto op = &ongoing_operations_.front(); - log::info(" Current operation_id: {}", op->operation_id_); + log::info("Current operation_id: {}", op->operation_id_); if (op->IsStarted()) { log::info("Operation {} is started, wait until it is complete", @@ -904,8 +887,7 @@ class VolumeControlImpl : public VolumeControl { VolumeControlDevice* dev = volume_control_devices_.FindByAddress( std::get<RawAddress>(addr_or_group_id)); if (dev != nullptr) { - log::debug("Address: {}: isReady: {}", - ADDRESS_TO_LOGGABLE_CSTR(dev->address), + log::debug("Address: {}: isReady: {}", dev->address, dev->IsReady() ? "true" : "false"); if (dev->IsReady() && (dev->mute != mute)) { std::vector<RawAddress> devices = {dev->address}; @@ -979,13 +961,11 @@ class VolumeControlImpl : public VolumeControl { uint8_t opcode = kControlPointOpcodeSetAbsoluteVolume; if (std::holds_alternative<RawAddress>(addr_or_group_id)) { - log::debug("Address: {}:", ADDRESS_TO_LOGGABLE_CSTR( - std::get<RawAddress>(addr_or_group_id))); + log::debug("Address: {}:", std::get<RawAddress>(addr_or_group_id)); VolumeControlDevice* dev = volume_control_devices_.FindByAddress( std::get<RawAddress>(addr_or_group_id)); if (dev != nullptr) { - log::debug("Address: {}: isReady: {}", - ADDRESS_TO_LOGGABLE_CSTR(dev->address), + log::debug("Address: {}: isReady: {}", dev->address, dev->IsReady() ? "true" : "false"); if (dev->IsReady() && (dev->volume != volume)) { std::vector<RawAddress> devices = {dev->address}; @@ -1196,8 +1176,7 @@ class VolumeControlImpl : public VolumeControl { void ext_audio_out_control_point_helper(const RawAddress& address, uint8_t ext_output_id, uint8_t opcode, const std::vector<uint8_t>* arg) { - log::info("{} id={} op={}", ADDRESS_TO_LOGGABLE_STR(address), - loghex(ext_output_id), loghex(opcode)); + log::info("{} id={} op={}", address, loghex(ext_output_id), loghex(opcode)); VolumeControlDevice* device = volume_control_devices_.FindByAddress(address); if (!device) { diff --git a/system/btif/avrcp/avrcp_service.cc b/system/btif/avrcp/avrcp_service.cc index 0a8fadd069..e5d575a953 100644 --- a/system/btif/avrcp/avrcp_service.cc +++ b/system/btif/avrcp/avrcp_service.cc @@ -492,20 +492,19 @@ ServiceInterface* AvrcpService::GetServiceInterface() { } void AvrcpService::ConnectDevice(const RawAddress& bdaddr) { - log::info("address={}", ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::info("address={}", bdaddr); connection_handler_->ConnectDevice(bdaddr); } void AvrcpService::DisconnectDevice(const RawAddress& bdaddr) { - log::info("address={}", ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::info("address={}", bdaddr); connection_handler_->DisconnectDevice(bdaddr); } void AvrcpService::SetBipClientStatus(const RawAddress& bdaddr, bool connected) { - log::info("address={}, connected={}", ADDRESS_TO_LOGGABLE_STR(bdaddr), - connected); + log::info("address={}, connected={}", bdaddr, connected); connection_handler_->SetBipClientStatus(bdaddr, connected); } @@ -690,7 +689,7 @@ void AvrcpService::DebugDump(int fd) { /** when a2dp connected, btif will start register vol changed, so we need a * interface for it. */ void AvrcpService::RegisterVolChanged(const RawAddress& bdaddr) { - log::info(": address={}", ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::info(": address={}", bdaddr); connection_handler_->RegisterVolChanged(bdaddr); } diff --git a/system/btif/co/bta_av_co.cc b/system/btif/co/bta_av_co.cc index 19b002c3d1..9ac30cfdfb 100644 --- a/system/btif/co/bta_av_co.cc +++ b/system/btif/co/bta_av_co.cc @@ -161,22 +161,20 @@ void BtaAvCo::ProcessDiscoveryResult(tBTA_AV_HNDL bta_av_handle, uint8_t num_sources, uint16_t uuid_local) { log::verbose( "peer {} bta_av_handle:0x{:x} num_seps:{} num_sinks:{} num_sources:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle, num_seps, - num_sinks, num_sources); + peer_address, bta_av_handle, num_seps, num_sinks, num_sources); // Find the peer BtaAvCoPeer* p_peer = peer_cache_->FindPeerAndUpdate(bta_av_handle, peer_address); if (p_peer == nullptr) { log::error("could not find peer entry for bta_av_handle 0x{:x} peer {}", - bta_av_handle, ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + bta_av_handle, peer_address); return; } /* Sanity check : this should never happen */ if (p_peer->opened) { - log::error("peer {} already opened", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::error("peer {} already opened", peer_address); } /* Copy the discovery results */ @@ -205,9 +203,8 @@ tA2DP_STATUS BtaAvCo::ProcessSourceGetConfig( tBTA_AV_HNDL bta_av_handle, const RawAddress& peer_address, uint8_t* p_codec_info, uint8_t* p_sep_info_idx, uint8_t seid, uint8_t* p_num_protect, uint8_t* p_protect_info) { - log::verbose("peer {} bta_av_handle:0x{:x} codec:{} seid:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle, - A2DP_CodecName(p_codec_info), seid); + log::verbose("peer {} bta_av_handle:0x{:x} codec:{} seid:{}", peer_address, + bta_av_handle, A2DP_CodecName(p_codec_info), seid); log::verbose("num_protect:0x{:02x} protect_info:0x{:02x}{:02x}{:02x}", *p_num_protect, p_protect_info[0], p_protect_info[1], p_protect_info[2]); @@ -218,7 +215,7 @@ tA2DP_STATUS BtaAvCo::ProcessSourceGetConfig( peer_cache_->FindPeerAndUpdate(bta_av_handle, peer_address); if (p_peer == nullptr) { log::error("could not find peer entry for bta_av_handle 0x{:x} peer {}", - bta_av_handle, ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + bta_av_handle, peer_address); return A2DP_FAIL; } log::verbose("peer(o={}, n_sinks={}, n_rx_sinks={}, n_sup_sinks={})", @@ -251,8 +248,7 @@ tA2DP_STATUS BtaAvCo::ProcessSourceGetConfig( p_sink->num_protect = *p_num_protect; memcpy(p_sink->protect_info, p_protect_info, AVDT_CP_INFO_LEN); } else { - log::error("peer {} : no more room for Sink info", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::error("peer {} : no more room for Sink info", p_peer->addr); } } @@ -262,8 +258,7 @@ tA2DP_STATUS BtaAvCo::ProcessSourceGetConfig( (p_peer->num_sup_sinks != BTA_AV_CO_NUM_ELEMENTS(p_peer->sinks))) { return A2DP_FAIL; } - log::verbose("last Sink codec reached for peer {} (local {})", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), + log::verbose("last Sink codec reached for peer {} (local {})", p_peer->addr, p_peer->acceptor ? "acceptor" : "initiator"); bta_av_co_store_peer_codectype(p_peer); @@ -280,8 +275,7 @@ tA2DP_STATUS BtaAvCo::ProcessSourceGetConfig( } p_sink = p_peer->p_sink; if (p_sink == nullptr) { - log::error("cannot find the selected codec for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::error("cannot find the selected codec for peer {}", p_peer->addr); return A2DP_FAIL; } } else { @@ -290,8 +284,7 @@ tA2DP_STATUS BtaAvCo::ProcessSourceGetConfig( p_sink = peer_cache_->FindPeerSink( p_peer, BTAV_A2DP_CODEC_INDEX_SOURCE_SBC, ContentProtectFlag()); if (p_sink != nullptr) { - log::verbose("mandatory codec preferred for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::verbose("mandatory codec preferred for peer {}", p_peer->addr); btav_a2dp_codec_config_t high_priority_mandatory{ .codec_type = BTAV_A2DP_CODEC_INDEX_SOURCE_SBC, .codec_priority = BTAV_A2DP_CODEC_PRIORITY_HIGHEST, @@ -308,14 +301,12 @@ tA2DP_STATUS BtaAvCo::ProcessSourceGetConfig( result_codec_config, &restart_input, &restart_output, &config_updated); } else { - log::warn("mandatory codec not found for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::warn("mandatory codec not found for peer {}", p_peer->addr); } } p_sink = SelectSourceCodec(p_peer); if (p_sink == nullptr) { - log::error("cannot set up codec for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::error("cannot set up codec for peer {}", p_peer->addr); return A2DP_FAIL; } } @@ -329,14 +320,13 @@ tA2DP_STATUS BtaAvCo::ProcessSourceGetConfig( // If acceptor -> reconfig otherwise reply for configuration *p_sep_info_idx = p_sink->sep_info_idx; - log::verbose("peer {} acceptor:{} reconfig_needed:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), + log::verbose("peer {} acceptor:{} reconfig_needed:{}", p_peer->addr, (p_peer->acceptor) ? "true" : "false", (p_peer->reconfig_needed) ? "true" : "false"); if (p_peer->acceptor) { if (p_peer->reconfig_needed) { log::verbose("call BTA_AvReconfig(0x{:x}) for peer {}", bta_av_handle, - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + p_peer->addr); BTA_AvReconfig(bta_av_handle, true, p_sink->sep_info_idx, p_peer->codec_config, *p_num_protect, bta_av_co_cp_scmst); } @@ -346,7 +336,7 @@ tA2DP_STATUS BtaAvCo::ProcessSourceGetConfig( // report this peer selectable codecs after retrieved all its capabilities. log::info("retrieved {} capabilities from peer {}", p_peer->num_rx_sinks, - ADDRESS_TO_LOGGABLE_STR(p_peer->addr)); + p_peer->addr); ReportSourceCodecState(p_peer); return A2DP_SUCCESS; @@ -360,9 +350,8 @@ tA2DP_STATUS BtaAvCo::ProcessSinkGetConfig(tBTA_AV_HNDL bta_av_handle, uint8_t* p_protect_info) { std::lock_guard<std::recursive_mutex> lock(peer_cache_->codec_lock_); - log::verbose("peer {} bta_av_handle:0x{:x} codec:{} seid:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle, - A2DP_CodecName(p_codec_info), seid); + log::verbose("peer {} bta_av_handle:0x{:x} codec:{} seid:{}", peer_address, + bta_av_handle, A2DP_CodecName(p_codec_info), seid); log::verbose("num_protect:0x{:02x} protect_info:0x{:02x}{:02x}{:02x}", *p_num_protect, p_protect_info[0], p_protect_info[1], p_protect_info[2]); @@ -373,13 +362,13 @@ tA2DP_STATUS BtaAvCo::ProcessSinkGetConfig(tBTA_AV_HNDL bta_av_handle, peer_cache_->FindPeerAndUpdate(bta_av_handle, peer_address); if (p_peer == nullptr) { log::error("could not find peer entry for bta_av_handle 0x{:x} peer {}", - bta_av_handle, ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + bta_av_handle, peer_address); return A2DP_FAIL; } log::verbose( "peer {} found (o={}, n_sources={}, n_rx_sources={}, n_sup_sources={})", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), p_peer->opened, - p_peer->num_sources, p_peer->num_rx_sources, p_peer->num_sup_sources); + p_peer->addr, p_peer->opened, p_peer->num_sources, p_peer->num_rx_sources, + p_peer->num_sup_sources); p_peer->num_rx_sources++; @@ -399,8 +388,7 @@ tA2DP_STATUS BtaAvCo::ProcessSinkGetConfig(tBTA_AV_HNDL bta_av_handle, p_source->num_protect = *p_num_protect; memcpy(p_source->protect_info, p_protect_info, AVDT_CP_INFO_LEN); } else { - log::error("peer {} : no more room for Source info", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::error("peer {} : no more room for Source info", p_peer->addr); } } @@ -410,8 +398,7 @@ tA2DP_STATUS BtaAvCo::ProcessSinkGetConfig(tBTA_AV_HNDL bta_av_handle, (p_peer->num_sup_sources != BTA_AV_CO_NUM_ELEMENTS(p_peer->sources))) { return A2DP_FAIL; } - log::verbose("last Source codec reached for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::verbose("last Source codec reached for peer {}", p_peer->addr); // Select the Sink codec const BtaAvCoSep* p_source = nullptr; @@ -425,15 +412,13 @@ tA2DP_STATUS BtaAvCo::ProcessSinkGetConfig(tBTA_AV_HNDL bta_av_handle, } p_source = p_peer->p_source; if (p_source == nullptr) { - log::error("cannot find the selected codec for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::error("cannot find the selected codec for peer {}", p_peer->addr); return A2DP_FAIL; } } else { p_source = SelectSinkCodec(p_peer); if (p_source == nullptr) { - log::error("cannot set up codec for the peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::error("cannot set up codec for the peer {}", p_peer->addr); return A2DP_FAIL; } } @@ -447,14 +432,13 @@ tA2DP_STATUS BtaAvCo::ProcessSinkGetConfig(tBTA_AV_HNDL bta_av_handle, // If acceptor -> reconfig otherwise reply for configuration *p_sep_info_idx = p_source->sep_info_idx; - log::verbose("peer {} acceptor:{} reconfig_needed:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), + log::verbose("peer {} acceptor:{} reconfig_needed:{}", p_peer->addr, (p_peer->acceptor) ? "true" : "false", (p_peer->reconfig_needed) ? "true" : "false"); if (p_peer->acceptor) { if (p_peer->reconfig_needed) { log::verbose("call BTA_AvReconfig(0x{:x}) for peer {}", bta_av_handle, - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + p_peer->addr); BTA_AvReconfig(bta_av_handle, true, p_source->sep_info_idx, p_peer->codec_config, *p_num_protect, bta_av_co_cp_scmst); } @@ -478,8 +462,7 @@ void BtaAvCo::ProcessSetConfig(tBTA_AV_HNDL bta_av_handle, log::verbose( "bta_av_handle=0x{:x} peer_address={} seid={} num_protect={} " "t_local_sep={} avdt_handle={}", - bta_av_handle, ADDRESS_TO_LOGGABLE_CSTR(peer_address), seid, num_protect, - t_local_sep, avdt_handle); + bta_av_handle, peer_address, seid, num_protect, t_local_sep, avdt_handle); log::verbose("p_codec_info[{:x}:{:x}:{:x}:{:x}:{:x}:{:x}]", p_codec_info[1], p_codec_info[2], p_codec_info[3], p_codec_info[4], p_codec_info[5], p_codec_info[6]); @@ -493,7 +476,7 @@ void BtaAvCo::ProcessSetConfig(tBTA_AV_HNDL bta_av_handle, peer_cache_->FindPeerAndUpdate(bta_av_handle, peer_address); if (p_peer == nullptr) { log::error("could not find peer entry for bta_av_handle 0x{:x} peer {}", - bta_av_handle, ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + bta_av_handle, peer_address); // Call call-in rejecting the configuration bta_av_ci_setconfig(bta_av_handle, A2DP_BUSY, AVDT_ASC_CODEC, 0, nullptr, false, avdt_handle); @@ -502,27 +485,24 @@ void BtaAvCo::ProcessSetConfig(tBTA_AV_HNDL bta_av_handle, log::verbose( "peer {} found (o={}, n_sinks={}, n_rx_sinks={}, n_sup_sinks={})", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), p_peer->opened, p_peer->num_sinks, - p_peer->num_rx_sinks, p_peer->num_sup_sinks); + p_peer->addr, p_peer->opened, p_peer->num_sinks, p_peer->num_rx_sinks, + p_peer->num_sup_sinks); // Sanity check: should not be opened at this point if (p_peer->opened) { - log::error("peer {} already in use", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::error("peer {} already in use", p_peer->addr); } if (num_protect != 0) { if (ContentProtectEnabled()) { if ((num_protect != 1) || !ContentProtectIsScmst(p_protect_info)) { - log::error("wrong CP configuration for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::error("wrong CP configuration for peer {}", p_peer->addr); status = A2DP_BAD_CP_TYPE; category = AVDT_ASC_PROTECT; } } else { // Do not support content protection for the time being - log::error("wrong CP configuration for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::error("wrong CP configuration for peer {}", p_peer->addr); status = A2DP_BAD_CP_TYPE; category = AVDT_ASC_PROTECT; } @@ -532,8 +512,7 @@ void BtaAvCo::ProcessSetConfig(tBTA_AV_HNDL bta_av_handle, bool codec_config_supported = false; if (t_local_sep == AVDT_TSEP_SNK) { - log::verbose("peer {} is A2DP Source", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::verbose("peer {} is A2DP Source", p_peer->addr); codec_config_supported = A2DP_IsSinkCodecSupported(p_codec_info); if (codec_config_supported) { // If Peer is Source, and our config subset matches with what is @@ -543,8 +522,7 @@ void BtaAvCo::ProcessSetConfig(tBTA_AV_HNDL bta_av_handle, } } if (t_local_sep == AVDT_TSEP_SRC) { - log::verbose("peer {} is A2DP SINK", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::verbose("peer {} is A2DP SINK", p_peer->addr); // Ignore the restart_output flag: accepting the remote device's // codec selection should not trigger codec reconfiguration. bool dummy_restart_output = false; @@ -552,8 +530,7 @@ void BtaAvCo::ProcessSetConfig(tBTA_AV_HNDL bta_av_handle, !SetCodecOtaConfig(p_peer, p_codec_info, num_protect, p_protect_info, &dummy_restart_output, t_local_sep)) { log::error("cannot set source codec {} for peer {}", - A2DP_CodecName(p_codec_info), - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + A2DP_CodecName(p_codec_info), p_peer->addr); } else { codec_config_supported = true; // Check if reconfiguration is needed @@ -571,8 +548,7 @@ void BtaAvCo::ProcessSetConfig(tBTA_AV_HNDL bta_av_handle, } if (status != A2DP_SUCCESS) { - log::verbose("peer {} reject s={} c={}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), status, category); + log::verbose("peer {} reject s={} c={}", p_peer->addr, status, category); // Call call-in rejecting the configuration bta_av_ci_setconfig(bta_av_handle, status, category, 0, nullptr, false, avdt_handle); @@ -582,8 +558,7 @@ void BtaAvCo::ProcessSetConfig(tBTA_AV_HNDL bta_av_handle, // Mark that this is an acceptor peer p_peer->acceptor = true; p_peer->reconfig_needed = reconfig_needed; - log::verbose("peer {} accept reconf={}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), reconfig_needed); + log::verbose("peer {} accept reconf={}", p_peer->addr, reconfig_needed); // Call call-in accepting the configuration bta_av_ci_setconfig(bta_av_handle, A2DP_SUCCESS, A2DP_SUCCESS, 0, nullptr, reconfig_needed, avdt_handle); @@ -591,15 +566,15 @@ void BtaAvCo::ProcessSetConfig(tBTA_AV_HNDL bta_av_handle, void BtaAvCo::ProcessOpen(tBTA_AV_HNDL bta_av_handle, const RawAddress& peer_address, uint16_t mtu) { - log::verbose("peer {} bta_av_handle: 0x{:x} mtu:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle, mtu); + log::verbose("peer {} bta_av_handle: 0x{:x} mtu:{}", peer_address, + bta_av_handle, mtu); // Find the peer BtaAvCoPeer* p_peer = peer_cache_->FindPeerAndUpdate(bta_av_handle, peer_address); if (p_peer == nullptr) { log::error("could not find peer entry for bta_av_handle 0x{:x} peer {}", - bta_av_handle, ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + bta_av_handle, peer_address); return; } p_peer->opened = true; @@ -618,8 +593,7 @@ void BtaAvCo::ProcessOpen(tBTA_AV_HNDL bta_av_handle, void BtaAvCo::ProcessClose(tBTA_AV_HNDL bta_av_handle, const RawAddress& peer_address) { - log::verbose("peer {} bta_av_handle: 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle); + log::verbose("peer {} bta_av_handle: 0x{:x}", peer_address, bta_av_handle); btif_av_reset_audio_delay(); // Find the peer @@ -627,7 +601,7 @@ void BtaAvCo::ProcessClose(tBTA_AV_HNDL bta_av_handle, peer_cache_->FindPeerAndUpdate(bta_av_handle, peer_address); if (p_peer == nullptr) { log::error("could not find peer entry for bta_av_handle 0x{:x} peer {}", - bta_av_handle, ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + bta_av_handle, peer_address); return; } // Reset the active peer @@ -649,15 +623,14 @@ void BtaAvCo::ProcessClose(tBTA_AV_HNDL bta_av_handle, void BtaAvCo::ProcessStart(tBTA_AV_HNDL bta_av_handle, const RawAddress& peer_address, const uint8_t* p_codec_info, bool* p_no_rtp_header) { - log::verbose("peer {} bta_av_handle: 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle); + log::verbose("peer {} bta_av_handle: 0x{:x}", peer_address, bta_av_handle); // Find the peer BtaAvCoPeer* p_peer = peer_cache_->FindPeerAndUpdate(bta_av_handle, peer_address); if (p_peer == nullptr) { log::error("could not find peer entry for bta_av_handle 0x{:x} peer {}", - bta_av_handle, ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + bta_av_handle, peer_address); return; } @@ -671,8 +644,7 @@ void BtaAvCo::ProcessStart(tBTA_AV_HNDL bta_av_handle, void BtaAvCo::ProcessStop(tBTA_AV_HNDL bta_av_handle, const RawAddress& peer_address) { - log::verbose("peer {} bta_av_handle: 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle); + log::verbose("peer {} bta_av_handle: 0x{:x}", peer_address, bta_av_handle); // Nothing to do } @@ -728,30 +700,30 @@ BT_HDR* BtaAvCo::GetNextSourceDataPacket(const uint8_t* p_codec_info, void BtaAvCo::DataPacketWasDropped(tBTA_AV_HNDL bta_av_handle, const RawAddress& peer_address) { - log::error("peer {} dropped audio packet on handle 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle); + log::error("peer {} dropped audio packet on handle 0x{:x}", peer_address, + bta_av_handle); } void BtaAvCo::ProcessAudioDelay(tBTA_AV_HNDL bta_av_handle, const RawAddress& peer_address, uint16_t delay) { - log::verbose("peer {} bta_av_handle: 0x{:x} delay:0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle, delay); + log::verbose("peer {} bta_av_handle: 0x{:x} delay:0x{:x}", peer_address, + bta_av_handle, delay); btif_av_set_audio_delay(peer_address, delay, A2dpType::kSource); } void BtaAvCo::UpdateMtu(tBTA_AV_HNDL bta_av_handle, const RawAddress& peer_address, uint16_t mtu) { - log::info("peer {} bta_av_handle: {} mtu: {}", - ADDRESS_TO_LOGGABLE_STR(peer_address), loghex(bta_av_handle), mtu); + log::info("peer {} bta_av_handle: {} mtu: {}", peer_address, + loghex(bta_av_handle), mtu); // Find the peer BtaAvCoPeer* p_peer = peer_cache_->FindPeerAndUpdate(bta_av_handle, peer_address); if (p_peer == nullptr) { log::error("could not find peer entry for bta_av_handle {} peer {}", - loghex(bta_av_handle), ADDRESS_TO_LOGGABLE_STR(peer_address)); + loghex(bta_av_handle), peer_address); return; } p_peer->mtu = mtu; @@ -759,7 +731,7 @@ void BtaAvCo::UpdateMtu(tBTA_AV_HNDL bta_av_handle, bool BtaAvCo::SetActivePeer(const RawAddress& peer_address, const uint8_t t_local_sep) { - log::info("peer_address={}", ADDRESS_TO_LOGGABLE_STR(peer_address)); + log::info("peer_address={}", peer_address); std::lock_guard<std::recursive_mutex> lock(peer_cache_->codec_lock_); @@ -767,7 +739,7 @@ bool BtaAvCo::SetActivePeer(const RawAddress& peer_address, if (reference_state == nullptr) { log::warn( "Invalid bta av state for peer_address : {} with local sep as :{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), t_local_sep); + peer_address, t_local_sep); return false; } if (peer_address.IsEmpty()) { @@ -838,8 +810,8 @@ void BtaAvCo::GetPeerEncoderParameters( btif_av_peer_supports_3mbps(peer_address, A2dpType::kSource); log::verbose( "peer_address={} peer_mtu={} is_peer_edr={} peer_supports_3mbps={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), p_peer_params->peer_mtu, - p_peer_params->is_peer_edr, p_peer_params->peer_supports_3mbps); + peer_address, p_peer_params->peer_mtu, p_peer_params->is_peer_edr, + p_peer_params->peer_supports_3mbps); } const tA2DP_ENCODER_INTERFACE* BtaAvCo::GetSourceEncoderInterface() { @@ -860,16 +832,14 @@ bool BtaAvCo::SetCodecUserConfig( bool config_updated = false; bool success = true; - log::verbose("peer_address={} codec_user_config={{}}", - ADDRESS_TO_LOGGABLE_STR(peer_address), + log::verbose("peer_address={} codec_user_config={{}}", peer_address, codec_user_config.ToString()); *p_restart_output = false; BtaAvCoPeer* p_peer = peer_cache_->FindPeer(peer_address); if (p_peer == nullptr) { - log::error("cannot find peer {} to configure", - ADDRESS_TO_LOGGABLE_STR(peer_address)); + log::error("cannot find peer {} to configure", peer_address); success = false; goto done; } @@ -878,7 +848,7 @@ bool BtaAvCo::SetCodecUserConfig( if ((p_peer->num_rx_sinks != p_peer->num_sinks) && (p_peer->num_sup_sinks != BTA_AV_CO_NUM_ELEMENTS(p_peer->sinks))) { log::warn("peer {} : not all peer's capabilities have been retrieved", - ADDRESS_TO_LOGGABLE_STR(p_peer->addr)); + p_peer->addr); success = false; goto done; } @@ -893,8 +863,7 @@ bool BtaAvCo::SetCodecUserConfig( } if (p_sink == nullptr) { log::error("peer {} : cannot find peer SEP to configure for codec type {}", - ADDRESS_TO_LOGGABLE_STR(p_peer->addr), - codec_user_config.codec_type); + p_peer->addr, codec_user_config.codec_type); success = false; goto done; } @@ -918,7 +887,7 @@ bool BtaAvCo::SetCodecUserConfig( p_sink = SelectSourceCodec(p_peer); if (p_sink == nullptr) { log::error("peer {} : cannot set up codec for the peer SINK", - ADDRESS_TO_LOGGABLE_STR(p_peer->addr)); + p_peer->addr); success = false; goto done; } @@ -979,15 +948,14 @@ bool BtaAvCo::SetCodecAudioConfig( if ((p_peer->num_rx_sinks != p_peer->num_sinks) && (p_peer->num_sup_sinks != BTA_AV_CO_NUM_ELEMENTS(p_peer->sinks))) { log::warn("peer {} : not all peer's capabilities have been retrieved", - ADDRESS_TO_LOGGABLE_STR(p_peer->addr)); + p_peer->addr); return false; } // Use the current sink codec const BtaAvCoSep* p_sink = p_peer->p_sink; if (p_sink == nullptr) { - log::error("peer {} : cannot find peer SEP to configure", - ADDRESS_TO_LOGGABLE_STR(p_peer->addr)); + log::error("peer {} : cannot find peer SEP to configure", p_peer->addr); return false; } @@ -1049,7 +1017,7 @@ bool BtaAvCo::ReportSourceCodecState(BtaAvCoPeer* p_peer) { std::vector<btav_a2dp_codec_config_t> codecs_local_capabilities; std::vector<btav_a2dp_codec_config_t> codecs_selectable_capabilities; - log::verbose("peer_address={}", ADDRESS_TO_LOGGABLE_STR(p_peer->addr)); + log::verbose("peer_address={}", p_peer->addr); A2dpCodecs* codecs = p_peer->GetCodecs(); if (codecs == nullptr) { log::error("Peer codecs is set to null"); @@ -1061,11 +1029,10 @@ bool BtaAvCo::ReportSourceCodecState(BtaAvCoPeer* p_peer) { log::warn( "Peer {} : error reporting audio source codec state: cannot get codec " "config and capabilities", - ADDRESS_TO_LOGGABLE_STR(p_peer->addr)); + p_peer->addr); return false; } - log::info("peer {} codec_config={{}}", ADDRESS_TO_LOGGABLE_STR(p_peer->addr), - codec_config.ToString()); + log::info("peer {} codec_config={{}}", p_peer->addr, codec_config.ToString()); btif_av_report_source_codec_state(p_peer->addr, codec_config, codecs_local_capabilities, codecs_selectable_capabilities); @@ -1073,7 +1040,7 @@ bool BtaAvCo::ReportSourceCodecState(BtaAvCoPeer* p_peer) { } bool BtaAvCo::ReportSinkCodecState(BtaAvCoPeer* p_peer) { - log::verbose("peer_address={}", ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::verbose("peer_address={}", p_peer->addr); // Nothing to do (for now) return true; } @@ -1340,7 +1307,7 @@ const BtaAvCoSep* BtaAvCo::AttemptSinkCodecSelection( } size_t BtaAvCo::UpdateAllSelectableSourceCodecs(BtaAvCoPeer* p_peer) { - log::verbose("peer {}", ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::verbose("peer {}", p_peer->addr); size_t updated_codecs = 0; for (const auto& iter : p_peer->GetCodecs()->orderedSourceCodecs()) { @@ -1354,7 +1321,7 @@ size_t BtaAvCo::UpdateAllSelectableSourceCodecs(BtaAvCoPeer* p_peer) { bool BtaAvCo::UpdateSelectableSourceCodec(const A2dpCodecConfig& codec_config, BtaAvCoPeer* p_peer) { - log::verbose("peer {}", ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::verbose("peer {}", p_peer->addr); // Find the peer Sink for the codec const BtaAvCoSep* p_sink = peer_cache_->FindPeerSink( @@ -1364,8 +1331,7 @@ bool BtaAvCo::UpdateSelectableSourceCodec(const A2dpCodecConfig& codec_config, return false; } if (!p_peer->GetCodecs()->setPeerSinkCodecCapabilities(p_sink->codec_caps)) { - log::warn("cannot update peer {} codec capabilities for {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), + log::warn("cannot update peer {} codec capabilities for {}", p_peer->addr, A2DP_CodecName(p_sink->codec_caps)); return false; } @@ -1373,7 +1339,7 @@ bool BtaAvCo::UpdateSelectableSourceCodec(const A2dpCodecConfig& codec_config, } size_t BtaAvCo::UpdateAllSelectableSinkCodecs(BtaAvCoPeer* p_peer) { - log::verbose("peer {}", ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::verbose("peer {}", p_peer->addr); size_t updated_codecs = 0; for (const auto& iter : p_peer->GetCodecs()->orderedSinkCodecs()) { @@ -1387,7 +1353,7 @@ size_t BtaAvCo::UpdateAllSelectableSinkCodecs(BtaAvCoPeer* p_peer) { bool BtaAvCo::UpdateSelectableSinkCodec(const A2dpCodecConfig& codec_config, BtaAvCoPeer* p_peer) { - log::verbose("peer {}", ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::verbose("peer {}", p_peer->addr); // Find the peer Source for the codec const BtaAvCoSep* p_source = peer_cache_->FindPeerSource( @@ -1398,8 +1364,7 @@ bool BtaAvCo::UpdateSelectableSinkCodec(const A2dpCodecConfig& codec_config, } if (!p_peer->GetCodecs()->setPeerSourceCodecCapabilities( p_source->codec_caps)) { - log::warn("cannot update peer {} codec capabilities for {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), + log::warn("cannot update peer {} codec capabilities for {}", p_peer->addr, A2DP_CodecName(p_source->codec_caps)); return false; } @@ -1411,7 +1376,7 @@ void BtaAvCo::SaveNewCodecConfig(BtaAvCoPeer* p_peer, uint8_t num_protect, const uint8_t* p_protect_info, const uint8_t t_local_sep) { - log::verbose("peer {}", ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::verbose("peer {}", p_peer->addr); log::verbose("codec: {}", A2DP_CodecInfoString(new_codec_config)); std::lock_guard<std::recursive_mutex> lock(peer_cache_->codec_lock_); @@ -1419,7 +1384,7 @@ void BtaAvCo::SaveNewCodecConfig(BtaAvCoPeer* p_peer, if (reference_state == nullptr) { log::warn( "Invalid bta av state for peer_address : {} with local sep as :{}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), t_local_sep); + p_peer->addr, t_local_sep); return; } reference_state->setCodecConfig(new_codec_config); @@ -1440,8 +1405,7 @@ BtaAvCoState* BtaAvCo::getStateFromPeer(const BtaAvCoPeer* p_peer) { return &bta_av_sink_state_; } else { log::warn("Invalid bta av state for peer_address : {} with uuid as :{}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr), - p_peer->uuid_to_connect); + p_peer->addr, p_peer->uuid_to_connect); return nullptr; } } else { @@ -1460,7 +1424,7 @@ bool BtaAvCo::SetCodecOtaConfig(BtaAvCoPeer* p_peer, bool restart_output = false; bool config_updated = false; - log::info("peer_address={}, codec: {}", ADDRESS_TO_LOGGABLE_STR(p_peer->addr), + log::info("peer_address={}, codec: {}", p_peer->addr, A2DP_CodecInfoString(p_ota_codec_config)); *p_restart_output = false; @@ -1472,8 +1436,7 @@ bool BtaAvCo::SetCodecOtaConfig(BtaAvCoPeer* p_peer, // There are no peer SEPs if we didn't do the discovery procedure yet. // We have all the information we need from the peer, so we can // proceed with the OTA codec configuration. - log::error("peer {} : cannot find peer SEP to configure", - ADDRESS_TO_LOGGABLE_STR(p_peer->addr)); + log::error("peer {} : cannot find peer SEP to configure", p_peer->addr); return false; } @@ -1482,8 +1445,7 @@ bool BtaAvCo::SetCodecOtaConfig(BtaAvCoPeer* p_peer, if (!p_peer->GetCodecs()->setCodecOtaConfig( p_ota_codec_config, &peer_params, result_codec_config, &restart_input, &restart_output, &config_updated)) { - log::error("peer {} : cannot set OTA config", - ADDRESS_TO_LOGGABLE_STR(p_peer->addr)); + log::error("peer {} : cannot set OTA config", p_peer->addr); return false; } @@ -1611,9 +1573,8 @@ tA2DP_STATUS bta_av_co_audio_getconfig(tBTA_AV_HNDL bta_av_handle, uint8_t* p_protect_info) { uint16_t peer_uuid = bta_av_co_cb.peer_cache_->FindPeerUuid(bta_av_handle); - log::verbose("peer {} bta_av_handle=0x{:x} peer_uuid=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle, - peer_uuid); + log::verbose("peer {} bta_av_handle=0x{:x} peer_uuid=0x{:x}", peer_address, + bta_av_handle, peer_uuid); switch (peer_uuid) { case UUID_SERVCLASS_AUDIO_SOURCE: @@ -1628,7 +1589,7 @@ tA2DP_STATUS bta_av_co_audio_getconfig(tBTA_AV_HNDL bta_av_handle, break; } log::error("peer {} : Invalid peer UUID: 0x{:x} for bta_av_handle 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), peer_uuid, bta_av_handle); + peer_address, peer_uuid, bta_av_handle); return A2DP_FAIL; } diff --git a/system/btif/co/bta_av_co_peer.cc b/system/btif/co/bta_av_co_peer.cc index 7b635bc7eb..29180c0205 100644 --- a/system/btif/co/bta_av_co_peer.cc +++ b/system/btif/co/bta_av_co_peer.cc @@ -128,8 +128,7 @@ BtaAvCoSep* BtaAvCoPeerCache::FindPeerSource( BtaAvCoPeer* p_peer, btav_a2dp_codec_index_t codec_index, const uint8_t content_protect_flag) { if (codec_index == BTAV_A2DP_CODEC_INDEX_MAX) { - log::warn("invalid codec index for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::warn("invalid codec index for peer {}", p_peer->addr); return nullptr; } @@ -156,8 +155,7 @@ BtaAvCoSep* BtaAvCoPeerCache::FindPeerSink(BtaAvCoPeer* p_peer, btav_a2dp_codec_index_t codec_index, const uint8_t content_protect_flag) { if (codec_index == BTAV_A2DP_CODEC_INDEX_MAX) { - log::warn("invalid codec index for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::warn("invalid codec index for peer {}", p_peer->addr); return nullptr; } @@ -170,8 +168,7 @@ BtaAvCoSep* BtaAvCoPeerCache::FindPeerSink(BtaAvCoPeer* p_peer, continue; } if (!AudioSepHasContentProtection(p_sink, content_protect_flag)) { - log::warn("invalid codec index for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + log::warn("invalid codec index for peer {}", p_peer->addr); continue; } return p_sink; @@ -198,19 +195,17 @@ BtaAvCoPeer* BtaAvCoPeerCache::FindPeer(tBTA_AV_HNDL bta_av_handle) { BtaAvCoPeer* BtaAvCoPeerCache::FindPeerAndUpdate( tBTA_AV_HNDL bta_av_handle, const RawAddress& peer_address) { - log::verbose("peer {} bta_av_handle = 0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle); + log::verbose("peer {} bta_av_handle = 0x{:x}", peer_address, bta_av_handle); BtaAvCoPeer* p_peer = FindPeer(bta_av_handle); if (p_peer == nullptr) { log::error("peer entry for BTA AV handle 0x{:x} peer {} not found", - bta_av_handle, ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + bta_av_handle, peer_address); return nullptr; } log::verbose("peer {} bta_av_handle = 0x{:x} previous address {}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_av_handle, - ADDRESS_TO_LOGGABLE_CSTR(p_peer->addr)); + peer_address, bta_av_handle, p_peer->addr); p_peer->addr = peer_address; return p_peer; } diff --git a/system/btif/co/bta_hh_co.cc b/system/btif/co/bta_hh_co.cc index 375f34f8d4..6c93ef7e6b 100644 --- a/system/btif/co/bta_hh_co.cc +++ b/system/btif/co/bta_hh_co.cc @@ -271,8 +271,7 @@ static void uhid_fd_close(btif_hh_device_t* p_dev) { struct uhid_event ev = {}; ev.type = UHID_DESTROY; uhid_write(p_dev->fd, &ev); - log::debug("Closing fd={}, addr:{}", p_dev->fd, - ADDRESS_TO_LOGGABLE_CSTR(p_dev->link_spec)); + log::debug("Closing fd={}, addr:{}", p_dev->fd, p_dev->link_spec); close(p_dev->fd); p_dev->fd = -1; } @@ -396,8 +395,7 @@ static void* btif_hh_poll_event_thread(void* arg) { } /* Todo: Disconnect if loop exited due to a failure */ - log::info("Polling thread stopped for device {}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev->link_spec)); + log::info("Polling thread stopped for device {}", p_dev->link_spec); p_dev->hh_poll_thread_id = -1; p_dev->hh_keep_polling = 0; uhid_fd_close(p_dev); @@ -445,8 +443,8 @@ bool bta_hh_co_open(uint8_t dev_handle, uint8_t sub_class, "Found an existing device with the same handle dev_status={}, " "device={}, attr_mask=0x{:04x}, sub_class=0x{:02x}, app_id={}, " "dev_handle={}", - p_dev->dev_status, ADDRESS_TO_LOGGABLE_CSTR(p_dev->link_spec), - p_dev->attr_mask, p_dev->sub_class, p_dev->app_id, dev_handle); + p_dev->dev_status, p_dev->link_spec, p_dev->attr_mask, p_dev->sub_class, + p_dev->app_id, dev_handle); } else { // Use an empty slot p_dev = btif_hh_find_empty_dev(); if (p_dev == nullptr) { @@ -501,8 +499,7 @@ bool bta_hh_co_open(uint8_t dev_handle, uint8_t sub_class, ******************************************************************************/ void bta_hh_co_close(btif_hh_device_t* p_dev) { log::info("Closing device handle={}, status={}, address={}", - p_dev->dev_handle, p_dev->dev_status, - ADDRESS_TO_LOGGABLE_CSTR(p_dev->link_spec)); + p_dev->dev_handle, p_dev->dev_status, p_dev->link_spec); /* Clear the queues */ fixed_queue_flush(p_dev->get_rpt_id_queue, osi_free); @@ -797,8 +794,7 @@ void bta_hh_le_co_rpt_info(const tAclLinkSpec& link_spec, idx * sizeof(tBTA_HH_RPT_CACHE_ENTRY)); btif_config_set_int(bdstr, BTIF_STORAGE_KEY_HID_REPORT_VERSION, BTA_HH_CACHE_REPORT_VERSION); - log::verbose("Saving report; dev={}, idx={}", - ADDRESS_TO_LOGGABLE_CSTR(link_spec), idx); + log::verbose("Saving report; dev={}, idx={}", link_spec, idx); } } @@ -842,8 +838,7 @@ tBTA_HH_RPT_CACHE_ENTRY* bta_hh_le_co_cache_load(const tAclLinkSpec& link_spec, *p_num_rpt = len / sizeof(tBTA_HH_RPT_CACHE_ENTRY); - log::verbose("Loaded {} reports; dev={}", *p_num_rpt, - ADDRESS_TO_LOGGABLE_CSTR(link_spec)); + log::verbose("Loaded {} reports; dev={}", *p_num_rpt, link_spec); return sReportCache; } @@ -866,5 +861,5 @@ void bta_hh_le_co_reset_rpt_cache(const tAclLinkSpec& link_spec, btif_config_remove(bdstr, BTIF_STORAGE_KEY_HID_REPORT); btif_config_remove(bdstr, BTIF_STORAGE_KEY_HID_REPORT_VERSION); - log::verbose("Reset cache for bda {}", ADDRESS_TO_LOGGABLE_CSTR(link_spec)); + log::verbose("Reset cache for bda {}", link_spec); } diff --git a/system/btif/co/bta_pan_co.cc b/system/btif/co/bta_pan_co.cc index d17f19033d..d5fc1f0130 100644 --- a/system/btif/co/bta_pan_co.cc +++ b/system/btif/co/bta_pan_co.cc @@ -140,8 +140,7 @@ void bta_pan_co_tx_path(uint16_t handle, uint8_t app_id) { p_buf->len, p_buf->offset); if (is_empty_eth_addr(conn->eth_addr) && is_valid_bt_eth_addr(src)) { log::verbose("pan bt peer addr: {} update its ethernet addr: {}", - ADDRESS_TO_LOGGABLE_STR(conn->peer), - ADDRESS_TO_LOGGABLE_STR(src)); + conn->peer, src); conn->eth_addr = src; } btpan_tap_send(btpan_cb.tap_fd, src, dst, protocol, diff --git a/system/btif/src/bluetooth.cc b/system/btif/src/bluetooth.cc index 39553d9caf..4c197af89f 100644 --- a/system/btif/src/bluetooth.cc +++ b/system/btif/src/bluetooth.cc @@ -654,8 +654,7 @@ static int cancel_bond(const RawAddress* bd_addr) { static int remove_bond(const RawAddress* bd_addr) { if (is_restricted_mode() && !btif_storage_is_restricted_device(bd_addr)) { - log::info("{} cannot be removed in restricted mode", - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::info("{} cannot be removed in restricted mode", *bd_addr); return BT_STATUS_SUCCESS; } @@ -856,8 +855,7 @@ static int get_remote_pbap_pce_version(const RawAddress* bd_addr) { if (!btif_config_get_bin(bd_addr->ToString(), BTIF_STORAGE_KEY_PBAP_PCE_VERSION, (uint8_t*)&pce_version, &version_value_size)) { - log::warn("Failed to read cached peer PCE version for {}", - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::warn("Failed to read cached peer PCE version for {}", *bd_addr); } return pce_version; } diff --git a/system/btif/src/btif_a2dp.cc b/system/btif/src/btif_a2dp.cc index 335c832c33..93daca01a1 100644 --- a/system/btif/src/btif_a2dp.cc +++ b/system/btif/src/btif_a2dp.cc @@ -47,7 +47,7 @@ void btif_a2dp_on_idle(const RawAddress& peer_addr, const A2dpType local_a2dp_type) { log::verbose( "Peer stream endpoint type:{}", - peer_stream_endpoint_text(btif_av_get_peer_sep(local_a2dp_type)).c_str()); + peer_stream_endpoint_text(btif_av_get_peer_sep(local_a2dp_type))); if (!IS_FLAG_ENABLED(a2dp_concurrent_source_sink) && btif_av_src_sink_coexist_enabled()) { bool is_sink = btif_av_peer_is_sink(peer_addr); @@ -70,14 +70,14 @@ void btif_a2dp_on_idle(const RawAddress& peer_addr, bool btif_a2dp_on_started(const RawAddress& peer_addr, tBTA_AV_START* p_av_start, const A2dpType local_a2dp_type) { - log::info("## ON A2DP STARTED ## peer {} p_av_start:{}", - ADDRESS_TO_LOGGABLE_STR(peer_addr), fmt::ptr(p_av_start)); + log::info("## ON A2DP STARTED ## peer {} p_av_start:{}", peer_addr, + fmt::ptr(p_av_start)); if (p_av_start == NULL) { tA2DP_CTRL_ACK status = A2DP_CTRL_ACK_SUCCESS; if (!bluetooth::headset::IsCallIdle()) { log::error("peer {} call in progress, do not start A2DP stream", - ADDRESS_TO_LOGGABLE_STR(peer_addr)); + peer_addr); status = A2DP_CTRL_ACK_INCALL_FAILURE; } /* just ack back a local start request, do not start the media encoder since @@ -90,14 +90,13 @@ bool btif_a2dp_on_started(const RawAddress& peer_addr, return true; } - log::info("peer {} status:{} suspending:{} initiator:{}", - ADDRESS_TO_LOGGABLE_STR(peer_addr), p_av_start->status, - p_av_start->suspending, p_av_start->initiator); + log::info("peer {} status:{} suspending:{} initiator:{}", peer_addr, + p_av_start->status, p_av_start->suspending, p_av_start->initiator); if (p_av_start->status == BTA_AV_SUCCESS) { if (p_av_start->suspending) { log::warn("peer {} A2DP is suspending and ignores the started event", - ADDRESS_TO_LOGGABLE_STR(peer_addr)); + peer_addr); return false; } if (btif_av_is_a2dp_offload_running()) { @@ -119,8 +118,8 @@ bool btif_a2dp_on_started(const RawAddress& peer_addr, /* media task is auto-started upon UIPC connection of a2dp audiopath */ } } else if (p_av_start->initiator) { - log::error("peer {} A2DP start request failed: status = {}", - ADDRESS_TO_LOGGABLE_STR(peer_addr), p_av_start->status); + log::error("peer {} A2DP start request failed: status = {}", peer_addr, + p_av_start->status); if (bluetooth::audio::a2dp::is_hal_enabled()) { bluetooth::audio::a2dp::ack_stream_started(A2DP_CTRL_ACK_FAILURE); } else { @@ -181,20 +180,18 @@ void btif_a2dp_on_suspended(tBTA_AV_SUSPEND* p_av_suspend, void btif_a2dp_on_offload_started(const RawAddress& peer_addr, tBTA_AV_STATUS status) { tA2DP_CTRL_ACK ack; - log::info("peer {} status {}", ADDRESS_TO_LOGGABLE_CSTR(peer_addr), status); + log::info("peer {} status {}", peer_addr, status); switch (status) { case BTA_AV_SUCCESS: ack = A2DP_CTRL_ACK_SUCCESS; break; case BTA_AV_FAIL_RESOURCES: - log::error("peer {} FAILED UNSUPPORTED", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + log::error("peer {} FAILED UNSUPPORTED", peer_addr); ack = A2DP_CTRL_ACK_UNSUPPORTED; break; default: - log::error("peer {} FAILED: status = {}", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr), status); + log::error("peer {} FAILED: status = {}", peer_addr, status); ack = A2DP_CTRL_ACK_FAILURE; break; } @@ -204,8 +201,7 @@ void btif_a2dp_on_offload_started(const RawAddress& peer_addr, // Offload request will return with failure from btif_av sm if // suspend is triggered for remote start. Disconnect only if SoC // returned failure for offload VSC - log::error("peer {} offload start failed", - ADDRESS_TO_LOGGABLE_CSTR(peer_addr)); + log::error("peer {} offload start failed", peer_addr); btif_av_src_disconnect_sink(peer_addr); } } diff --git a/system/btif/src/btif_a2dp_sink.cc b/system/btif/src/btif_a2dp_sink.cc index ecf4ef9a70..0311a29cfc 100644 --- a/system/btif/src/btif_a2dp_sink.cc +++ b/system/btif/src/btif_a2dp_sink.cc @@ -224,15 +224,14 @@ static void btif_a2dp_sink_startup_delayed() { bool btif_a2dp_sink_start_session(const RawAddress& peer_address, std::promise<void> peer_ready_promise) { - log::info("peer_address={}", ADDRESS_TO_LOGGABLE_STR(peer_address)); + log::info("peer_address={}", peer_address); if (btif_a2dp_sink_cb.worker_thread.DoInThread( FROM_HERE, base::BindOnce(btif_a2dp_sink_start_session_delayed, std::move(peer_ready_promise)))) { return true; } else { // cannot set promise but triggers crash - log::fatal("peer_address={} fails to context switch", - ADDRESS_TO_LOGGABLE_STR(peer_address)); + log::fatal("peer_address={} fails to context switch", peer_address); return false; } } @@ -248,9 +247,8 @@ static void btif_a2dp_sink_start_session_delayed( bool btif_a2dp_sink_restart_session(const RawAddress& old_peer_address, const RawAddress& new_peer_address, std::promise<void> peer_ready_promise) { - log::info("old_peer_address={} new_peer_address={}", - ADDRESS_TO_LOGGABLE_STR(old_peer_address), - ADDRESS_TO_LOGGABLE_STR(new_peer_address)); + log::info("old_peer_address={} new_peer_address={}", old_peer_address, + new_peer_address); log::assert_that(!new_peer_address.IsEmpty(), "assert failed: !new_peer_address.IsEmpty()"); @@ -261,14 +259,14 @@ bool btif_a2dp_sink_restart_session(const RawAddress& old_peer_address, if (IS_FLAG_ENABLED(a2dp_concurrent_source_sink)) { if (!bta_av_co_set_active_sink_peer(new_peer_address)) { log::error("Cannot stream audio: cannot set active peer to {}", - ADDRESS_TO_LOGGABLE_STR(new_peer_address)); + new_peer_address); peer_ready_promise.set_value(); return false; } } else { if (!bta_av_co_set_active_peer(new_peer_address)) { log::error("Cannot stream audio: cannot set active peer to {}", - ADDRESS_TO_LOGGABLE_STR(new_peer_address)); + new_peer_address); peer_ready_promise.set_value(); return false; } @@ -283,7 +281,7 @@ bool btif_a2dp_sink_restart_session(const RawAddress& old_peer_address, } bool btif_a2dp_sink_end_session(const RawAddress& peer_address) { - log::info("peer_address={}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::info("peer_address={}", peer_address); btif_a2dp_sink_cb.worker_thread.DoInThread( FROM_HERE, base::BindOnce(btif_a2dp_sink_end_session_delayed)); return true; diff --git a/system/btif/src/btif_a2dp_source.cc b/system/btif/src/btif_a2dp_source.cc index 68689e80ea..7195342010 100644 --- a/system/btif/src/btif_a2dp_source.cc +++ b/system/btif/src/btif_a2dp_source.cc @@ -389,7 +389,7 @@ static void btif_a2dp_source_startup_delayed() { bool btif_a2dp_source_start_session(const RawAddress& peer_address, std::promise<void> peer_ready_promise) { - log::info("peer_address={} state={}", ADDRESS_TO_LOGGABLE_STR(peer_address), + log::info("peer_address={} state={}", peer_address, btif_a2dp_source_cb.StateStr()); btif_a2dp_source_setup_codec(peer_address); if (btif_a2dp_source_thread.DoInThread( @@ -399,8 +399,7 @@ bool btif_a2dp_source_start_session(const RawAddress& peer_address, return true; } else { // cannot set promise but triggers crash - log::fatal("peer_address={} state={} fails to context switch", - ADDRESS_TO_LOGGABLE_STR(peer_address), + log::fatal("peer_address={} state={} fails to context switch", peer_address, btif_a2dp_source_cb.StateStr()); return false; } @@ -408,7 +407,7 @@ bool btif_a2dp_source_start_session(const RawAddress& peer_address, static void btif_a2dp_source_start_session_delayed( const RawAddress& peer_address, std::promise<void> peer_ready_promise) { - log::info("peer_address={} state={}", ADDRESS_TO_LOGGABLE_STR(peer_address), + log::info("peer_address={} state={}", peer_address, btif_a2dp_source_cb.StateStr()); if (btif_a2dp_source_cb.State() != BtifA2dpSource::kStateRunning) { log::error("A2DP Source media task is not running"); @@ -432,9 +431,7 @@ bool btif_a2dp_source_restart_session(const RawAddress& old_peer_address, const RawAddress& new_peer_address, std::promise<void> peer_ready_promise) { log::info("old_peer_address={} new_peer_address={} state={}", - ADDRESS_TO_LOGGABLE_STR(old_peer_address), - ADDRESS_TO_LOGGABLE_STR(new_peer_address), - btif_a2dp_source_cb.StateStr()); + old_peer_address, new_peer_address, btif_a2dp_source_cb.StateStr()); log::assert_that(!new_peer_address.IsEmpty(), "assert failed: !new_peer_address.IsEmpty()"); @@ -459,7 +456,7 @@ bool btif_a2dp_source_restart_session(const RawAddress& old_peer_address, } bool btif_a2dp_source_end_session(const RawAddress& peer_address) { - log::info("peer_address={} state={}", ADDRESS_TO_LOGGABLE_CSTR(peer_address), + log::info("peer_address={} state={}", peer_address, btif_a2dp_source_cb.StateStr()); btif_a2dp_source_thread.DoInThread( FROM_HERE, @@ -470,7 +467,7 @@ bool btif_a2dp_source_end_session(const RawAddress& peer_address) { static void btif_a2dp_source_end_session_delayed( const RawAddress& peer_address) { - log::info("peer_address={} state={}", ADDRESS_TO_LOGGABLE_CSTR(peer_address), + log::info("peer_address={} state={}", peer_address, btif_a2dp_source_cb.StateStr()); if ((btif_a2dp_source_cb.State() == BtifA2dpSource::kStateRunning) || (btif_a2dp_source_cb.State() == BtifA2dpSource::kStateShuttingDown)) { @@ -558,7 +555,7 @@ bool btif_a2dp_source_is_streaming(void) { } static void btif_a2dp_source_setup_codec(const RawAddress& peer_address) { - log::info("peer_address={} state={}", ADDRESS_TO_LOGGABLE_CSTR(peer_address), + log::info("peer_address={} state={}", peer_address, btif_a2dp_source_cb.StateStr()); // Check to make sure the platform has 8 bits/byte since @@ -573,7 +570,7 @@ static void btif_a2dp_source_setup_codec(const RawAddress& peer_address) { static void btif_a2dp_source_setup_codec_delayed( const RawAddress& peer_address) { - log::info("peer_address={} state={}", ADDRESS_TO_LOGGABLE_CSTR(peer_address), + log::info("peer_address={} state={}", peer_address, btif_a2dp_source_cb.StateStr()); tA2DP_ENCODER_INIT_PEER_PARAMS peer_params; @@ -581,13 +578,13 @@ static void btif_a2dp_source_setup_codec_delayed( if (IS_FLAG_ENABLED(a2dp_concurrent_source_sink)) { if (!bta_av_co_set_active_source_peer(peer_address)) { log::error("Cannot stream audio: cannot set active peer to {}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + peer_address); return; } } else { if (!bta_av_co_set_active_peer(peer_address)) { log::error("Cannot stream audio: cannot set active peer to {}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + peer_address); return; } } @@ -650,8 +647,7 @@ void btif_a2dp_source_encoder_user_config_update_req( const RawAddress& peer_address, const std::vector<btav_a2dp_codec_config_t>& codec_user_preferences, std::promise<void> peer_ready_promise) { - log::info("peer_address={} state={} {} codec_preference(s)", - ADDRESS_TO_LOGGABLE_STR(peer_address), + log::info("peer_address={} state={} {} codec_preference(s)", peer_address, btif_a2dp_source_cb.StateStr(), codec_user_preferences.size()); if (!btif_a2dp_source_thread.DoInThread( FROM_HERE, @@ -659,8 +655,7 @@ void btif_a2dp_source_encoder_user_config_update_req( peer_address, codec_user_preferences, std::move(peer_ready_promise)))) { // cannot set promise but triggers crash - log::fatal("peer_address={} state={} fails to context switch", - ADDRESS_TO_LOGGABLE_STR(peer_address), + log::fatal("peer_address={} state={} fails to context switch", peer_address, btif_a2dp_source_cb.StateStr()); } } @@ -677,7 +672,7 @@ static void btif_a2dp_source_encoder_user_config_update_event( if (success) { log::info( "peer_address={} state={} codec_preference=[{}] restart_output={}", - ADDRESS_TO_LOGGABLE_STR(peer_address), btif_a2dp_source_cb.StateStr(), + peer_address, btif_a2dp_source_cb.StateStr(), codec_user_config.ToString(), (restart_output ? "true" : "false")); break; } @@ -1397,8 +1392,7 @@ static void btm_read_rssi_cb(void* data) { bluetooth::common::kUnknownConnectionHandle, result->hci_status, result->rssi); - log::warn("device: {}, rssi: {}", ADDRESS_TO_LOGGABLE_CSTR(result->rem_bda), - result->rssi); + log::warn("device: {}, rssi: {}", result->rem_bda, result->rssi); } static void btm_read_failed_contact_counter_cb(void* data) { @@ -1418,8 +1412,7 @@ static void btm_read_failed_contact_counter_cb(void* data) { result->rem_bda, bluetooth::common::kUnknownConnectionHandle, result->hci_status, result->failed_contact_counter); - log::warn("device: {}, Failed Contact Counter: {}", - ADDRESS_TO_LOGGABLE_CSTR(result->rem_bda), + log::warn("device: {}, Failed Contact Counter: {}", result->rem_bda, result->failed_contact_counter); } @@ -1438,6 +1431,5 @@ static void btm_read_tx_power_cb(void* data) { bluetooth::common::kUnknownConnectionHandle, result->hci_status, result->tx_power); - log::warn("device: {}, Tx Power: {}", - ADDRESS_TO_LOGGABLE_CSTR(result->rem_bda), result->tx_power); + log::warn("device: {}, Tx Power: {}", result->rem_bda, result->tx_power); } diff --git a/system/btif/src/btif_av.cc b/system/btif/src/btif_av.cc index 771ccd2e18..5de6116bf4 100644 --- a/system/btif/src/btif_av.cc +++ b/system/btif/src/btif_av.cc @@ -481,7 +481,7 @@ class BtifAvSource { if (peer_address.IsEmpty()) { return false; } - log::info("peer: {}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::info("peer: {}", peer_address); BtifAvPeer* peer = FindPeer(peer_address); if (peer == nullptr) { log::warn("peer is null"); @@ -504,7 +504,7 @@ class BtifAvSource { */ bool SetActivePeer(const RawAddress& peer_address, std::promise<void> peer_ready_promise) { - log::info("peer: {}", ADDRESS_TO_LOGGABLE_STR(peer_address)); + log::info("peer: {}", peer_address); if (active_peer_ == peer_address) { peer_ready_promise.set_value(); @@ -547,8 +547,7 @@ class BtifAvSource { } BtifAvPeer* peer = FindPeer(peer_address); if (peer == nullptr || !peer->IsConnected()) { - log::error("Error setting {} as active Source peer", - ADDRESS_TO_LOGGABLE_STR(peer_address)); + log::error("Error setting {} as active Source peer", peer_address); peer_ready_promise.set_value(); return false; } @@ -696,7 +695,7 @@ class BtifAvSink { */ bool SetActivePeer(const RawAddress& peer_address, std::promise<void> peer_ready_promise) { - log::info("peer: {}", ADDRESS_TO_LOGGABLE_STR(peer_address)); + log::info("peer: {}", peer_address); if (active_peer_ == peer_address) { peer_ready_promise.set_value(); @@ -731,8 +730,7 @@ class BtifAvSink { } BtifAvPeer* peer = FindPeer(peer_address); if (peer == nullptr || !peer->IsConnected()) { - log::error("Error setting {} as active Sink peer", - ADDRESS_TO_LOGGABLE_STR(peer_address)); + log::error("Error setting {} as active Sink peer", peer_address); peer_ready_promise.set_value(); return false; } @@ -742,8 +740,7 @@ class BtifAvSink { // cannot set promise but need to be handled within restart_session return false; } - log::info("Setting the active peer to peer address {}", - ADDRESS_TO_LOGGABLE_STR(peer_address)); + log::info("Setting the active peer to peer address {}", peer_address); active_peer_ = peer_address; return true; } @@ -876,8 +873,7 @@ static BtifAvPeer* btif_av_find_peer(const RawAddress& peer_address, return sinkPeer; } } - log::info("Unable to find the peer {}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::info("Unable to find the peer {}", peer_address); return nullptr; } if (btif_av_src_sink_coexist_enabled() && btif_av_both_enable()) { @@ -1159,12 +1155,10 @@ const RawAddress& BtifAvPeer::ActivePeerAddress() const { if (btif_av_src_sink_coexist_enabled() && btif_av_both_enable()) { RawAddress addr = btif_av_sink.ActivePeer(); if (RawAddress::kEmpty == addr) { - log::warn("A2DP peer {} is Sink", - ADDRESS_TO_LOGGABLE_STR(btif_av_source.ActivePeer())); + log::warn("A2DP peer {} is Sink", btif_av_source.ActivePeer()); return btif_av_source.ActivePeer(); } - log::warn("A2DP peer {} is Source", - ADDRESS_TO_LOGGABLE_STR(btif_av_sink.ActivePeer())); + log::warn("A2DP peer {} is Source", btif_av_sink.ActivePeer()); return btif_av_sink.ActivePeer(); } } @@ -1175,8 +1169,7 @@ const RawAddress& BtifAvPeer::ActivePeerAddress() const { return btif_av_source.ActivePeer(); } - log::fatal("A2DP peer {} is neither Source nor Sink", - ADDRESS_TO_LOGGABLE_STR(PeerAddress())); + log::fatal("A2DP peer {} is neither Source nor Sink", PeerAddress()); return RawAddress::kEmpty; } @@ -1277,8 +1270,7 @@ BtifAvPeer* BtifAvSource::FindPeerByPeerId(uint8_t peer_id) { BtifAvPeer* BtifAvSource::FindOrCreatePeer(const RawAddress& peer_address, tBTA_AV_HNDL bta_handle) { std::unique_lock<std::mutex> lock1(mutex_); - log::verbose("peer_address={} bta_handle=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_handle); + log::verbose("peer_address={} bta_handle=0x{:x}", peer_address, bta_handle); BtifAvPeer* peer = FindPeer(peer_address); if (peer != nullptr) return peer; @@ -1299,7 +1291,7 @@ BtifAvPeer* BtifAvSource::FindOrCreatePeer(const RawAddress& peer_address, log::error( "Cannot create peer for peer_address={} : cannot allocate unique Peer " "ID", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + peer_address); return nullptr; } @@ -1310,14 +1302,14 @@ BtifAvPeer* BtifAvSource::FindOrCreatePeer(const RawAddress& peer_address, log::error( "Cannot create peer for peer_address={} : cannot convert Peer ID={} " "to unique BTA Handle", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), peer_id); + peer_address, peer_id); return nullptr; } bta_handle = it->second; } log::info("Create peer: peer_address={} bta_handle=0x{:x} peer_id={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_handle, peer_id); + peer_address, bta_handle, peer_id); peer = new BtifAvPeer(peer_address, AVDT_TSEP_SNK, bta_handle, peer_id); peers_.insert(std::make_pair(peer_address, peer)); peer->Init(); @@ -1394,8 +1386,8 @@ void BtifAvSource::DeleteIdlePeers() { BtifAvPeer* peer = it->second; auto prev_it = it++; if (!peer->CanBeDeleted()) continue; - log::info("Deleting idle peer: {} bta_handle=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), peer->BtaHandle()); + log::info("Deleting idle peer: {} bta_handle=0x{:x}", peer->PeerAddress(), + peer->BtaHandle()); peer->Cleanup(); peers_.erase(prev_it); delete peer; @@ -1436,13 +1428,11 @@ void BtifAvSource::BtaHandleRegistered(uint8_t peer_id, if (peer != nullptr && peer->BtaHandle() != bta_handle) { if (peer->BtaHandle() == kBtaHandleUnknown) { log::verbose("Assign peer: peer_address={} bta_handle=0x{:x} peer_id={}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), bta_handle, - peer_id); + peer->PeerAddress(), bta_handle, peer_id); } else { log::warn( "Correct peer: peer_address={} bta_handle=0x{:x}->0x{:x} peer_id={}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), peer->BtaHandle(), - bta_handle, peer_id); + peer->PeerAddress(), peer->BtaHandle(), bta_handle, peer_id); } peer->SetBtaHandle(bta_handle); } @@ -1453,15 +1443,13 @@ BtifAvPeer* BtifAvSource::popPeer(const RawAddress& peer_address) { if (it == peers_.end()) return nullptr; BtifAvPeer* peer = it->second; peers_.erase(it); - log::info("peer_address={}, state={}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), + log::info("peer_address={}, state={}", peer->PeerAddress(), peer->StateMachine().StateId()); return peer; } void BtifAvSource::AddPeer(BtifAvPeer* peer) { - log::info("peer_address={}, state={}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), + log::info("peer_address={}, state={}", peer->PeerAddress(), peer->StateMachine().StateId()); peers_.insert(std::make_pair(peer->PeerAddress(), peer)); } @@ -1542,8 +1530,7 @@ BtifAvPeer* BtifAvSink::FindPeerByPeerId(uint8_t peer_id) { BtifAvPeer* BtifAvSink::FindOrCreatePeer(const RawAddress& peer_address, tBTA_AV_HNDL bta_handle) { - log::verbose("peer_address={} bta_handle=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_handle); + log::verbose("peer_address={} bta_handle=0x{:x}", peer_address, bta_handle); BtifAvPeer* peer = FindPeer(peer_address); if (peer != nullptr) return peer; @@ -1565,7 +1552,7 @@ BtifAvPeer* BtifAvSink::FindOrCreatePeer(const RawAddress& peer_address, log::error( "Cannot create peer for peer_address={} : cannot allocate unique Peer " "ID", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + peer_address); return nullptr; } @@ -1576,14 +1563,14 @@ BtifAvPeer* BtifAvSink::FindOrCreatePeer(const RawAddress& peer_address, log::error( "Cannot create peer for peer_address={} : cannot convert Peer ID={} " "to unique BTA Handle", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), peer_id); + peer_address, peer_id); return nullptr; } bta_handle = it->second; } log::info("Create peer: peer_address={} bta_handle=0x{:x} peer_id={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_handle, peer_id); + peer_address, bta_handle, peer_id); peer = new BtifAvPeer(peer_address, AVDT_TSEP_SRC, bta_handle, peer_id); peers_.insert(std::make_pair(peer_address, peer)); peer->Init(); @@ -1622,9 +1609,8 @@ bool BtifAvSink::AllowedToConnect(const RawAddress& peer_address) const { (peer->PeerAddress() != peer_address)) { log::info( "there is another peer with audio track({}), another={}, peer={}", - fmt::ptr(btif_a2dp_sink_get_audio_track()), - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + fmt::ptr(btif_a2dp_sink_get_audio_track()), peer->PeerAddress(), + peer_address); connected++; } break; @@ -1665,8 +1651,8 @@ void BtifAvSink::DeleteIdlePeers() { BtifAvPeer* peer = it->second; auto prev_it = it++; if (!peer->CanBeDeleted()) continue; - log::info("Deleting idle peer: {} bta_handle=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), peer->BtaHandle()); + log::info("Deleting idle peer: {} bta_handle=0x{:x}", peer->PeerAddress(), + peer->BtaHandle()); peer->Cleanup(); peers_.erase(prev_it); delete peer; @@ -1706,13 +1692,11 @@ void BtifAvSink::BtaHandleRegistered(uint8_t peer_id, tBTA_AV_HNDL bta_handle) { if (peer != nullptr && peer->BtaHandle() != bta_handle) { if (peer->BtaHandle() == kBtaHandleUnknown) { log::verbose("Assign peer: peer_address={} bta_handle=0x{:x} peer_id={}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), bta_handle, - peer_id); + peer->PeerAddress(), bta_handle, peer_id); } else { log::warn( "Correct peer: peer_address={} bta_handle=0x{:x}->0x{:x} peer_id={}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), peer->BtaHandle(), - bta_handle, peer_id); + peer->PeerAddress(), peer->BtaHandle(), bta_handle, peer_id); } peer->SetBtaHandle(bta_handle); } @@ -1723,21 +1707,19 @@ BtifAvPeer* BtifAvSink::popPeer(const RawAddress& peer_address) { if (it == peers_.end()) return nullptr; BtifAvPeer* peer = it->second; peers_.erase(it); - log::info("peer_address={}, state={}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), + log::info("peer_address={}, state={}", peer->PeerAddress(), peer->StateMachine().StateId()); return peer; } void BtifAvSink::AddPeer(BtifAvPeer* peer) { - log::info("peer_address={}, state={}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), + log::info("peer_address={}, state={}", peer->PeerAddress(), peer->StateMachine().StateId()); peers_.insert(std::make_pair(peer->PeerAddress(), peer)); } void BtifAvStateMachine::StateIdle::OnEnter() { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::verbose("Peer {}", peer_.PeerAddress()); peer_.SetEdr(0); peer_.ClearAllFlags(); @@ -1774,14 +1756,13 @@ void BtifAvStateMachine::StateIdle::OnEnter() { } void BtifAvStateMachine::StateIdle::OnExit() { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::verbose("Peer {}", peer_.PeerAddress()); } bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { log::verbose("Peer {} : event={} flags={} active_peer={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), peer_.FlagsToString(), - peer_.IsActivePeer()); + peer_.PeerAddress(), BtifAvEvent::EventName(event), + peer_.FlagsToString(), peer_.IsActivePeer()); switch (event) { case BTA_AV_ENABLE_EVT: @@ -1819,7 +1800,7 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { } if (!can_connect) { log::error("Cannot connect to peer {}: too many connected peers", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + peer_.PeerAddress()); if (peer_.SelfInitiatedConnection()) { btif_queue_advance(); } @@ -1853,8 +1834,7 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { // connection first and then immediately initiate the AV connection // // TODO: We may need to do this only on an AVRCP Play. FixMe - log::warn("Peer {} : event={} received without AV", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::warn("Peer {} : event={} received without AV", peer_.PeerAddress(), BtifAvEvent::EventName(event)); bool can_connect = true; @@ -1863,7 +1843,7 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { can_connect = btif_av_source.AllowedToConnect(peer_.PeerAddress()); if (!can_connect) { log::error("Source profile doesn't allow connection to peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + peer_.PeerAddress()); if (btif_av_src_sink_coexist_enabled()) BTA_AvCloseRc(((tBTA_AV*)p_data)->rc_open.rc_handle); else @@ -1873,7 +1853,7 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { can_connect = btif_av_sink.AllowedToConnect(peer_.PeerAddress()); if (!can_connect) { log::error("Sink profile doesn't allow connection to peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + peer_.PeerAddress()); if (btif_av_src_sink_coexist_enabled()) BTA_AvCloseRc(((tBTA_AV*)p_data)->rc_open.rc_handle); else @@ -1882,7 +1862,7 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { } if (!can_connect) { log::error("Cannot connect to peer {}: too many connected peers", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + peer_.PeerAddress()); break; } /* if peer is source, then start timer for sink connect to src */ @@ -1933,8 +1913,8 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { bool can_connect = true; log::info("Peer {} : event={} flags={} status={}({}) edr=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), peer_.FlagsToString(), status, + peer_.PeerAddress(), BtifAvEvent::EventName(event), + peer_.FlagsToString(), status, (status == BTA_AV_SUCCESS) ? "SUCCESS" : "FAILED", p_bta_data->open.edr); @@ -1946,8 +1926,7 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { if (p_bta_data->open.status == BTA_AV_SUCCESS) { peer_.SetEdr(p_bta_data->open.edr); if (btif_av_src_sink_coexist_enabled()) { - log::verbose("Peer {} sep={}, open_sep={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::verbose("Peer {} sep={}, open_sep={}", peer_.PeerAddress(), peer_.PeerSep(), p_bta_data->open.sep); /* if peer is wrong sep type, move it to BtifAvSxxx */ if (!IS_FLAG_ENABLED(a2dp_concurrent_source_sink)) { @@ -1994,7 +1973,7 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { if (!can_connect) { log::error("Cannot connect to peer {}: too many connected peers", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + peer_.PeerAddress()); if (peer_.IsSink()) { src_disconnect_sink(peer_.PeerAddress()); @@ -2048,8 +2027,7 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { case BTIF_AV_AVRCP_CLOSE_EVT: case BTA_AV_RC_CLOSE_EVT: { log::verbose("Peer {} : event={} : Stopping AV timer", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event)); + peer_.PeerAddress(), BtifAvEvent::EventName(event)); alarm_cancel(peer_.AvOpenOnRcTimer()); if (event == BTA_AV_RC_CLOSE_EVT) { @@ -2059,14 +2037,12 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { case BTIF_AV_OFFLOAD_START_REQ_EVT: log::error("Peer {} : event={}: stream is not Opened", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event)); + peer_.PeerAddress(), BtifAvEvent::EventName(event)); btif_a2dp_on_offload_started(peer_.PeerAddress(), BTA_AV_FAIL); break; default: - log::warn("Peer {} : Unhandled event={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::warn("Peer {} : Unhandled event={}", peer_.PeerAddress(), BtifAvEvent::EventName(event)); return false; } @@ -2075,7 +2051,7 @@ bool BtifAvStateMachine::StateIdle::ProcessEvent(uint32_t event, void* p_data) { } void BtifAvStateMachine::StateOpening::OnEnter() { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::verbose("Peer {}", peer_.PeerAddress()); // Inform the application that we are entering connecting state if (btif_av_both_enable()) { @@ -2089,15 +2065,14 @@ void BtifAvStateMachine::StateOpening::OnEnter() { } void BtifAvStateMachine::StateOpening::OnExit() { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::verbose("Peer {}", peer_.PeerAddress()); } bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, void* p_data) { log::verbose("Peer {} : event={} flags={} active_peer={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), peer_.FlagsToString(), - peer_.IsActivePeer()); + peer_.PeerAddress(), BtifAvEvent::EventName(event), + peer_.FlagsToString(), peer_.IsActivePeer()); switch (event) { case BTIF_AV_STOP_STREAM_REQ_EVT: @@ -2110,8 +2085,7 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, // incoming/outgoing connect/disconnect requests. log::warn( "Peer {} : event={}: transitioning to Idle due to ACL Disconnect", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event)); + peer_.PeerAddress(), BtifAvEvent::EventName(event)); log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum:: A2DP_CONNECTION_ACL_DISCONNECTED, 1); @@ -2125,8 +2099,7 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, } break; case BTA_AV_REJECT_EVT: - log::warn("Peer {} : event={} flags={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::warn("Peer {} : event={} flags={}", peer_.PeerAddress(), BtifAvEvent::EventName(event), peer_.FlagsToString()); log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum:: A2DP_CONNECTION_REJECT_EVT, @@ -2147,8 +2120,8 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, tBTA_AV_STATUS status = p_bta_data->open.status; log::info("Peer {} : event={} flags={} status={}({}) edr=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), peer_.FlagsToString(), status, + peer_.PeerAddress(), BtifAvEvent::EventName(event), + peer_.FlagsToString(), status, (status == BTA_AV_SUCCESS) ? "SUCCESS" : "FAILED", p_bta_data->open.edr); @@ -2156,8 +2129,7 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, av_state = BtifAvStateMachine::kStateOpened; peer_.SetEdr(p_bta_data->open.edr); if (btif_av_src_sink_coexist_enabled()) { - log::verbose("Peer {} sep={}, open_sep={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::verbose("Peer {} sep={}, open_sep={}", peer_.PeerAddress(), peer_.PeerSep(), p_bta_data->open.sep); /* if peer is wrong sep type, move it to BtifAvSxxx */ if (!IS_FLAG_ENABLED(a2dp_concurrent_source_sink)) { @@ -2227,8 +2199,7 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, if (btif_rc_is_connected_peer(peer_.PeerAddress())) { // Disconnect the AVRCP connection, in case the A2DP connectiton // failed for any reason. - log::warn("Peer {} : Disconnecting AVRCP", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::warn("Peer {} : Disconnecting AVRCP", peer_.PeerAddress()); uint8_t peer_handle = btif_rc_get_connected_peer_handle(peer_.PeerAddress()); if (peer_handle != BTRC_HANDLE_NONE) { @@ -2290,8 +2261,7 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, log::warn( "Peer {} : event={} : device is already connecting, ignore Connect " "request", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event)); + peer_.PeerAddress(), BtifAvEvent::EventName(event)); log_counter_metrics_btif( android::bluetooth::CodePathCounterKeyEnum::A2DP_ALREADY_CONNECTING, 1); @@ -2304,8 +2274,7 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, log::warn( "Peer {} : event={} : device is already connecting, ignore incoming " "request", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event)); + peer_.PeerAddress(), BtifAvEvent::EventName(event)); log_counter_metrics_btif( android::bluetooth::CodePathCounterKeyEnum::A2DP_ALREADY_CONNECTING, 1); @@ -2313,8 +2282,7 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, case BTIF_AV_OFFLOAD_START_REQ_EVT: log::error("Peer {} : event={}: stream is not Opened", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event)); + peer_.PeerAddress(), BtifAvEvent::EventName(event)); btif_a2dp_on_offload_started(peer_.PeerAddress(), BTA_AV_FAIL); log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum:: A2DP_OFFLOAD_START_REQ_FAILURE, @@ -2361,8 +2329,7 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum:: A2DP_CONNECTION_UNKNOWN_EVENT, 1); - log::warn("Peer {} : Unhandled event={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::warn("Peer {} : Unhandled event={}", peer_.PeerAddress(), BtifAvEvent::EventName(event)); return false; } @@ -2370,7 +2337,7 @@ bool BtifAvStateMachine::StateOpening::ProcessEvent(uint32_t event, } void BtifAvStateMachine::StateOpened::OnEnter() { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::verbose("Peer {}", peer_.PeerAddress()); peer_.ClearFlags(BtifAvPeer::kFlagLocalSuspendPending | BtifAvPeer::kFlagPendingStart | @@ -2385,14 +2352,13 @@ void BtifAvStateMachine::StateOpened::OnEnter() { std::promise<void> peer_ready_promise; if (!btif_av_sink.SetActivePeer(peer_.PeerAddress(), std::move(peer_ready_promise))) { - log::error("Error setting {} as active Source peer", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::error("Error setting {} as active Source peer", peer_.PeerAddress()); } } } void BtifAvStateMachine::StateOpened::OnExit() { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::verbose("Peer {}", peer_.PeerAddress()); peer_.ClearFlags(BtifAvPeer::kFlagPendingStart); } @@ -2402,15 +2368,14 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, tBTA_AV* p_av = (tBTA_AV*)p_data; log::verbose("Peer {} : event={} flags={} active_peer={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), peer_.FlagsToString(), - peer_.IsActivePeer()); + peer_.PeerAddress(), BtifAvEvent::EventName(event), + peer_.FlagsToString(), peer_.IsActivePeer()); if ((event == BTA_AV_REMOTE_CMD_EVT) && peer_.CheckFlags(BtifAvPeer::kFlagRemoteSuspend) && (p_av->remote_cmd.rc_id == AVRC_ID_PLAY)) { log::verbose("Peer {} : Resetting remote suspend flag on RC PLAY", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + peer_.PeerAddress()); peer_.ClearFlags(BtifAvPeer::kFlagRemoteSuspend); } @@ -2421,8 +2386,7 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, break; // Ignore case BTIF_AV_START_STREAM_REQ_EVT: { - log::info("Peer {} : event={} flags={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::info("Peer {} : event={} flags={}", peer_.PeerAddress(), BtifAvEvent::EventName(event), peer_.FlagsToString()); if (p_data) { const btif_av_start_stream_req_t* p_start_steam_req = @@ -2439,9 +2403,9 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, case BTA_AV_START_EVT: { log::info( "Peer {} : event={} status={} suspending={} initiator={} flags={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), p_av->start.status, - p_av->start.suspending, p_av->start.initiator, peer_.FlagsToString()); + peer_.PeerAddress(), BtifAvEvent::EventName(event), + p_av->start.status, p_av->start.suspending, p_av->start.initiator, + peer_.FlagsToString()); if ((p_av->start.status == BTA_SUCCESS) && p_av->start.suspending) return true; @@ -2454,11 +2418,11 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, if (!peer_.CheckFlags(BtifAvPeer::kFlagPendingStart | BtifAvPeer::kFlagRemoteSuspend)) { log::warn("Peer {} : trigger Suspend as remote initiated", - ADDRESS_TO_LOGGABLE_STR(peer_.PeerAddress())); + peer_.PeerAddress()); should_suspend = true; } else if (!peer_.IsActivePeer()) { log::warn("Peer {} : trigger Suspend as non-active", - ADDRESS_TO_LOGGABLE_STR(peer_.PeerAddress())); + peer_.PeerAddress()); should_suspend = true; } @@ -2515,7 +2479,7 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, // Change state to Idle, send acknowledgement if start is pending if (peer_.CheckFlags(BtifAvPeer::kFlagPendingStart)) { log::warn("Peer {} : failed pending start request", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + peer_.PeerAddress()); tBTA_AV_START av_start = {.chnl = p_av->close.chnl, .hndl = p_av->close.hndl, .status = BTA_AV_FAIL_STREAM, @@ -2540,11 +2504,10 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, case BTA_AV_RECONFIG_EVT: if (p_av->reconfig.status != BTA_AV_SUCCESS) { - log::warn("Peer {} : failed reconfiguration", - ADDRESS_TO_LOGGABLE_STR(peer_.PeerAddress())); + log::warn("Peer {} : failed reconfiguration", peer_.PeerAddress()); if (peer_.CheckFlags(BtifAvPeer::kFlagPendingStart)) { log::error("Peer {} : cannot proceed to do AvStart", - ADDRESS_TO_LOGGABLE_STR(peer_.PeerAddress())); + peer_.PeerAddress()); peer_.ClearFlags(BtifAvPeer::kFlagPendingStart); btif_a2dp_command_ack(A2DP_CTRL_ACK_FAILURE); } @@ -2559,7 +2522,7 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, if (peer_.IsActivePeer()) { log::info( "Peer {} : Reconfig done - calling startSession() to audio HAL", - ADDRESS_TO_LOGGABLE_STR(peer_.PeerAddress())); + peer_.PeerAddress()); std::promise<void> peer_ready_promise; std::future<void> peer_ready_future = peer_ready_promise.get_future(); btif_a2dp_source_start_session(peer_.PeerAddress(), @@ -2567,30 +2530,27 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, } if (peer_.CheckFlags(BtifAvPeer::kFlagPendingStart)) { log::info("Peer {} : Reconfig done - calling BTA_AvStart({})", - ADDRESS_TO_LOGGABLE_STR(peer_.PeerAddress()), - loghex(peer_.BtaHandle())); + peer_.PeerAddress(), loghex(peer_.BtaHandle())); BTA_AvStart(peer_.BtaHandle(), peer_.UseLatencyMode()); } break; case BTIF_AV_CONNECT_REQ_EVT: { - log::warn("Peer {} : Ignore {} for same device", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::warn("Peer {} : Ignore {} for same device", peer_.PeerAddress(), BtifAvEvent::EventName(event)); btif_queue_advance(); } break; case BTIF_AV_OFFLOAD_START_REQ_EVT: log::error("Peer {} : event={}: stream is not Started", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event)); + peer_.PeerAddress(), BtifAvEvent::EventName(event)); btif_a2dp_on_offload_started(peer_.PeerAddress(), BTA_AV_FAIL); break; case BTIF_AV_AVRCP_REMOTE_PLAY_EVT: if (peer_.CheckFlags(BtifAvPeer::kFlagRemoteSuspend)) { log::verbose("Peer {} : Resetting remote suspend flag on RC PLAY", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + peer_.PeerAddress()); peer_.ClearFlags(BtifAvPeer::kFlagRemoteSuspend); } break; @@ -2601,16 +2561,15 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, const btif_av_set_latency_req_t* p_set_latency_req = static_cast<const btif_av_set_latency_req_t*>(p_data); log::info("Peer {} : event={} flags={} is_low_latency={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), peer_.FlagsToString(), + peer_.PeerAddress(), BtifAvEvent::EventName(event), + peer_.FlagsToString(), p_set_latency_req->is_low_latency ? "true" : "false"); BTA_AvSetLatency(peer_.BtaHandle(), p_set_latency_req->is_low_latency); } break; default: - log::warn("Peer {} : Unhandled event={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::warn("Peer {} : Unhandled event={}", peer_.PeerAddress(), BtifAvEvent::EventName(event)); return false; } @@ -2618,7 +2577,7 @@ bool BtifAvStateMachine::StateOpened::ProcessEvent(uint32_t event, } void BtifAvStateMachine::StateStarted::OnEnter() { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::verbose("Peer {}", peer_.PeerAddress()); // We are again in started state, clear any remote suspend flags peer_.ClearFlags(BtifAvPeer::kFlagRemoteSuspend); @@ -2633,7 +2592,7 @@ void BtifAvStateMachine::StateStarted::OnEnter() { } void BtifAvStateMachine::StateStarted::OnExit() { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::verbose("Peer {}", peer_.PeerAddress()); } bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, @@ -2641,17 +2600,15 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, tBTA_AV* p_av = (tBTA_AV*)p_data; log::verbose("Peer {} : event={} flags={} active_peer={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), peer_.FlagsToString(), - peer_.IsActivePeer()); + peer_.PeerAddress(), BtifAvEvent::EventName(event), + peer_.FlagsToString(), peer_.IsActivePeer()); switch (event) { case BTIF_AV_ACL_DISCONNECTED: break; // Ignore case BTIF_AV_START_STREAM_REQ_EVT: - log::info("Peer {} : event={} flags={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::info("Peer {} : event={} flags={}", peer_.PeerAddress(), BtifAvEvent::EventName(event), peer_.FlagsToString()); // We were started remotely, just ACK back the local request if (peer_.IsSink()) @@ -2663,8 +2620,7 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, // FIXME -- use suspend = true always to work around issue with BTA AV case BTIF_AV_STOP_STREAM_REQ_EVT: case BTIF_AV_SUSPEND_STREAM_REQ_EVT: - log::info("Peer {} : event={} flags={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::info("Peer {} : event={} flags={}", peer_.PeerAddress(), BtifAvEvent::EventName(event), peer_.FlagsToString()); // There is a pending LocalSuspend already, ignore. @@ -2699,8 +2655,7 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, break; case BTIF_AV_DISCONNECT_REQ_EVT: - log::info("Peer {} : event={} flags={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::info("Peer {} : event={} flags={}", peer_.PeerAddress(), BtifAvEvent::EventName(event), peer_.FlagsToString()); // Request AVDTP to close @@ -2721,9 +2676,9 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, case BTA_AV_SUSPEND_EVT: { log::info("Peer {} : event={} status={} initiator={} flags={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), p_av->suspend.status, - p_av->suspend.initiator, peer_.FlagsToString()); + peer_.PeerAddress(), BtifAvEvent::EventName(event), + p_av->suspend.status, p_av->suspend.initiator, + peer_.FlagsToString()); // A2DP suspended, stop A2DP encoder / decoder until resumed if (peer_.IsActivePeer() || @@ -2766,8 +2721,7 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, } break; case BTA_AV_STOP_EVT: - log::info("Peer {} : event={} flags={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::info("Peer {} : event={} flags={}", peer_.PeerAddress(), BtifAvEvent::EventName(event), peer_.FlagsToString()); peer_.SetFlags(BtifAvPeer::kFlagPendingStop); @@ -2794,8 +2748,7 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, break; case BTA_AV_CLOSE_EVT: - log::info("Peer {} : event={} flags={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::info("Peer {} : event={} flags={}", peer_.PeerAddress(), BtifAvEvent::EventName(event), peer_.FlagsToString()); // Inform the application that we are disconnecting btif_report_connection_state( @@ -2825,8 +2778,8 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, BtifAvPeer::kFlagRemoteSuspend | BtifAvPeer::kFlagPendingStop)) { log::warn("Peer {} : event={} flags={}: stream is Suspending", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), peer_.FlagsToString()); + peer_.PeerAddress(), BtifAvEvent::EventName(event), + peer_.FlagsToString()); btif_a2dp_on_offload_started(peer_.PeerAddress(), BTA_AV_FAIL); break; } @@ -2841,8 +2794,8 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, const btif_av_set_latency_req_t* p_set_latency_req = static_cast<const btif_av_set_latency_req_t*>(p_data); log::info("Peer {} : event={} flags={} is_low_latency={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), peer_.FlagsToString(), + peer_.PeerAddress(), BtifAvEvent::EventName(event), + peer_.FlagsToString(), p_set_latency_req->is_low_latency ? "true" : "false"); BTA_AvSetLatency(peer_.BtaHandle(), p_set_latency_req->is_low_latency); @@ -2851,8 +2804,7 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, CHECK_RC_EVENT(event, (tBTA_AV*)p_data); default: - log::warn("Peer {} : Unhandled event={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::warn("Peer {} : Unhandled event={}", peer_.PeerAddress(), BtifAvEvent::EventName(event)); return false; } @@ -2861,7 +2813,7 @@ bool BtifAvStateMachine::StateStarted::ProcessEvent(uint32_t event, } void BtifAvStateMachine::StateClosing::OnEnter() { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::verbose("Peer {}", peer_.PeerAddress()); if (peer_.IsActivePeer()) { if (peer_.IsSink()) { @@ -2875,15 +2827,14 @@ void BtifAvStateMachine::StateClosing::OnEnter() { } void BtifAvStateMachine::StateClosing::OnExit() { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress())); + log::verbose("Peer {}", peer_.PeerAddress()); } bool BtifAvStateMachine::StateClosing::ProcessEvent(uint32_t event, void* p_data) { log::verbose("Peer {} : event={} flags={} active_peer={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event), peer_.FlagsToString(), - peer_.IsActivePeer()); + peer_.PeerAddress(), BtifAvEvent::EventName(event), + peer_.FlagsToString(), peer_.IsActivePeer()); switch (event) { case BTIF_AV_SUSPEND_STREAM_REQ_EVT: @@ -2920,22 +2871,19 @@ bool BtifAvStateMachine::StateClosing::ProcessEvent(uint32_t event, case BTIF_AV_OFFLOAD_START_REQ_EVT: log::error("Peer {} : event={}: stream is not Opened", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), - BtifAvEvent::EventName(event)); + peer_.PeerAddress(), BtifAvEvent::EventName(event)); btif_a2dp_on_offload_started(peer_.PeerAddress(), BTA_AV_FAIL); break; case BTIF_AV_CONNECT_REQ_EVT: - log::warn("Peer {} : Ignore {} in StateClosing", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::warn("Peer {} : Ignore {} in StateClosing", peer_.PeerAddress(), BtifAvEvent::EventName(event)); btif_queue_advance(); peer_.StateMachine().TransitionTo(BtifAvStateMachine::kStateIdle); break; default: - log::warn("Peer {} : Unhandled event={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_.PeerAddress()), + log::warn("Peer {} : Unhandled event={}", peer_.PeerAddress(), BtifAvEvent::EventName(event)); return false; } @@ -2950,20 +2898,18 @@ bool BtifAvStateMachine::StateClosing::ProcessEvent(uint32_t event, static void btif_av_source_initiate_av_open_timer_timeout(void* data) { BtifAvPeer* peer = (BtifAvPeer*)data; - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress())); + log::verbose("Peer {}", peer->PeerAddress()); // Check if AVRCP is connected to the peer if (!btif_rc_is_connected_peer(peer->PeerAddress())) { - log::error("AVRCP peer {} is not connected", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress())); + log::error("AVRCP peer {} is not connected", peer->PeerAddress()); return; } // Connect to the AVRCP peer if (btif_av_source.Enabled() && btif_av_source.FindPeer(peer->PeerAddress()) == peer) { - log::verbose("Connecting to AVRCP peer {}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress())); + log::verbose("Connecting to AVRCP peer {}", peer->PeerAddress()); btif_av_source_dispatch_sm_event(peer->PeerAddress(), BTIF_AV_CONNECT_REQ_EVT); } @@ -2976,20 +2922,18 @@ static void btif_av_source_initiate_av_open_timer_timeout(void* data) { static void btif_av_sink_initiate_av_open_timer_timeout(void* data) { BtifAvPeer* peer = (BtifAvPeer*)data; - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress())); + log::verbose("Peer {}", peer->PeerAddress()); // Check if AVRCP is connected to the peer if (!btif_rc_is_connected_peer(peer->PeerAddress())) { - log::error("AVRCP peer {} is not connected", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress())); + log::error("AVRCP peer {} is not connected", peer->PeerAddress()); return; } // Connect to the AVRCP peer if (btif_av_sink.Enabled() && btif_av_sink.FindPeer(peer->PeerAddress()) == peer) { - log::verbose("Connecting to AVRCP peer {}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress())); + log::verbose("Connecting to AVRCP peer {}", peer->PeerAddress()); btif_av_sink_dispatch_sm_event(peer->PeerAddress(), BTIF_AV_CONNECT_REQ_EVT); } @@ -3005,8 +2949,7 @@ static void btif_report_connection_state(const RawAddress& peer_address, btav_connection_state_t state, bt_status_t status, uint8_t error_code, const A2dpType local_a2dp_type) { - log::info("peer_address={} state={}", ADDRESS_TO_LOGGABLE_CSTR(peer_address), - state); + log::info("peer_address={} state={}", peer_address, state); if (btif_av_src_sink_coexist_enabled() && btif_av_both_enable()) { BtifAvPeer* peer = btif_av_find_peer(peer_address, local_a2dp_type); if (peer == nullptr) { @@ -3055,8 +2998,7 @@ static void btif_report_connection_state(const RawAddress& peer_address, static void btif_report_audio_state(const RawAddress& peer_address, btav_audio_state_t state, const A2dpType local_a2dp_type) { - log::info("peer_address={} state={}", ADDRESS_TO_LOGGABLE_CSTR(peer_address), - state); + log::info("peer_address={} state={}", peer_address, state); if (btif_av_both_enable()) { BtifAvPeer* peer = btif_av_find_peer(peer_address, local_a2dp_type); @@ -3108,7 +3050,7 @@ void btif_av_report_source_codec_state( const std::vector<btav_a2dp_codec_config_t>& codecs_local_capabilities, const std::vector<btav_a2dp_codec_config_t>& codecs_selectable_capabilities) { - log::verbose("peer_address={}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::verbose("peer_address={}", peer_address); if (btif_av_source.Enabled()) { do_in_jni_thread( FROM_HERE, @@ -3127,8 +3069,8 @@ void btif_av_report_source_codec_state( */ static void btif_av_report_sink_audio_config_state( const RawAddress& peer_address, int sample_rate, int channel_count) { - log::info("Peer {} : sample_rate={} channel_count={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), sample_rate, channel_count); + log::info("Peer {} : sample_rate={} channel_count={}", peer_address, + sample_rate, channel_count); if (btif_av_sink.Enabled()) { do_in_jni_thread(FROM_HERE, base::BindOnce(btif_av_sink.Callbacks()->audio_config_cb, @@ -3258,8 +3200,8 @@ static void btif_av_handle_event(uint8_t peer_sep, const RawAddress& peer_address, tBTA_AV_HNDL bta_handle, const BtifAvEvent& btif_av_event) { - log::debug("Handle event peer_address={} bta_handle=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_handle); + log::debug("Handle event peer_address={} bta_handle=0x{:x}", peer_address, + bta_handle); BtifAvPeer* peer = nullptr; @@ -3285,8 +3227,7 @@ static void btif_av_handle_event(uint8_t peer_sep, log::error( "jni_thread: Cannot find or create {} peer for peer_address={} " "bta_handle=0x{:x} : event dropped: {}", - peer_stream_endpoint_text(peer_sep), - ADDRESS_TO_LOGGABLE_CSTR(peer_address), bta_handle, + peer_stream_endpoint_text(peer_sep), peer_address, bta_handle, btif_av_event.ToString()); return; } @@ -3552,8 +3493,7 @@ static void bta_av_sink_media_callback(const RawAddress& peer_address, case BTA_AV_SINK_MEDIA_CFG_EVT: { btif_av_sink_config_req_t config_req; - log::verbose("address={}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->avk_config.bd_addr)); + log::verbose("address={}", p_data->avk_config.bd_addr); // Update the codec info of the A2DP Sink decoder btif_a2dp_sink_update_decoder((uint8_t*)(p_data->avk_config.codec_info)); @@ -3618,8 +3558,7 @@ static void update_audio_track_gain(float gain) { // Establishes the AV signalling channel with the remote headset static bt_status_t connect_int(RawAddress* peer_address, uint16_t uuid) { - log::verbose("peer_address={} uuid=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(*peer_address), uuid); + log::verbose("peer_address={} uuid=0x{:x}", *peer_address, uuid); if (btif_av_both_enable()) { const RawAddress tmp = *peer_address; if (uuid == UUID_SERVCLASS_AUDIO_SOURCE) { @@ -3653,12 +3592,10 @@ static bt_status_t connect_int(RawAddress* peer_address, uint16_t uuid) { static void set_source_silence_peer_int(const RawAddress& peer_address, bool silence) { - log::verbose("peer_address={}, silence={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), + log::verbose("peer_address={}, silence={}", peer_address, silence ? "true" : "false"); if (!btif_av_source.SetSilencePeer(peer_address, silence)) { - log::error("Error setting silence state to {}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::error("Error setting silence state to {}", peer_address); } } @@ -3668,15 +3605,14 @@ static void set_active_peer_int(uint8_t peer_sep, std::promise<void> peer_ready_promise) { log::verbose("peer_sep={} ({}) peer_address={}", (peer_sep == AVDT_TSEP_SRC) ? "Source" : "Sink", peer_sep, - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + peer_address); BtifAvPeer* peer = nullptr; if (peer_sep == AVDT_TSEP_SNK) { if (!btif_av_src_sink_coexist_enabled() || (btif_av_src_sink_coexist_enabled() && btif_av_both_enable() && (btif_av_sink.FindPeer(peer_address) == nullptr))) { btif_av_source.SetActivePeer(peer_address, std::move(peer_ready_promise)); - log::error("Error setting {} as active Sink peer", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::error("Error setting {} as active Sink peer", peer_address); } return; } @@ -3685,16 +3621,14 @@ static void set_active_peer_int(uint8_t peer_sep, btif_av_both_enable() && (btif_av_source.FindPeer(peer_address) == nullptr))) { if (!btif_av_sink.SetActivePeer(peer_address, std::move(peer_ready_promise))) { - log::error("Error setting {} as active Source peer", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::error("Error setting {} as active Source peer", peer_address); } } return; } // If reached here, we could not set the active peer log::error("Cannot set active {} peer to {}: peer not {}", - (peer_sep == AVDT_TSEP_SRC) ? "Source" : "Sink", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), + (peer_sep == AVDT_TSEP_SRC) ? "Source" : "Sink", peer_address, (peer == nullptr) ? "found" : "connected"); peer_ready_promise.set_value(); } @@ -3706,15 +3640,14 @@ static bt_status_t src_connect_sink(const RawAddress& peer_address) { } RawAddress peer_address_copy(peer_address); - log::debug("Connecting to AV sink peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address_copy)); + log::debug("Connecting to AV sink peer:{}", peer_address_copy); return btif_queue_connect(UUID_SERVCLASS_AUDIO_SOURCE, &peer_address_copy, connect_int); } static bt_status_t sink_connect_src(const RawAddress& peer_address) { - log::info("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::info("Peer {}", peer_address); if (!btif_av_sink.Enabled()) { log::warn("BTIF AV Sink is not enabled"); @@ -3727,7 +3660,7 @@ static bt_status_t sink_connect_src(const RawAddress& peer_address) { } static bt_status_t src_disconnect_sink(const RawAddress& peer_address) { - log::info("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::info("Peer {}", peer_address); if (!btif_av_source.Enabled()) { log::warn("BTIF AV Source is not enabled"); @@ -3744,7 +3677,7 @@ static bt_status_t src_disconnect_sink(const RawAddress& peer_address) { } static bt_status_t sink_disconnect_src(const RawAddress& peer_address) { - log::info("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::info("Peer {}", peer_address); if (!btif_av_sink.Enabled()) { log::warn("BTIF AV Sink is not enabled"); @@ -3761,7 +3694,7 @@ static bt_status_t sink_disconnect_src(const RawAddress& peer_address) { } static bt_status_t sink_set_active_device(const RawAddress& peer_address) { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::verbose("Peer {}", peer_address); if (!btif_av_sink.Enabled()) { log::warn("BTIF AV Source is not enabled"); @@ -3784,7 +3717,7 @@ static bt_status_t sink_set_active_device(const RawAddress& peer_address) { static bt_status_t src_set_silence_sink(const RawAddress& peer_address, bool silence) { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::verbose("Peer {}", peer_address); if (!btif_av_source.Enabled()) { log::warn("BTIF AV Source is not enabled"); return BT_STATUS_NOT_READY; @@ -3796,7 +3729,7 @@ static bt_status_t src_set_silence_sink(const RawAddress& peer_address, } static bt_status_t src_set_active_sink(const RawAddress& peer_address) { - log::verbose("Peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::verbose("Peer {}", peer_address); if (!btif_av_source.Enabled()) { log::warn("BTIF AV Source is not enabled"); @@ -3904,8 +3837,8 @@ void btif_av_stream_start_with_latency(bool use_latency_mode) { BtifAvEvent btif_av_event(BTIF_AV_START_STREAM_REQ_EVT, &start_stream_req, sizeof(start_stream_req)); log::info("peer_address={} event={} use_latency_mode={}", - ADDRESS_TO_LOGGABLE_CSTR(btif_av_source_active_peer()), - btif_av_event.ToString(), use_latency_mode ? "true" : "false"); + btif_av_source_active_peer(), btif_av_event.ToString(), + use_latency_mode ? "true" : "false"); do_in_main_thread( FROM_HERE, base::BindOnce(&btif_av_handle_event, @@ -3936,7 +3869,7 @@ void src_do_suspend_in_main_thread(btif_av_sm_event_t event) { } void btif_av_stream_stop(const RawAddress& peer_address) { - log::info("peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::info("peer {}", peer_address); if (!peer_address.IsEmpty()) { btif_av_source_dispatch_sm_event(peer_address, BTIF_AV_STOP_STREAM_REQ_EVT); @@ -3962,7 +3895,7 @@ void btif_av_stream_start_offload(void) { } void btif_av_src_disconnect_sink(const RawAddress& peer_address) { - log::info("peer {}", ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::info("peer {}", peer_address); src_disconnect_sink(peer_address); } @@ -3980,8 +3913,7 @@ bool btif_av_stream_ready(const A2dpType local_a2dp_type) { } int state = peer->StateMachine().StateId(); - log::info("Peer {} : state={}, flags={}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), state, + log::info("Peer {} : state={}, flags={}", peer->PeerAddress(), state, peer->FlagsToString()); // check if we are remotely suspended or stop is pending if (peer->CheckFlags(BtifAvPeer::kFlagRemoteSuspend | @@ -4009,8 +3941,7 @@ bool btif_av_stream_started_ready(const A2dpType local_a2dp_type) { } else { ready = (state == BtifAvStateMachine::kStateStarted); } - log::info("Peer {} : state={} flags={} ready={}", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), state, + log::info("Peer {} : state={} flags={} ready={}", peer->PeerAddress(), state, peer->FlagsToString(), ready); return ready; @@ -4019,8 +3950,7 @@ bool btif_av_stream_started_ready(const A2dpType local_a2dp_type) { static void btif_av_source_dispatch_sm_event(const RawAddress& peer_address, btif_av_sm_event_t event) { BtifAvEvent btif_av_event(event, nullptr, 0); - log::verbose("peer_address={} event={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), + log::verbose("peer_address={} event={}", peer_address, btif_av_event.ToString()); do_in_main_thread(FROM_HERE, base::BindOnce(&btif_av_handle_event, @@ -4032,8 +3962,7 @@ static void btif_av_source_dispatch_sm_event(const RawAddress& peer_address, static void btif_av_sink_dispatch_sm_event(const RawAddress& peer_address, btif_av_sm_event_t event) { BtifAvEvent btif_av_event(event, nullptr, 0); - log::verbose("peer_address={} event={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), + log::verbose("peer_address={} event={}", peer_address, btif_av_event.ToString()); do_in_main_thread(FROM_HERE, base::BindOnce(&btif_av_handle_event, @@ -4128,7 +4057,7 @@ bool btif_av_is_connected(const A2dpType local_a2dp_type) { } bool connected = peer->IsConnected(); - log::verbose("Peer {} is {}", ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), + log::verbose("Peer {} is {}", peer->PeerAddress(), (connected) ? "connected" : "not connected"); return connected; } @@ -4141,8 +4070,7 @@ uint8_t btif_av_get_peer_sep(const A2dpType local_a2dp_type) { } uint8_t peer_sep = peer->PeerSep(); - log::verbose("Peer {} SEP is {} ({})", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), + log::verbose("Peer {} SEP is {} ({})", peer->PeerAddress(), (peer_sep == AVDT_TSEP_SRC) ? "Source" : "Sink", peer_sep); return peer_sep; } @@ -4154,8 +4082,7 @@ void btif_av_clear_remote_suspend_flag(const A2dpType local_a2dp_type) { log::warn("No active peer found"); return; } - log::verbose("Peer {} : flags={} are cleared", - ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), + log::verbose("Peer {} : flags={} are cleared", peer->PeerAddress(), peer->FlagsToString()); peer->ClearFlags(BtifAvPeer::kFlagRemoteSuspend); }; @@ -4168,19 +4095,16 @@ bool btif_av_is_peer_edr(const RawAddress& peer_address, const A2dpType local_a2dp_type) { BtifAvPeer* peer = btif_av_find_peer(peer_address, local_a2dp_type); if (peer == nullptr) { - log::warn("No peer found for peer_address={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::warn("No peer found for peer_address={}", peer_address); return false; } if (!peer->IsConnected()) { - log::warn("Peer {} is not connected", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::warn("Peer {} is not connected", peer_address); return false; } bool is_edr = peer->IsEdr(); - log::verbose("Peer {} : is_edr={}", ADDRESS_TO_LOGGABLE_CSTR(peer_address), - is_edr); + log::verbose("Peer {} : is_edr={}", peer_address, is_edr); return is_edr; } @@ -4188,15 +4112,14 @@ bool btif_av_peer_supports_3mbps(const RawAddress& peer_address, const A2dpType local_a2dp_type) { BtifAvPeer* peer = btif_av_find_peer(peer_address, local_a2dp_type); if (peer == nullptr) { - log::warn("No peer found for peer_address={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::warn("No peer found for peer_address={}", peer_address); return false; } bool is3mbps = peer->Is3Mbps(); bool is_connected = peer->IsConnected(); - log::verbose("Peer {} : connected={}, edr_3mbps={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address), is_connected, is3mbps); + log::verbose("Peer {} : connected={}, edr_3mbps={}", peer_address, + is_connected, is3mbps); return (is_connected && is3mbps); } @@ -4204,8 +4127,7 @@ bool btif_av_peer_prefers_mandatory_codec(const RawAddress& peer_address, const A2dpType local_a2dp_type) { BtifAvPeer* peer = btif_av_find_peer(peer_address, local_a2dp_type); if (peer == nullptr) { - log::warn("No peer found for peer_address={}", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::warn("No peer found for peer_address={}", peer_address); return false; } return peer->IsMandatoryCodecPreferred(); @@ -4214,8 +4136,7 @@ bool btif_av_peer_prefers_mandatory_codec(const RawAddress& peer_address, void btif_av_acl_disconnected(const RawAddress& peer_address, const A2dpType local_a2dp_type) { // Inform the application that ACL is disconnected and move to idle state - log::info("Peer {} : ACL Disconnected", - ADDRESS_TO_LOGGABLE_CSTR(peer_address)); + log::info("Peer {} : ACL Disconnected", peer_address); if (IS_FLAG_ENABLED(a2dp_concurrent_source_sink) || btif_av_both_enable()) { BtifAvPeer* peer = btif_av_find_peer(peer_address, local_a2dp_type); if (peer != nullptr) { @@ -4367,8 +4288,7 @@ void btif_av_set_low_latency(bool is_low_latency) { set_latency_req.is_low_latency = is_low_latency; BtifAvEvent btif_av_event(BTIF_AV_SET_LATENCY_REQ_EVT, &set_latency_req, sizeof(set_latency_req)); - log::info("peer_address={} event={}", - ADDRESS_TO_LOGGABLE_CSTR(btif_av_source_active_peer()), + log::info("peer_address={} event={}", btif_av_source_active_peer(), btif_av_event.ToString()); do_in_main_thread( FROM_HERE, base::BindOnce(&btif_av_handle_event, @@ -4394,7 +4314,7 @@ bool btif_av_is_connected_addr(const RawAddress& peer_address, } bool connected = peer->IsConnected(); - log::verbose("Peer {} is {}", ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), + log::verbose("Peer {} is {}", peer->PeerAddress(), (connected) ? "connected" : "not connected"); return connected; } @@ -4407,7 +4327,7 @@ bool btif_av_peer_is_connected_sink(const RawAddress& peer_address) { } bool connected = peer->IsConnected(); - log::verbose("Peer {} is {}", ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), + log::verbose("Peer {} is {}", peer->PeerAddress(), (connected) ? "connected" : "not connected"); return connected; } @@ -4420,7 +4340,7 @@ bool btif_av_peer_is_connected_source(const RawAddress& peer_address) { } bool connected = peer->IsConnected(); - log::verbose("Peer {} is {}", ADDRESS_TO_LOGGABLE_CSTR(peer->PeerAddress()), + log::verbose("Peer {} is {}", peer->PeerAddress(), (connected) ? "connected" : "not connected"); return connected; } diff --git a/system/btif/src/btif_bqr.cc b/system/btif/src/btif_bqr.cc index 42f5b8fe60..7a22097f74 100644 --- a/system/btif/src/btif_bqr.cc +++ b/system/btif/src/btif_bqr.cc @@ -839,8 +839,7 @@ class BluetoothQualityReportInterfaceImpl log::info( "len: {}, addr: {}, lmp_ver: {}, manufacturer_id: {}, lmp_subver: {}", - bqr_raw_data_len, ADDRESS_TO_LOGGABLE_CSTR(bd_addr), lmp_ver, - manufacturer_id, lmp_subver); + bqr_raw_data_len, bd_addr, lmp_ver, manufacturer_id, lmp_subver); if (callbacks == nullptr) { log::error("callbacks is nullptr"); diff --git a/system/btif/src/btif_core.cc b/system/btif/src/btif_core.cc index 2922203dad..0de7a6fad9 100644 --- a/system/btif/src/btif_core.cc +++ b/system/btif/src/btif_core.cc @@ -194,8 +194,7 @@ void btif_enable_bluetooth_evt() { strcmp(bdstr.c_str(), val) != 0) { // We failed to get an address or the one in the config file does not match // the address given by the controller interface. Update the config cache - log::info("Storing '{}' into the config file", - ADDRESS_TO_LOGGABLE_CSTR(local_bd_addr)); + log::info("Storing '{}' into the config file", local_bd_addr); btif_config_set_str(BTIF_STORAGE_SECTION_ADAPTER, BTIF_STORAGE_KEY_ADDRESS, bdstr.c_str()); diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc index ccb81393e5..a3f477b622 100644 --- a/system/btif/src/btif_dm.cc +++ b/system/btif/src/btif_dm.cc @@ -371,7 +371,7 @@ static void get_asha_service_data(const tBTA_DM_INQ_RES& inq_res, STREAM_TO_UINT16(uuid, p_uuid); if (uuid == 0xfdf0 /* ASHA service*/) { - log::info("ASHA found in {}", ADDRESS_TO_LOGGABLE_CSTR(bdaddr)); + log::info("ASHA found in {}", bdaddr); // ASHA advertisement service data length should be at least 8 if (service_data_len < 8) { @@ -608,8 +608,7 @@ static void bond_state_changed(bt_status_t status, const RawAddress& bd_addr, } else if (state == BT_BOND_STATE_BONDED) { allocate_metric_id_from_metric_id_allocator(bd_addr); if (!save_metric_id_from_metric_id_allocator(bd_addr)) { - log::error("Fail to save metric id for device:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("Fail to save metric id for device:{}", bd_addr); } } BTM_LogHistory( @@ -626,8 +625,7 @@ static void bond_state_changed(bt_status_t status, const RawAddress& bd_addr, && is_bonding_or_sdp()) { log::warn( "Ignoring bond state changed for unexpected device: {} pairing: {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - ADDRESS_TO_LOGGABLE_CSTR(pairing_cb.bd_addr)); + bd_addr, pairing_cb.bd_addr); return; } @@ -661,8 +659,7 @@ static void btif_update_remote_version_property(RawAddress* p_bd) { BTM_ReadRemoteVersion(*p_bd, &lmp_ver, &mfct_set, &lmp_subver); log::info("Remote version info valid:{} [{}]:0x{:x},0x{:x},0x{:x}", - version_info_valid, ADDRESS_TO_LOGGABLE_CSTR((*p_bd)), lmp_ver, - mfct_set, lmp_subver); + version_info_valid, (*p_bd), lmp_ver, mfct_set, lmp_subver); if (version_info_valid) { // Always update cache to ensure we have availability whenever BTM API is @@ -709,8 +706,7 @@ static void btif_update_remote_properties(const RawAddress& bdaddr, } if (old_cod != cod) - log::info("{} CoD: 0x{:06x} -> 0x{:06x}", ADDRESS_TO_LOGGABLE_CSTR(bdaddr), - old_cod, cod); + log::info("{} CoD: 0x{:06x} -> 0x{:06x}", bdaddr, old_cod, cod); BTIF_STORAGE_FILL_PROPERTY(&properties[num_properties], BT_PROPERTY_CLASS_OF_DEVICE, sizeof(cod), &cod); @@ -917,8 +913,7 @@ uint16_t btif_dm_get_connection_state(const RawAddress& bd_addr) { rc |= ENCRYPTED_LE; } } else { - log::info("Acl is not connected to peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("Acl is not connected to peer:{}", bd_addr); } return rc; } @@ -1077,9 +1072,8 @@ static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ* p_ssp_cfm_req) { int dev_type; log::verbose("addr:{}, just_works:{}, loc_auth_req={}, rmt_auth_req={}", - ADDRESS_TO_LOGGABLE_CSTR(p_ssp_cfm_req->bd_addr), - p_ssp_cfm_req->just_works, p_ssp_cfm_req->loc_auth_req, - p_ssp_cfm_req->rmt_auth_req); + p_ssp_cfm_req->bd_addr, p_ssp_cfm_req->just_works, + p_ssp_cfm_req->loc_auth_req, p_ssp_cfm_req->rmt_auth_req); /* Remote properties update */ if (BTM_GetPeerDeviceTypeFromFeatures(p_ssp_cfm_req->bd_addr) == BT_DEVICE_TYPE_DUMO) { @@ -1157,7 +1151,7 @@ static void btif_dm_ssp_key_notif_evt(tBTA_DM_SP_KEY_NOTIF* p_ssp_key_notif) { uint32_t cod; int dev_type; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_ssp_key_notif->bd_addr)); + log::verbose("addr:{}", p_ssp_key_notif->bd_addr); /* Remote properties update */ if (BTM_GetPeerDeviceTypeFromFeatures(p_ssp_key_notif->bd_addr) == @@ -1257,8 +1251,7 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { // the derived link key. if (p_auth_cmpl->bd_addr != pairing_cb.bd_addr && (!pairing_cb.ble.is_penc_key_rcvd)) { - log::warn("skipping SDP for unknown device {}", - ADDRESS_TO_LOGGABLE_CSTR(p_auth_cmpl->bd_addr)); + log::warn("skipping SDP for unknown device {}", p_auth_cmpl->bd_addr); return; } @@ -1333,7 +1326,7 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { if (pairing_cb.sdp_over_classic == btif_dm_pairing_cb_t::ServiceDiscoveryState::NOT_STARTED) { - log::info("scheduling SDP for {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("scheduling SDP for {}", bd_addr); pairing_cb.sdp_over_classic = btif_dm_pairing_cb_t::ServiceDiscoveryState::SCHEDULED; btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_BR_EDR); @@ -1460,7 +1453,7 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, GetInterfaceToProfiles()->events->invoke_device_found_cb(3, properties); } else { log::info("Skipping RNR callback because cod is zero addr:{} name:{}", - ADDRESS_TO_LOGGABLE_CSTR(bdaddr), + bdaddr, PRIVATE_NAME(reinterpret_cast<char const*>( p_search_data->name_res.bd_name))); } @@ -1482,8 +1475,7 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, } RawAddress& bdaddr = p_search_data->inq_res.bd_addr; - log::verbose("addr:{} device_type=0x{:x}", - ADDRESS_TO_LOGGABLE_CSTR(bdaddr), + log::verbose("addr:{} device_type=0x{:x}", bdaddr, p_search_data->inq_res.device_type); bdname.name[0] = 0; @@ -1524,8 +1516,7 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, if (cod != 0) { uint32_t old_cod = get_cod(&bdaddr); if (old_cod != cod) - log::info("{} CoD: 0x{:06x} -> 0x{:06x}", - ADDRESS_TO_LOGGABLE_CSTR(bdaddr), old_cod, cod); + log::info("{} CoD: 0x{:06x} -> 0x{:06x}", bdaddr, old_cod, cod); BTIF_STORAGE_FILL_PROPERTY(&properties[num_properties], BT_PROPERTY_CLASS_OF_DEVICE, sizeof(cod), @@ -1615,7 +1606,7 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, auto triple = eir_uuids_cache.try_emplace(bdaddr, std::set<Uuid>{}); uuid_iter = std::get<0>(triple); } - log::info("EIR UUIDs for {}:", ADDRESS_TO_LOGGABLE_CSTR(bdaddr)); + log::info("EIR UUIDs for {}:", bdaddr); for (int i = 0; i < num_uuids; ++i) { Uuid uuid = Uuid::From16Bit(p_uuid16[i]); log::info("{}", uuid.ToString()); @@ -1659,8 +1650,7 @@ static void btif_dm_search_devices_evt(tBTA_DM_SEARCH_EVT event, if (restrict_report && p_search_data->inq_res.device_type == BT_DEVICE_TYPE_BLE && !(p_search_data->inq_res.ble_evt_type & BTM_BLE_CONNECTABLE_MASK)) { - log::debug("Ble device {} is not connectable", - ADDRESS_TO_LOGGABLE_CSTR(bdaddr)); + log::debug("Ble device {} is not connectable", bdaddr); break; } @@ -1724,7 +1714,7 @@ static bool btif_is_gatt_service_discovery_post_pairing(const RawAddress bd_addr log::error( "gatt_over_le should be SCHEDULED, did someone clear the control " "block for {} ?", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + bd_addr); } return true; @@ -1752,8 +1742,7 @@ static void btif_on_service_discovery_results( if (result != BTA_SUCCESS && pairing_cb.state == BT_BOND_STATE_BONDED && pairing_cb.sdp_attempts < BTIF_DM_MAX_SDP_ATTEMPTS_AFTER_PAIRING) { if (pairing_cb.sdp_attempts) { - log::warn("SDP failed after bonding re-attempting for {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("SDP failed after bonding re-attempting for {}", bd_addr); pairing_cb.sdp_attempts++; if (IS_FLAG_ENABLED(force_bredr_for_sdp_retry)) { btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_BR_EDR); @@ -1767,7 +1756,7 @@ static void btif_on_service_discovery_results( } if ((bd_addr == pairing_cb.bd_addr || bd_addr == pairing_cb.static_bdaddr)) { - log::info("SDP finished for {}:", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("SDP finished for {}:", bd_addr); pairing_cb.sdp_over_classic = btif_dm_pairing_cb_t::ServiceDiscoveryState::FINISHED; } @@ -1775,7 +1764,7 @@ static void btif_on_service_discovery_results( prop.type = BT_PROPERTY_UUIDS; prop.len = 0; if ((result == BTA_SUCCESS) && !uuids_param.empty()) { - log::info("New UUIDs for {}:", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("New UUIDs for {}:", bd_addr); for (const auto& uuid : uuids_param) { if (btif_should_ignore_uuid(uuid)) { continue; @@ -1828,7 +1817,7 @@ static void btif_on_service_discovery_results( Uuid uuid = {}; if (pairing_cb.state == BT_BOND_STATE_BONDED && pairing_cb.sdp_attempts && (bd_addr == pairing_cb.bd_addr || bd_addr == pairing_cb.static_bdaddr)) { - log::info("SDP search done for {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("SDP search done for {}", bd_addr); pairing_cb.sdp_attempts = 0; // Send UUIDs discovered through EIR to Java to unblock pairing intent @@ -1838,7 +1827,7 @@ static void btif_on_service_discovery_results( if (uuids_iter != eir_uuids_cache.end()) { num_eir_uuids = uuids_iter->second.size(); log::info("SDP failed, send {} EIR UUIDs to unblock bonding {}", - num_eir_uuids, ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + num_eir_uuids, bd_addr); for (auto eir_uuid : uuids_iter->second) { auto uuid_128bit = eir_uuid.To128BitBE(); property_value.insert(property_value.end(), uuid_128bit.begin(), @@ -1878,9 +1867,9 @@ static void btif_on_service_discovery_results( if (skip_reporting_wait_for_le) { log::info( - "Bonding LE Audio sink - must wait for le services discovery to " - "pass all services to java {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + "Bonding LE Audio sink - must wait for le services discovery to pass " + "all services to java {}", + bd_addr); /* For LE Audio capable devices, we care more about passing GATT LE * services than about just finishing pairing. Service discovery * should be scheduled when LE pairing finishes, by call to @@ -1905,8 +1894,7 @@ void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name, bool lea_supported = is_le_audio_capable_during_service_discovery(bd_addr); if (transport_le) { - log::info("New GATT over LE UUIDs for {}:", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("New GATT over LE UUIDs for {}:", bd_addr); BTM_LogHistory(kBtmLogTag, bd_addr, "Discovered GATT services using LE transport"); if (btif_is_gatt_service_discovery_post_pairing(bd_addr)) { @@ -1924,8 +1912,7 @@ void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name, if (IS_FLAG_ENABLED(le_audio_fast_bond_params) && lea_supported) { /* LE Audio profile should relax parameters when it connects. If * profile is not enabled, relax parameters after timeout. */ - log::debug("Scheduling conn params unlock for {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Scheduling conn params unlock for {}", bd_addr); do_in_main_thread_delayed( FROM_HERE, base::BindOnce( @@ -1937,8 +1924,7 @@ void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name, } } } else { - log::debug("New GATT over SDP UUIDs for {}:", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("New GATT over SDP UUIDs for {}:", bd_addr); BTM_LogHistory(kBtmLogTag, bd_addr, "Discovered GATT services using SDP transport"); } @@ -1974,8 +1960,7 @@ void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name, // LEA device w/o this flag // TODO: we might want to remove bond or do some action on // half-discovered device - log::warn("No GATT service found for the LE Audio device {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("No GATT service found for the LE Audio device {}", bd_addr); return; } } else { @@ -1991,8 +1976,7 @@ void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name, btif_get_existing_uuids(&bd_addr, existing_uuids); if (existing_lookup_result != BT_STATUS_FAIL) { - log::info("Got some existing UUIDs by address {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("Got some existing UUIDs by address {}", bd_addr); for (int i = 0; i < BT_MAX_NUM_UUIDS; i++) { Uuid uuid = existing_uuids[i]; @@ -2009,7 +1993,7 @@ void btif_on_gatt_results(RawAddress bd_addr, BD_NAME bd_name, btif_get_existing_uuids(&static_addr_copy, existing_uuids); if (existing_lookup_result != BT_STATUS_FAIL) { log::info("Got some existing UUIDs by static address {}", - ADDRESS_TO_LOGGABLE_CSTR(static_addr_copy)); + static_addr_copy); for (int i = 0; i < BT_MAX_NUM_UUIDS; i++) { Uuid uuid = existing_uuids[i]; if (uuid.IsEmpty()) { @@ -2067,13 +2051,11 @@ void btif_on_name_read(RawAddress bd_addr, tHCI_ERROR_CODE hci_status, if (hci_status != HCI_SUCCESS) { log::warn("Received RNR event with bad status addr:{} hci_status:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - hci_error_code_text(hci_status)); + bd_addr, hci_error_code_text(hci_status)); return; } if (bd_name[0] == '\0') { - log::warn("Received RNR event without valid name addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("Received RNR event without valid name addr:{}", bd_addr); return; } bt_property_t properties[] = {{ @@ -2089,8 +2071,7 @@ void btif_on_name_read(RawAddress bd_addr, tHCI_ERROR_CODE hci_status, const size_t num_props = sizeof(properties) / sizeof(bt_property_t); GetInterfaceToProfiles()->events->invoke_remote_device_properties_cb( status, bd_addr, (int)num_props, properties); - log::info("Callback for read name event addr:{} name:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), + log::info("Callback for read name event addr:{} name:{}", bd_addr, PRIVATE_NAME(reinterpret_cast<char const*>(bd_name))); } @@ -2500,7 +2481,7 @@ void btif_dm_acl_evt(tBTA_DM_ACL_EVT event, tBTA_DM_ACL* p_data) { log::debug( "Sent BT_ACL_STATE_DISCONNECTED upward as ACL link down event " "device:{} reason:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), + bd_addr, hci_reason_code_text( static_cast<tHCI_REASON>(btm_get_acl_disc_reason_code()))); } break; @@ -2612,8 +2593,7 @@ bool btif_dm_pairing_is_busy() { * ******************************************************************************/ void btif_dm_create_bond(const RawAddress bd_addr, int transport) { - log::verbose("bd_addr={}, transport={}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - transport); + log::verbose("bd_addr={}, transport={}", bd_addr, transport); BTM_LogHistory( kBtmLogTag, bd_addr, "Create bond", @@ -2635,8 +2615,7 @@ void btif_dm_create_bond(const RawAddress bd_addr, int transport) { ******************************************************************************/ void btif_dm_create_bond_le(const RawAddress bd_addr, tBLE_ADDR_TYPE addr_type) { - log::verbose("bd_addr={}, addr_type={}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - addr_type); + log::verbose("bd_addr={}, addr_type={}", bd_addr, addr_type); const tBLE_BD_ADDR ble_bd_addr{ .type = addr_type, .bda = bd_addr, @@ -2771,7 +2750,7 @@ void btif_dm_create_bond_out_of_band(const RawAddress bd_addr, * ******************************************************************************/ void btif_dm_cancel_bond(const RawAddress bd_addr) { - log::verbose("bd_addr={}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("bd_addr={}", bd_addr); BTM_LogHistory(kBtmLogTag, bd_addr, "Cancel bond"); @@ -2830,7 +2809,7 @@ void btif_dm_hh_open_failed(RawAddress* bdaddr) { ******************************************************************************/ void btif_dm_remove_bond(const RawAddress bd_addr) { - log::verbose("bd_addr={}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("bd_addr={}", bd_addr); BTM_LogHistory(kBtmLogTag, bd_addr, "Remove bond"); @@ -3108,7 +3087,7 @@ bt_status_t btif_dm_get_adapter_property(bt_property_t* prop) { ******************************************************************************/ void btif_dm_get_remote_services(RawAddress remote_addr, const int transport) { log::verbose("transport={}, remote_addr={}", bt_transport_text(transport), - ADDRESS_TO_LOGGABLE_CSTR(remote_addr)); + remote_addr); BTM_LogHistory( kBtmLogTag, remote_addr, "Service discovery", @@ -3528,7 +3507,7 @@ static void btif_dm_ble_key_notif_evt(tBTA_DM_SP_KEY_NOTIF* p_ssp_key_notif) { uint32_t cod; int dev_type; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_ssp_key_notif->bd_addr)); + log::verbose("addr:{}", p_ssp_key_notif->bd_addr); /* Remote name update */ if (!btif_get_device_type(p_ssp_key_notif->bd_addr, &dev_type)) { @@ -3607,8 +3586,7 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { if (pairing_cb.gatt_over_le == btif_dm_pairing_cb_t::ServiceDiscoveryState::NOT_STARTED) { - log::info("scheduling GATT discovery over LE for {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("scheduling GATT discovery over LE for {}", bd_addr); pairing_cb.gatt_over_le = btif_dm_pairing_cb_t::ServiceDiscoveryState::SCHEDULED; btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_LE); @@ -3616,15 +3594,15 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { log::info( "skipping GATT discovery over LE - was already scheduled or " "finished for {}, state: {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), pairing_cb.gatt_over_le); + bd_addr, pairing_cb.gatt_over_le); } } } else { /* Map the HCI fail reason to bt status */ // TODO This is not a proper use of the type uint8_t fail_reason = static_cast<uint8_t>(p_auth_cmpl->fail_reason); - log::error("LE authentication for {} failed with reason {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), p_auth_cmpl->fail_reason); + log::error("LE authentication for {} failed with reason {}", bd_addr, + p_auth_cmpl->fail_reason); switch (fail_reason) { case BTA_DM_AUTH_SMP_PAIR_AUTH_FAIL: case BTA_DM_AUTH_SMP_CONFIRM_VALUE_FAIL: @@ -3637,7 +3615,7 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { if (!p_auth_cmpl->is_ctkd && btm_sec_is_a_bonded_dev(bd_addr)) { log::warn( "Bonded device addr={}, timed out - will not remove the keys", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + bd_addr); // Don't send state change to upper layers - otherwise Java think we // unbonded, and will disconnect HID profile. return; @@ -3713,7 +3691,7 @@ void btif_dm_get_ble_local_keys(tBTA_DM_BLE_LOCAL_KEY_MASK* p_key_mask, } static void btif_dm_save_ble_bonding_keys(RawAddress& bd_addr) { - log::verbose("{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("{}", bd_addr); if (bd_addr.IsEmpty()) { log::warn("bd_addr is empty"); @@ -3778,7 +3756,7 @@ static void btif_dm_ble_sec_req_evt(tBTA_DM_BLE_SEC_REQ* p_ble_req, uint32_t cod; int dev_type; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_ble_req->bd_addr)); + log::verbose("addr:{}", p_ble_req->bd_addr); if (!is_consent && pairing_cb.state == BT_BOND_STATE_BONDING) { log::warn("Discard security request"); @@ -3852,7 +3830,7 @@ static void btif_dm_ble_passkey_req_evt(tBTA_DM_PIN_REQ* p_pin_req) { } static void btif_dm_ble_key_nc_req_evt(tBTA_DM_SP_KEY_NOTIF* p_notif_req) { /* TODO implement key notification for numeric comparison */ - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_notif_req->bd_addr)); + log::verbose("addr:{}", p_notif_req->bd_addr); /* Remote name update */ btif_update_remote_properties(p_notif_req->bd_addr, p_notif_req->bd_name, @@ -3879,7 +3857,7 @@ static void btif_dm_ble_key_nc_req_evt(tBTA_DM_SP_KEY_NOTIF* p_notif_req) { } static void btif_dm_ble_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(req_oob_type->bd_addr)); + log::verbose("addr:{}", req_oob_type->bd_addr); RawAddress bd_addr = req_oob_type->bd_addr; /* We already checked if OOB data is present in @@ -3910,8 +3888,8 @@ static void btif_dm_ble_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type) { static void btif_dm_ble_sc_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type) { RawAddress bd_addr = req_oob_type->bd_addr; - log::verbose("bd_addr: {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); - log::verbose("oob_cb.bdaddr: {}", ADDRESS_TO_LOGGABLE_CSTR(oob_cb.bdaddr)); + log::verbose("bd_addr: {}", bd_addr); + log::verbose("oob_cb.bdaddr: {}", oob_cb.bdaddr); /* make sure OOB data is for this particular device */ if (req_oob_type->bd_addr != oob_cb.bdaddr) { @@ -4159,8 +4137,7 @@ bool btif_get_device_type(const RawAddress& bda, int* p_device_type) { p_device_type)) return false; tBT_DEVICE_TYPE device_type = static_cast<tBT_DEVICE_TYPE>(*p_device_type); - log::debug("bd_addr:{} device_type:{}", ADDRESS_TO_LOGGABLE_CSTR(bda), - DeviceTypeText(device_type)); + log::debug("bd_addr:{} device_type:{}", bda, DeviceTypeText(device_type)); return true; } @@ -4175,8 +4152,7 @@ bool btif_get_address_type(const RawAddress& bda, tBLE_ADDR_TYPE* p_addr_type) { if (!btif_config_get_int(bd_addr_str, BTIF_STORAGE_KEY_ADDR_TYPE, &val)) return false; *p_addr_type = static_cast<tBLE_ADDR_TYPE>(val); - log::debug("bd_addr:{}[{}]", ADDRESS_TO_LOGGABLE_CSTR(bda), - AddressTypeText(*p_addr_type)); + log::debug("bd_addr:{}[{}]", bda, AddressTypeText(*p_addr_type)); return true; } @@ -4235,8 +4211,7 @@ void btif_dm_metadata_changed(const RawAddress& remote_bd_addr, int key, static const int METADATA_LE_AUDIO = 26; /* If METADATA_LE_AUDIO is present, device is LE Audio capable */ if (key == METADATA_LE_AUDIO) { - log::info("Device is LE Audio Capable {}", - ADDRESS_TO_LOGGABLE_CSTR(remote_bd_addr)); + log::info("Device is LE Audio Capable {}", remote_bd_addr); metadata_cb.le_audio_cache.insert_or_assign(remote_bd_addr, value); } } diff --git a/system/btif/src/btif_gatt_client.cc b/system/btif/src/btif_gatt_client.cc index 2ca655b275..7f1a2c8eea 100644 --- a/system/btif/src/btif_gatt_client.cc +++ b/system/btif/src/btif_gatt_client.cc @@ -144,8 +144,7 @@ static void btif_gattc_upstreams_evt(uint16_t event, char* p_param) { } case BTA_GATTC_OPEN_EVT: { - log::debug("BTA_GATTC_OPEN_EVT {}", - ADDRESS_TO_LOGGABLE_CSTR(p_data->open.remote_bda)); + log::debug("BTA_GATTC_OPEN_EVT {}", p_data->open.remote_bda); HAL_CBACK(bt_gatt_callbacks, client->open_cb, p_data->open.conn_id, p_data->open.status, p_data->open.client_if, p_data->open.remote_bda); @@ -357,7 +356,7 @@ static bt_status_t btif_gattc_open(int client_if, const RawAddress& bd_addr, void btif_gattc_close_impl(int client_if, RawAddress address, int conn_id) { log::info("client_if={}, conn_id={}, address={}", client_if, conn_id, - ADDRESS_TO_LOGGABLE_CSTR(address)); + address); // Disconnect established connections if (conn_id != 0) { BTA_GATTC_Close(conn_id); diff --git a/system/btif/src/btif_gatt_test.cc b/system/btif/src/btif_gatt_test.cc index e8ac0276c8..a83e16854c 100644 --- a/system/btif/src/btif_gatt_test.cc +++ b/system/btif/src/btif_gatt_test.cc @@ -191,8 +191,7 @@ bt_status_t btif_gattc_test_command_impl(int command, case 0x02: /* Connect */ { log::info("CONNECT - device={} (dev_type={}, addr_type={})", - ADDRESS_TO_LOGGABLE_CSTR(*params->bda1), params->u1, - params->u2); + *params->bda1, params->u1, params->u2); if (params->u1 == BT_DEVICE_TYPE_BLE) BTM_SecAddBleDevice(*params->bda1, BT_DEVICE_TYPE_BLE, diff --git a/system/btif/src/btif_gatt_util.cc b/system/btif/src/btif_gatt_util.cc index 00cc6da68d..288fb4b73f 100644 --- a/system/btif/src/btif_gatt_util.cc +++ b/system/btif/src/btif_gatt_util.cc @@ -96,8 +96,7 @@ void btif_gatt_check_encrypted_link(RawAddress bd_addr, bd_addr, BTM_LE_KEY_PENC, (uint8_t*)&key, sizeof(tBTM_LE_PENC_KEYS)) == BT_STATUS_SUCCESS) && !btif_gatt_is_link_encrypted(bd_addr)) { - log::debug("Checking gatt link peer:{} transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), + log::debug("Checking gatt link peer:{} transport:{}", bd_addr, bt_transport_text(transport_link)); BTA_DmSetEncryption(bd_addr, transport_link, &btif_gatt_set_encryption_cb, BTM_BLE_SEC_ENCRYPT); diff --git a/system/btif/src/btif_hd.cc b/system/btif/src/btif_hd.cc index 3d6130f326..1586835c55 100644 --- a/system/btif/src/btif_hd.cc +++ b/system/btif/src/btif_hd.cc @@ -205,7 +205,7 @@ static void btif_hd_upstreams_evt(uint16_t event, char* p_param) { case BTA_HD_OPEN_EVT: { RawAddress* addr = (RawAddress*)&p_data->conn.bda; - log::warn("BTA_HD_OPEN_EVT, address={}", ADDRESS_TO_LOGGABLE_CSTR(*addr)); + log::warn("BTA_HD_OPEN_EVT, address={}", *addr); /* Check if the connection is from hid host and not hid device */ if (check_cod_hid(addr)) { /* Incoming connection from hid device, reject it */ diff --git a/system/btif/src/btif_hf.cc b/system/btif/src/btif_hf.cc index 5e06d40d40..c6ffd4dd84 100644 --- a/system/btif/src/btif_hf.cc +++ b/system/btif/src/btif_hf.cc @@ -290,8 +290,7 @@ static bool IsSlcConnected(RawAddress* bd_addr) { } int idx = btif_hf_idx_by_bdaddr(bd_addr); if (idx < 0 || idx > BTA_AG_MAX_NUM_CLIENTS) { - log::warn("invalid index {} for {}", idx, - ADDRESS_TO_LOGGABLE_STR(*bd_addr)); + log::warn("invalid index {} for {}", idx, *bd_addr); return false; } return btif_hf_cb[idx].state == BTHF_CONNECTION_STATE_SLC_CONNECTED; @@ -353,17 +352,15 @@ static void btif_hf_upstreams_evt(uint16_t event, char* p_param) { "btif_hf_cb state[{}] is not expected, possible connection " "collision, ignoring AG open failure event for the same device " "{}", - p_data->open.status, - ADDRESS_TO_LOGGABLE_STR(p_data->open.bd_addr)); + p_data->open.status, p_data->open.bd_addr); } else { log::warn( "btif_hf_cb state[{}] is not expected, possible connection " "collision, ignoring AG open failure event for the different " "devices btif_hf_cb bda: {}, p_data bda: {}, report disconnect " "state for p_data bda.", - p_data->open.status, - ADDRESS_TO_LOGGABLE_STR(btif_hf_cb[idx].connected_bda), - ADDRESS_TO_LOGGABLE_STR(p_data->open.bd_addr)); + p_data->open.status, btif_hf_cb[idx].connected_bda, + p_data->open.bd_addr); bt_hf_callbacks->ConnectionStateCallback( BTHF_CONNECTION_STATE_DISCONNECTED, &(p_data->open.bd_addr)); log_counter_metrics_btif( @@ -389,8 +386,7 @@ static void btif_hf_upstreams_evt(uint16_t event, char* p_param) { "possible connection collision, ignore the outgoing connection " "for the different devices btif_hf_cb bda: {}, p_data bda: {}, " "report disconnect state for btif_hf_cb bda.", - ADDRESS_TO_LOGGABLE_STR(btif_hf_cb[idx].connected_bda), - ADDRESS_TO_LOGGABLE_STR(p_data->open.bd_addr)); + btif_hf_cb[idx].connected_bda, p_data->open.bd_addr); bt_hf_callbacks->ConnectionStateCallback( BTHF_CONNECTION_STATE_DISCONNECTED, &(btif_hf_cb[idx].connected_bda)); @@ -425,13 +421,11 @@ static void btif_hf_upstreams_evt(uint16_t event, char* p_param) { if (!btif_hf_cb[idx].is_initiator) { // Ignore remote initiated open failures log::warn("Unexpected AG open failure {} for {} is ignored", - p_data->open.status, - ADDRESS_TO_LOGGABLE_STR(p_data->open.bd_addr)); + p_data->open.status, p_data->open.bd_addr); break; } log::error("self initiated AG open failed for {}, status {}", - ADDRESS_TO_LOGGABLE_STR(btif_hf_cb[idx].connected_bda), - p_data->open.status); + btif_hf_cb[idx].connected_bda, p_data->open.status); RawAddress connected_bda = btif_hf_cb[idx].connected_bda; reset_control_block(&btif_hf_cb[idx]); bt_hf_callbacks->ConnectionStateCallback(btif_hf_cb[idx].state, @@ -462,8 +456,7 @@ static void btif_hf_upstreams_evt(uint16_t event, char* p_param) { bt_hf_callbacks->ConnectionStateCallback(btif_hf_cb[idx].state, &connected_bda); if (failed_to_setup_slc) { - log::error("failed to setup SLC for {}", - ADDRESS_TO_LOGGABLE_STR(connected_bda)); + log::error("failed to setup SLC for {}", connected_bda); log_counter_metrics_btif( android::bluetooth::CodePathCounterKeyEnum::HFP_SLC_SETUP_FAILED, 1); @@ -770,8 +763,7 @@ static void bte_hf_evt(tBTA_AG_EVT event, tBTA_AG* p_data) { static bt_status_t connect_int(RawAddress* bd_addr, uint16_t uuid) { CHECK_BTHF_INIT(); if (is_connected(bd_addr)) { - log::warn("device {} is already connected", - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::warn("device {} is already connected", *bd_addr); return BT_STATUS_DONE; } btif_hf_cb_t* hf_cb = nullptr; @@ -785,13 +777,13 @@ static bt_status_t connect_int(RawAddress* bd_addr, uint16_t uuid) { // Crash here to prevent future code changes from breaking this mechanism if (btif_hf_cb[i].state == BTHF_CONNECTION_STATE_CONNECTING) { log::fatal("{}, handle {}, is still in connecting state {}", - ADDRESS_TO_LOGGABLE_STR(btif_hf_cb[i].connected_bda), - btif_hf_cb[i].handle, btif_hf_cb[i].state); + btif_hf_cb[i].connected_bda, btif_hf_cb[i].handle, + btif_hf_cb[i].state); } } if (hf_cb == nullptr) { log::warn("Cannot connect {}: maximum {} clients already connected", - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr), btif_max_hf_clients); + *bd_addr, btif_max_hf_clients); return BT_STATUS_BUSY; } hf_cb->state = BTHF_CONNECTION_STATE_CONNECTING; @@ -931,7 +923,7 @@ bt_status_t HeadsetInterface::Disconnect(RawAddress* bd_addr) { return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} is not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} is not connected", *bd_addr); return BT_STATUS_FAIL; } BTA_AgClose(btif_hf_cb[idx].handle); @@ -948,7 +940,7 @@ bt_status_t HeadsetInterface::ConnectAudio(RawAddress* bd_addr, } /* Check if SLC is connected */ if (!IsSlcConnected(bd_addr)) { - log::error("SLC not connected for {}", ADDRESS_TO_LOGGABLE_STR(*bd_addr)); + log::error("SLC not connected for {}", *bd_addr); return BT_STATUS_NOT_READY; } do_in_jni_thread(base::BindOnce(&Callbacks::AudioStateCallback, @@ -971,7 +963,7 @@ bt_status_t HeadsetInterface::DisconnectAudio(RawAddress* bd_addr) { return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} is not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} is not connected", *bd_addr); return BT_STATUS_FAIL; } BTA_AgAudioClose(btif_hf_cb[idx].handle); @@ -1012,7 +1004,7 @@ bt_status_t HeadsetInterface::StartVoiceRecognition(RawAddress* bd_addr) { return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} is not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} is not connected", *bd_addr); return BT_STATUS_NOT_READY; } if (!(btif_hf_cb[idx].peer_feat & BTA_AG_PEER_FEAT_VREC)) { @@ -1035,7 +1027,7 @@ bt_status_t HeadsetInterface::StopVoiceRecognition(RawAddress* bd_addr) { return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} is not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} is not connected", *bd_addr); return BT_STATUS_NOT_READY; } if (!(btif_hf_cb[idx].peer_feat & BTA_AG_PEER_FEAT_VREC)) { @@ -1058,7 +1050,7 @@ bt_status_t HeadsetInterface::VolumeControl(bthf_volume_type_t type, int volume, return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} is not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} is not connected", *bd_addr); return BT_STATUS_FAIL; } tBTA_AG_RES_DATA ag_res = {}; @@ -1079,8 +1071,7 @@ bt_status_t HeadsetInterface::DeviceStatusNotification( } int idx = btif_hf_idx_by_bdaddr(bd_addr); if (idx < 0 || idx > BTA_AG_MAX_NUM_CLIENTS) { - log::warn("invalid index {} for {}", idx, - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::warn("invalid index {} for {}", idx, *bd_addr); return BT_STATUS_FAIL; } const btif_hf_cb_t& control_block = btif_hf_cb[idx]; @@ -1107,7 +1098,7 @@ bt_status_t HeadsetInterface::CopsResponse(const char* cops, return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} is not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} is not connected", *bd_addr); return BT_STATUS_FAIL; } tBTA_AG_RES_DATA ag_res = {}; @@ -1130,7 +1121,7 @@ bt_status_t HeadsetInterface::CindResponse(int svc, int num_active, return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} is not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} is not connected", *bd_addr); return BT_STATUS_FAIL; } tBTA_AG_RES_DATA ag_res = {}; @@ -1159,7 +1150,7 @@ bt_status_t HeadsetInterface::FormattedAtResponse(const char* rsp, return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} is not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} is not connected", *bd_addr); return BT_STATUS_FAIL; } /* Format the response and send */ @@ -1177,7 +1168,7 @@ bt_status_t HeadsetInterface::AtResponse(bthf_at_response_t response_code, return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} is not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} is not connected", *bd_addr); return BT_STATUS_FAIL; } send_at_result( @@ -1197,7 +1188,7 @@ bt_status_t HeadsetInterface::ClccResponse( return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} is not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} is not connected", *bd_addr); return BT_STATUS_FAIL; } tBTA_AG_RES_DATA ag_res = {}; @@ -1251,14 +1242,13 @@ bt_status_t HeadsetInterface::PhoneStateChange( const RawAddress raw_address(*bd_addr); int idx = btif_hf_idx_by_bdaddr(bd_addr); if (idx < 0 || idx >= BTA_AG_MAX_NUM_CLIENTS) { - log::warn("Invalid index {} for {}", idx, - ADDRESS_TO_LOGGABLE_CSTR(raw_address)); + log::warn("Invalid index {} for {}", idx, raw_address); return BT_STATUS_FAIL; } const btif_hf_cb_t& control_block = btif_hf_cb[idx]; if (!IsSlcConnected(bd_addr)) { - log::warn("SLC not connected for {}", ADDRESS_TO_LOGGABLE_STR(*bd_addr)); + log::warn("SLC not connected for {}", *bd_addr); return BT_STATUS_NOT_READY; } if (call_setup_state == BTHF_CALL_STATE_DISCONNECTED) { @@ -1267,16 +1257,14 @@ bt_status_t HeadsetInterface::PhoneStateChange( log::info( "Ignore call state change to DISCONNECTED, idx={}, addr={}, " "num_active={}, num_held={}", - idx, ADDRESS_TO_LOGGABLE_STR(*bd_addr), num_active, num_held); + idx, *bd_addr, num_active, num_held); return BT_STATUS_SUCCESS; } log::debug( "bd_addr:{} active_bda:{} num_active:{} prev_num_active:{} num_held:{} " "prev_num_held:{} call_state:{} prev_call_state:{}", - ADDRESS_TO_LOGGABLE_CSTR((*bd_addr)), - ADDRESS_TO_LOGGABLE_CSTR(active_bda), num_active, - control_block.num_active, num_held, control_block.num_held, - dump_hf_call_state(call_setup_state), + (*bd_addr), active_bda, num_active, control_block.num_active, num_held, + control_block.num_held, dump_hf_call_state(call_setup_state), dump_hf_call_state(control_block.call_setup_state)); tBTA_AG_RES res = BTA_AG_UNKNOWN; bt_status_t status = BT_STATUS_SUCCESS; @@ -1570,12 +1558,11 @@ bt_status_t HeadsetInterface::SendBsir(bool value, RawAddress* bd_addr) { CHECK_BTHF_INIT(); int idx = btif_hf_idx_by_bdaddr(bd_addr); if ((idx < 0) || (idx >= BTA_AG_MAX_NUM_CLIENTS)) { - log::error("Invalid index {} for {}", idx, - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("Invalid index {} for {}", idx, *bd_addr); return BT_STATUS_FAIL; } if (!is_connected(bd_addr)) { - log::error("{} not connected", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("{} not connected", *bd_addr); return BT_STATUS_FAIL; } tBTA_AG_RES_DATA ag_result = {}; diff --git a/system/btif/src/btif_hf_client.cc b/system/btif/src/btif_hf_client.cc index 297e14d89a..e43e87cbbb 100644 --- a/system/btif/src/btif_hf_client.cc +++ b/system/btif/src/btif_hf_client.cc @@ -222,7 +222,7 @@ btif_hf_client_cb_t* btif_hf_client_get_cb_by_handle(uint16_t handle) { * ******************************************************************************/ btif_hf_client_cb_t* btif_hf_client_get_cb_by_bda(const RawAddress& bd_addr) { - log::verbose("incoming addr {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("incoming addr {}", bd_addr); for (int i = 0; i < HF_CLIENT_MAX_DEVICES; i++) { // Block is valid only if it is allocated i.e. state is not DISCONNECTED @@ -870,8 +870,7 @@ static void btif_hf_client_upstreams_evt(uint16_t event, char* p_param) { log::warn( "HF CLient open failed, but another device connected. status={} " "state={} connected device={}", - p_data->open.status, cb->state, - ADDRESS_TO_LOGGABLE_CSTR(cb->peer_bda)); + p_data->open.status, cb->state, cb->peer_bda); break; } diff --git a/system/btif/src/btif_pan.cc b/system/btif/src/btif_pan.cc index 0dff046c4f..0daa7da967 100644 --- a/system/btif/src/btif_pan.cc +++ b/system/btif/src/btif_pan.cc @@ -576,8 +576,7 @@ static void bta_pan_callback_transfer(uint16_t event, char* p_param) { case BTA_PAN_OPENING_EVT: { btpan_conn_t* conn; log::verbose("BTA_PAN_OPENING_EVT handle {}, addr: {}", - p_data->opening.handle, - ADDRESS_TO_LOGGABLE_CSTR(p_data->opening.bd_addr)); + p_data->opening.handle, p_data->opening.bd_addr); conn = btpan_find_conn_addr(p_data->opening.bd_addr); asrt(conn != NULL); diff --git a/system/btif/src/btif_profile_storage.cc b/system/btif/src/btif_profile_storage.cc index 3b7b07a04d..63d58f49f5 100644 --- a/system/btif/src/btif_profile_storage.cc +++ b/system/btif/src/btif_profile_storage.cc @@ -293,8 +293,7 @@ bt_status_t btif_storage_load_bonded_hid_info(void) { btif_config_get_int(name, BTIF_STORAGE_KEY_HID_DB_VERSION, &db_version); } - log::info("link spec: {}; db version: {}", - ADDRESS_TO_LOGGABLE_CSTR(link_spec), db_version); + log::info("link spec: {}; db version: {}", link_spec, db_version); if (db_version == 0) { btif_storage_load_bonded_hid_device(link_spec); @@ -408,7 +407,7 @@ std::vector<std::pair<RawAddress, uint8_t>> btif_storage_get_le_hid_devices( btif_get_address_type(bd_addr, &type); hid_addresses.push_back({bd_addr, type}); - log::debug("Remote device: {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Remote device: {}", bd_addr); } } @@ -435,7 +434,7 @@ std::vector<RawAddress> btif_storage_get_wake_capable_classic_hid_devices( } hid_addresses.push_back(bd_addr); - log::debug("Remote device: {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Remote device: {}", bd_addr); } } @@ -448,8 +447,7 @@ void btif_storage_add_hearing_aid(const HearingDevice& dev_info) { Bind( [](const HearingDevice& dev_info) { std::string bdstr = dev_info.address.ToString(); - log::verbose("saving hearing aid device: {}", - ADDRESS_TO_LOGGABLE_STR(dev_info.address)); + log::verbose("saving hearing aid device: {}", dev_info.address); btif_config_set_int( bdstr, BTIF_STORAGE_KEY_HEARING_AID_SERVICE_CHANGED_CCC_HANDLE, dev_info.service_changed_ccc_handle); @@ -511,7 +509,7 @@ void btif_storage_load_bonded_hearing_aids() { continue; } - log::verbose("Remote device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("Remote device:{}", bd_addr); if (btif_in_fetch_bonded_device(name) != BT_STATUS_SUCCESS) { btif_storage_remove_hearing_aid(bd_addr); @@ -673,9 +671,8 @@ void btif_storage_set_leaudio_autoconnect(const RawAddress& addr, do_in_jni_thread(FROM_HERE, Bind( [](const RawAddress& addr, bool autoconnect) { std::string bdstr = addr.ToString(); - log::verbose( - "saving le audio device: {}", - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::verbose("saving le audio device: {}", + addr); btif_config_set_int( bdstr, BTIF_STORAGE_KEY_LEAUDIO_AUTOCONNECT, @@ -758,8 +755,7 @@ void btif_storage_set_leaudio_audio_location(const RawAddress& addr, Bind( [](const RawAddress& addr, int sink_location, int source_location) { std::string bdstr = addr.ToString(); - log::debug("saving le audio device: {}", - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::debug("saving le audio device: {}", addr); btif_config_set_int(bdstr, BTIF_STORAGE_KEY_LEAUDIO_SINK_AUDIOLOCATION, sink_location); @@ -780,8 +776,7 @@ void btif_storage_set_leaudio_supported_context_types( [](const RawAddress& addr, int sink_supported_context_type, int source_supported_context_type) { std::string bdstr = addr.ToString(); - log::debug("saving le audio device: {}", - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::debug("saving le audio device: {}", addr); btif_config_set_int( bdstr, BTIF_STORAGE_KEY_LEAUDIO_SINK_SUPPORTED_CONTEXT_TYPE, sink_supported_context_type); @@ -816,7 +811,7 @@ void btif_storage_load_bonded_leaudio() { continue; } - log::verbose("Remote device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("Remote device:{}", bd_addr); int value; bool autoconnect = false; @@ -1078,7 +1073,7 @@ void btif_storage_load_bonded_groups(void) { btif_config_get_bin_length(name, BTIF_STORAGE_KEY_DEVICE_GROUP_BIN); if (buffer_size == 0) continue; - log::verbose("Grouped device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("Grouped device:{}", bd_addr); std::vector<uint8_t> in(buffer_size); if (btif_config_get_bin(name, BTIF_STORAGE_KEY_DEVICE_GROUP_BIN, in.data(), @@ -1123,7 +1118,7 @@ void btif_storage_load_bonded_csis_devices(void) { for (const auto& bd_addr : btif_config_get_paired_devices()) { auto name = bd_addr.ToString(); - log::verbose("Loading CSIS device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("Loading CSIS device:{}", bd_addr); size_t buffer_size = btif_config_get_bin_length(name, BTIF_STORAGE_KEY_CSIS_SET_INFO_BIN); @@ -1157,7 +1152,7 @@ bt_status_t btif_storage_load_hidd(void) { for (const auto& bd_addr : btif_config_get_paired_devices()) { auto name = bd_addr.ToString(); - log::verbose("Remote device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("Remote device:{}", bd_addr); int value; if (btif_in_fetch_bonded_device(name) == BT_STATUS_SUCCESS) { if (btif_config_get_int(name, BTIF_STORAGE_KEY_HID_DEVICE_CABLED, @@ -1280,8 +1275,7 @@ void btif_storage_set_pce_profile_version(const RawAddress& remote_bd_addr, remote_bd_addr.ToString(), BTIF_STORAGE_KEY_PBAP_PCE_VERSION, (const uint8_t*)&peer_pce_version, sizeof(peer_pce_version))) { } else { - log::warn("Failed to store peer_pce_version for {}", - ADDRESS_TO_LOGGABLE_CSTR(remote_bd_addr)); + log::warn("Failed to store peer_pce_version for {}", remote_bd_addr); } } @@ -1304,7 +1298,7 @@ bool btif_storage_is_pce_version_102(const RawAddress& remote_bd_addr) { BTIF_STORAGE_KEY_PBAP_PCE_VERSION, (uint8_t*)&pce_version, &version_value_size)) { log::verbose("Failed to read cached peer PCE version for {}", - ADDRESS_TO_LOGGABLE_CSTR(remote_bd_addr)); + remote_bd_addr); return entry_found; } @@ -1313,7 +1307,7 @@ bool btif_storage_is_pce_version_102(const RawAddress& remote_bd_addr) { } log::verbose("read cached peer PCE version 0x{:04x} for {}", pce_version, - ADDRESS_TO_LOGGABLE_CSTR(remote_bd_addr)); + remote_bd_addr); return entry_found; } diff --git a/system/btif/src/btif_rc.cc b/system/btif/src/btif_rc.cc index f293e4c0af..a7905cc8ca 100644 --- a/system/btif/src/btif_rc.cc +++ b/system/btif/src/btif_rc.cc @@ -494,7 +494,7 @@ static btif_rc_device_cb_t* get_connected_device(int index) { } btif_rc_device_cb_t* btif_rc_get_device_by_bda(const RawAddress& bd_addr) { - log::verbose("bd_addr: {}", ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::verbose("bd_addr: {}", bd_addr); for (int idx = 0; idx < BTIF_RC_NUM_CONN; idx++) { if ((btif_rc_cb.rc_multi_cb[idx].rc_state != @@ -601,8 +601,7 @@ void handle_rc_ctrl_features_all(btif_rc_device_cb_t* p_dev) { } } } else { - log::verbose("{} is not connected, pending", - ADDRESS_TO_LOGGABLE_CSTR(p_dev->rc_addr)); + log::verbose("{} is not connected, pending", p_dev->rc_addr); p_dev->launch_cmd_pending |= (RC_PENDING_ACT_GET_CAP | RC_PENDING_ACT_REG_VOL); } @@ -733,9 +732,8 @@ void handle_rc_features(btif_rc_device_cb_t* p_dev) { log::verbose( "AVDTP Source Active Peer Address: {} AVDTP Sink Active Peer Address: {} " "AVCTP address: {}", - ADDRESS_TO_LOGGABLE_CSTR(avdtp_source_active_peer_addr), - ADDRESS_TO_LOGGABLE_CSTR(avdtp_sink_active_peer_addr), - ADDRESS_TO_LOGGABLE_CSTR(p_dev->rc_addr)); + avdtp_source_active_peer_addr, avdtp_sink_active_peer_addr, + p_dev->rc_addr); if (interop_match_addr(INTEROP_DISABLE_ABSOLUTE_VOLUME, &p_dev->rc_addr) || absolute_volume_disabled() || @@ -5494,8 +5492,7 @@ static bt_status_t get_transaction(btif_rc_device_cb_t* p_dev, return BT_STATUS_SUCCESS; } } - log::error("p_dev={}, failed to find free transaction", - ADDRESS_TO_LOGGABLE_CSTR(p_dev->rc_addr)); + log::error("p_dev={}, failed to find free transaction", p_dev->rc_addr); return BT_STATUS_NOMEM; } @@ -5622,8 +5619,7 @@ static void vendor_cmd_timeout_handler(btif_rc_device_cb_t* p_dev, tBTA_AV_META_MSG meta_msg = {.rc_handle = p_dev->rc_handle}; log::warn("timeout, addr={}, label={}, pdu_id={}, event_id={}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev->rc_addr), label, - dump_rc_pdu(p_context->pdu_id), + p_dev->rc_addr, label, dump_rc_pdu(p_context->pdu_id), dump_rc_notification_event_id(p_context->event_id)); switch (p_context->pdu_id) { @@ -5713,8 +5709,7 @@ static void browse_cmd_timeout_handler(btif_rc_device_cb_t* p_dev, .p_msg = nullptr, }; - log::warn("timeout, addr={}, label={}, pdu_id={}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev->rc_addr), label, + log::warn("timeout, addr={}, label={}, pdu_id={}", p_dev->rc_addr, label, dump_rc_pdu(p_context->pdu_id)); switch (p_context->pdu_id) { @@ -5757,8 +5752,7 @@ static void passthru_cmd_timeout_handler(btif_rc_device_cb_t* p_dev, } log::warn("timeout, addr={}, label={}, rc_id={}, key_state={}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev->rc_addr), label, p_context->rc_id, - p_context->key_state); + p_dev->rc_addr, label, p_context->rc_id, p_context->key_state); // Other requests are wrapped in a tAVRC_RESPONSE response object, but these // passthru events are not in there. As well, the upper layers don't handle diff --git a/system/btif/src/btif_sock.cc b/system/btif/src/btif_sock.cc index ced4dc69df..92842fb3e0 100644 --- a/system/btif/src/btif_sock.cc +++ b/system/btif/src/btif_sock.cc @@ -163,9 +163,8 @@ static bt_status_t btsock_listen(btsock_type_t type, const char* service_name, log::info( "Attempting listen for socket connections for device: {}, type: {}, " - "channel: {}, " - "app_uid: {}", - ADDRESS_TO_LOGGABLE_CSTR(RawAddress::kEmpty), type, channel, app_uid); + "channel: {}, app_uid: {}", + RawAddress::kEmpty, type, channel, app_uid); btif_sock_connection_logger( RawAddress::kEmpty, 0, type, SOCKET_CONNECTION_STATE_LISTENING, SOCKET_ROLE_LISTEN, app_uid, channel, 0, 0, service_name); @@ -194,9 +193,8 @@ static bt_status_t btsock_listen(btsock_type_t type, const char* service_name, if (status != BT_STATUS_SUCCESS) { log::error( "failed to listen for socket connections for device: {}, type: {}, " - "channel: {}, " - "app_uid: {}", - ADDRESS_TO_LOGGABLE_CSTR(RawAddress::kEmpty), type, channel, app_uid); + "channel: {}, app_uid: {}", + RawAddress::kEmpty, type, channel, app_uid); btif_sock_connection_logger( RawAddress::kEmpty, 0, type, SOCKET_CONNECTION_STATE_DISCONNECTED, SOCKET_ROLE_LISTEN, app_uid, channel, 0, 0, service_name); @@ -213,7 +211,7 @@ static bt_status_t btsock_connect(const RawAddress* bd_addr, btsock_type_t type, log::info( "Attempting socket connection for device: {}, type: {}, channel: {}, " "app_uid: {}", - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr), type, channel, app_uid); + *bd_addr, type, channel, app_uid); *sock_fd = INVALID_FD; bt_status_t status = BT_STATUS_FAIL; @@ -248,7 +246,7 @@ static bt_status_t btsock_connect(const RawAddress* bd_addr, btsock_type_t type, log::error( "Socket connection failed for device: {}, type: {}, channel: {}, " "app_uid: {}", - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr), type, channel, app_uid); + *bd_addr, type, channel, app_uid); btif_sock_connection_logger(*bd_addr, 0, type, SOCKET_CONNECTION_STATE_DISCONNECTED, SOCKET_ROLE_CONNECTION, app_uid, channel, 0, 0, diff --git a/system/btif/src/btif_sock_l2cap.cc b/system/btif/src/btif_sock_l2cap.cc index b53561939e..77af902a76 100644 --- a/system/btif/src/btif_sock_l2cap.cc +++ b/system/btif/src/btif_sock_l2cap.cc @@ -229,8 +229,7 @@ static void btsock_l2cap_free_l(l2cap_socket* sock) { log::info( "Disconnected L2CAP connection for device: {}, channel: {}, app_uid: {}, " "id: {}, is_le: {}", - ADDRESS_TO_LOGGABLE_CSTR(sock->addr), sock->channel, sock->app_uid, - sock->id, sock->is_le_coc); + sock->addr, sock->channel, sock->app_uid, sock->id, sock->is_le_coc); btif_sock_connection_logger( sock->addr, sock->id, sock->is_le_coc ? BTSOCK_L2CAP_LE : BTSOCK_L2CAP, SOCKET_CONNECTION_STATE_DISCONNECTED, @@ -458,8 +457,7 @@ static void on_srv_l2cap_listen_started(tBTA_JV_L2CAP_START* p_start, log::info( "Listening for L2CAP connection for device: {}, channel: {}, app_uid: " "{}, id: {}, is_le: {}", - ADDRESS_TO_LOGGABLE_CSTR(sock->addr), sock->channel, sock->app_uid, - sock->id, sock->is_le_coc); + sock->addr, sock->channel, sock->app_uid, sock->id, sock->is_le_coc); btif_sock_connection_logger( sock->addr, sock->id, sock->is_le_coc ? BTSOCK_L2CAP_LE : BTSOCK_L2CAP, SOCKET_CONNECTION_STATE_LISTENING, @@ -527,8 +525,7 @@ static void on_srv_l2cap_psm_connect_l(tBTA_JV_L2CAP_OPEN* p_open, log::info( "Connected to L2CAP connection for device: {}, channel: {}, app_uid: {}, " "id: {}, is_le: {}", - ADDRESS_TO_LOGGABLE_CSTR(sock->addr), sock->channel, sock->app_uid, - sock->id, sock->is_le_coc); + sock->addr, sock->channel, sock->app_uid, sock->id, sock->is_le_coc); btif_sock_connection_logger( accept_rs->addr, accept_rs->id, accept_rs->is_le_coc ? BTSOCK_L2CAP_LE : BTSOCK_L2CAP, @@ -575,8 +572,7 @@ static void on_cl_l2cap_psm_connect_l(tBTA_JV_L2CAP_OPEN* p_open, log::info( "Connected to L2CAP connection for device: {}, channel: {}, app_uid: {}, " "id: {}, is_le: {}", - ADDRESS_TO_LOGGABLE_CSTR(sock->addr), sock->channel, sock->app_uid, - sock->id, sock->is_le_coc); + sock->addr, sock->channel, sock->app_uid, sock->id, sock->is_le_coc); btif_sock_connection_logger( sock->addr, sock->id, sock->is_le_coc ? BTSOCK_L2CAP_LE : BTSOCK_L2CAP, SOCKET_CONNECTION_STATE_CONNECTED, @@ -631,8 +627,7 @@ static void on_l2cap_close(tBTA_JV_L2CAP_CLOSE* p_close, uint32_t id) { log::info( "Disconnecting from L2CAP connection for device: {}, channel: {}, " "app_uid: {}, id: {}, is_le: {}", - ADDRESS_TO_LOGGABLE_CSTR(sock->addr), sock->channel, sock->app_uid, - sock->id, sock->is_le_coc); + sock->addr, sock->channel, sock->app_uid, sock->id, sock->is_le_coc); btif_sock_connection_logger( sock->addr, sock->id, sock->is_le_coc ? BTSOCK_L2CAP_LE : BTSOCK_L2CAP, SOCKET_CONNECTION_STATE_DISCONNECTING, diff --git a/system/btif/src/btif_sock_rfc.cc b/system/btif/src/btif_sock_rfc.cc index 19df0931b2..bd7d6897c6 100644 --- a/system/btif/src/btif_sock_rfc.cc +++ b/system/btif/src/btif_sock_rfc.cc @@ -376,8 +376,7 @@ bt_status_t btsock_rfc_connect(const RawAddress* bd_addr, rfc_slot_t* slot = alloc_rfc_slot(bd_addr, NULL, *service_uuid, channel, flags, false); if (!slot) { - log::error("unable to allocate RFCOMM slot. bd_addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::error("unable to allocate RFCOMM slot. bd_addr:{}", *bd_addr); return BT_STATUS_FAIL; } @@ -388,8 +387,7 @@ bt_status_t btsock_rfc_connect(const RawAddress* bd_addr, if (ret != tBTA_JV_STATUS::SUCCESS) { log::error( "unable to initiate RFCOMM connection. status:{}, scn:{}, bd_addr:{}", - bta_jv_status_text(ret), slot->scn, - ADDRESS_TO_LOGGABLE_CSTR(slot->addr)); + bta_jv_status_text(ret), slot->scn, slot->addr); cleanup_rfc_slot(slot); return BT_STATUS_FAIL; } @@ -401,8 +399,7 @@ bt_status_t btsock_rfc_connect(const RawAddress* bd_addr, } } else { log::info("service_uuid:{}, bd_addr:{}, slot_id:{}", - service_uuid->ToString(), ADDRESS_TO_LOGGABLE_CSTR(*bd_addr), - slot->id); + service_uuid->ToString(), *bd_addr, slot->id); if (!is_requesting_sdp()) { BTA_JvStartDiscovery(*bd_addr, 1, service_uuid, slot->id); slot->f.pending_sdp_request = false; @@ -450,8 +447,7 @@ static void cleanup_rfc_slot(rfc_slot_t* slot) { log::info( "disconnected from RFCOMM socket connections for device: {}, scn: {}, " "app_uid: {}, id: {}", - ADDRESS_TO_LOGGABLE_CSTR(slot->addr), slot->scn, slot->app_uid, - slot->id); + slot->addr, slot->scn, slot->app_uid, slot->id); btif_sock_connection_logger( slot->addr, slot->id, BTSOCK_RFCOMM, SOCKET_CONNECTION_STATE_DISCONNECTED, @@ -494,8 +490,7 @@ static bool send_app_scn(rfc_slot_t* slot) { // already sent, just return success. return true; } - log::debug("Sending scn for slot {}. bd_addr:{}", slot->id, - ADDRESS_TO_LOGGABLE_CSTR(slot->addr)); + log::debug("Sending scn for slot {}. bd_addr:{}", slot->id, slot->addr); slot->scn_notified = true; return sock_send_all(slot->fd, (const uint8_t*)&slot->scn, sizeof(slot->scn)) == sizeof(slot->scn); @@ -524,10 +519,10 @@ static void on_cl_rfc_init(tBTA_JV_RFCOMM_CL_INIT* p_init, uint32_t id) { rfc_slot_t* slot = find_rfc_slot_by_id(id); if (!slot) { log::error("RFCOMM slot with id {} not found. p_init->status={}", id, - bta_jv_status_text(p_init->status).c_str()); + bta_jv_status_text(p_init->status)); } else if (p_init->status != tBTA_JV_STATUS::SUCCESS) { log::warn("INIT unsuccessful, status {}. Cleaning up slot with id {}", - bta_jv_status_text(p_init->status).c_str(), slot->id); + bta_jv_status_text(p_init->status), slot->id); cleanup_rfc_slot(slot); } else { slot->rfc_handle = p_init->handle; @@ -543,7 +538,7 @@ static void on_srv_rfc_listen_started(tBTA_JV_RFCOMM_START* p_start, return; } else if (p_start->status != tBTA_JV_STATUS::SUCCESS) { log::warn("START unsuccessful, status {}. Cleaning up slot with id {}", - bta_jv_status_text(p_start->status).c_str(), slot->id); + bta_jv_status_text(p_start->status), slot->id); cleanup_rfc_slot(slot); return; } @@ -552,7 +547,7 @@ static void on_srv_rfc_listen_started(tBTA_JV_RFCOMM_START* p_start, log::info( "listening for RFCOMM socket connections for device: {}, scn: {}, " "app_uid: {}, id: {}", - ADDRESS_TO_LOGGABLE_CSTR(slot->addr), slot->scn, slot->app_uid, id); + slot->addr, slot->scn, slot->app_uid, id); btif_sock_connection_logger( slot->addr, slot->id, BTSOCK_RFCOMM, SOCKET_CONNECTION_STATE_LISTENING, slot->f.server ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION, @@ -577,8 +572,7 @@ static uint32_t on_srv_rfc_connect(tBTA_JV_RFCOMM_SRV_OPEN* p_open, log::info( "connected to RFCOMM socket connections for device: {}, scn: {}, " "app_uid: {}, id: {}", - ADDRESS_TO_LOGGABLE_CSTR(accept_rs->addr), accept_rs->scn, - accept_rs->app_uid, id); + accept_rs->addr, accept_rs->scn, accept_rs->app_uid, id); btif_sock_connection_logger( accept_rs->addr, accept_rs->id, BTSOCK_RFCOMM, SOCKET_CONNECTION_STATE_DISCONNECTED, @@ -608,7 +602,7 @@ static void on_cli_rfc_connect(tBTA_JV_RFCOMM_OPEN* p_open, uint32_t id) { if (p_open->status != tBTA_JV_STATUS::SUCCESS) { log::warn("CONNECT unsuccessful, status {}. Cleaning up slot with id {}", - bta_jv_status_text(p_open->status).c_str(), slot->id); + bta_jv_status_text(p_open->status), slot->id); cleanup_rfc_slot(slot); return; } @@ -619,7 +613,7 @@ static void on_cli_rfc_connect(tBTA_JV_RFCOMM_OPEN* p_open, uint32_t id) { log::info( "connected to RFCOMM socket connections for device: {}, scn: {}, " "app_uid: {}, id: {}", - ADDRESS_TO_LOGGABLE_CSTR(slot->addr), slot->scn, slot->app_uid, id); + slot->addr, slot->scn, slot->app_uid, id); btif_sock_connection_logger( slot->addr, slot->id, BTSOCK_RFCOMM, SOCKET_CONNECTION_STATE_CONNECTED, slot->f.server ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION, @@ -867,7 +861,7 @@ static void handle_discovery_comp(tBTA_JV_STATUS status, int scn, uint32_t id) { log::error( "SDP service discovery completed for slot id: {} with the result " "status: {}, scn: {}", - id, bta_jv_status_text(status).c_str(), scn); + id, bta_jv_status_text(status), scn); cleanup_rfc_slot(slot); return; } diff --git a/system/btif/src/btif_storage.cc b/system/btif/src/btif_storage.cc index ada726c843..de80adc876 100644 --- a/system/btif/src/btif_storage.cc +++ b/system/btif/src/btif_storage.cc @@ -115,8 +115,7 @@ static bool btif_has_ble_keys(const std::string& bdstr); static void btif_storage_set_mode(RawAddress* remote_bd_addr) { std::string bdstr = remote_bd_addr->ToString(); if (GetInterfaceToProfiles()->config->isRestrictedMode()) { - log::info("{} will be removed exiting restricted mode", - ADDRESS_TO_LOGGABLE_CSTR(*remote_bd_addr)); + log::info("{} will be removed exiting restricted mode", *remote_bd_addr); btif_config_set_int(bdstr, BTIF_STORAGE_KEY_RESTRICTED, 1); } } @@ -443,7 +442,7 @@ static bt_status_t btif_in_fetch_bonded_devices( for (const auto& bd_addr : btif_config_get_paired_devices()) { auto name = bd_addr.ToString(); - log::verbose("Remote device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("Remote device:{}", bd_addr); LinkKey link_key; size_t size = sizeof(link_key); if (btif_config_get_bin(name, BTIF_STORAGE_KEY_LINK_KEY, link_key.data(), @@ -479,8 +478,7 @@ static bt_status_t btif_in_fetch_bonded_devices( } if (!btif_in_fetch_bonded_ble_device(name, add, p_bonded_devices) && !bt_linkkey_file_found) { - log::verbose("No link key or ble key found for device:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("No link key or ble key found for device:{}", bd_addr); } } return BT_STATUS_SUCCESS; @@ -505,8 +503,7 @@ static void btif_read_le_key(const uint8_t key_type, const size_t key_len, *device_added = true; } - log::verbose("Adding key type {} for {}", key_type, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("Adding key type {} for {}", key_type, bd_addr); BTA_DmAddBleKey(bd_addr, &key, key_type); } @@ -859,8 +856,7 @@ bt_status_t btif_storage_add_bonded_device(RawAddress* remote_bd_addr, bt_status_t btif_storage_remove_bonded_device( const RawAddress* remote_bd_addr) { std::string bdstr = remote_bd_addr->ToString(); - log::info("Removing bonded device addr={}", - ADDRESS_TO_LOGGABLE_CSTR(*remote_bd_addr)); + log::info("Removing bonded device addr={}", *remote_bd_addr); btif_config_remove_device(bdstr); @@ -899,8 +895,7 @@ static void remove_devices_with_sample_ltk() { } for (RawAddress address : bad_ltk) { - log::error("Removing bond to device using test TLK: {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Removing bond to device using test TLK: {}", address); btif_storage_remove_bonded_device(&address); } @@ -935,8 +930,7 @@ void btif_storage_load_le_devices(void) { sizeof(tBTM_LE_PID_KEYS)) == BT_STATUS_SUCCESS) { if (bonded_devices.devices[i] != key.pid_key.identity_addr) { log::info("Found device with a known identity address {} {}", - ADDRESS_TO_LOGGABLE_CSTR(bonded_devices.devices[i]), - ADDRESS_TO_LOGGABLE_CSTR(key.pid_key.identity_addr)); + bonded_devices.devices[i], key.pid_key.identity_addr); if (bonded_devices.devices[i].IsEmpty() || key.pid_key.identity_addr.IsEmpty()) { @@ -1221,8 +1215,7 @@ bt_status_t btif_storage_get_ble_bonding_key(const RawAddress& remote_bd_addr, bt_status_t btif_storage_remove_ble_bonding_keys( const RawAddress* remote_bd_addr) { std::string bdstr = remote_bd_addr->ToString(); - log::info("Removing bonding keys for bd addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(*remote_bd_addr)); + log::info("Removing bonding keys for bd addr:{}", *remote_bd_addr); bool ret = true; for (size_t i = 0; i < std::size(BTIF_STORAGE_LE_KEYS); i++) { auto key_name = BTIF_STORAGE_LE_KEYS[i].name; @@ -1295,7 +1288,7 @@ bt_status_t btif_in_fetch_bonded_ble_device( if ((device_type & BT_DEVICE_TYPE_BLE) == BT_DEVICE_TYPE_BLE || btif_has_ble_keys(remote_bd_addr)) { - log::verbose("Found a LE device: {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("Found a LE device: {}", bd_addr); if (btif_storage_get_remote_addr_type(&bd_addr, &addr_type) != BT_STATUS_SUCCESS) { @@ -1379,7 +1372,7 @@ void btif_storage_set_gatt_sr_supp_feat(const RawAddress& addr, uint8_t feat) { log::verbose( "GATT server supported features for: {} features: " "{}", - ADDRESS_TO_LOGGABLE_STR(addr), feat); + addr, feat); btif_config_set_int( bdstr, BTIF_STORAGE_KEY_GATT_SERVER_SUPPORTED, feat); }, @@ -1393,7 +1386,7 @@ uint8_t btif_storage_get_sr_supp_feat(const RawAddress& bd_addr) { int value = 0; btif_config_get_int(name, BTIF_STORAGE_KEY_GATT_SERVER_SUPPORTED, &value); log::verbose("Remote device: {} GATT server supported features 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), value); + bd_addr, value); return value; } @@ -1435,7 +1428,7 @@ void btif_storage_set_gatt_cl_supp_feat(const RawAddress& bd_addr, [](const RawAddress& bd_addr, uint8_t feat) { std::string bdstr = bd_addr.ToString(); log::verbose("saving gatt client supported feat: {}", - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + bd_addr); btif_config_set_int( bdstr, BTIF_STORAGE_KEY_GATT_CLIENT_SUPPORTED, feat); }, @@ -1449,7 +1442,7 @@ uint8_t btif_storage_get_gatt_cl_supp_feat(const RawAddress& bd_addr) { int value = 0; btif_config_get_int(name, BTIF_STORAGE_KEY_GATT_CLIENT_SUPPORTED, &value); log::verbose("Remote device: {} GATT client supported features 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), value); + bd_addr, value); return value; } diff --git a/system/common/metrics.cc b/system/common/metrics.cc index 251af12258..f2016e2c2e 100644 --- a/system/common/metrics.cc +++ b/system/common/metrics.cc @@ -614,9 +614,8 @@ void LogLinkLayerConnectionEvent(const RawAddress* address, "failed to log status {}, reason {} from cmd {}, event {}, ble_event " "{} for {}, handle {}, type {}, error {}", loghex(cmd_status), loghex(reason_code), loghex(hci_cmd), - loghex(hci_event), loghex(hci_ble_event), - ADDRESS_TO_LOGGABLE_STR(*address), connection_handle, loghex(link_type), - ret); + loghex(hci_event), loghex(hci_ble_event), *address, connection_handle, + loghex(link_type), ret); } } @@ -661,8 +660,7 @@ void LogA2dpAudioUnderrunEvent(const RawAddress& address, log::warn( "failed for {}, encoding_interval_nanos {}, num_missing_pcm_bytes {}, " "error {}", - ADDRESS_TO_LOGGABLE_STR(address), encoding_interval_nanos, - num_missing_pcm_bytes, ret); + address, encoding_interval_nanos, num_missing_pcm_bytes, ret); } } @@ -690,9 +688,8 @@ void LogA2dpAudioOverrunEvent(const RawAddress& address, "failed to log for {}, encoding_interval_nanos {}, num_dropped_buffers " "{}, num_dropped_encoded_frames {}, num_dropped_encoded_bytes {}, " "error {}", - ADDRESS_TO_LOGGABLE_STR(address), encoding_interval_nanos, - num_dropped_buffers, num_dropped_encoded_frames, - num_dropped_encoded_bytes, ret); + address, encoding_interval_nanos, num_dropped_buffers, + num_dropped_encoded_frames, num_dropped_encoded_bytes, ret); } } @@ -713,8 +710,7 @@ void LogA2dpPlaybackEvent(const RawAddress& address, int playback_state, log::warn( "failed to log for {}, playback_state {}, audio_coding_mode {}, error " "{}", - ADDRESS_TO_LOGGABLE_STR(address), playback_state, audio_coding_mode, - ret); + address, playback_state, audio_coding_mode, ret); } } @@ -733,8 +729,7 @@ void LogReadRssiResult(const RawAddress& address, uint16_t handle, cmd_status, rssi, metric_id); if (ret < 0) { log::warn("failed for {}, handle {}, status {}, rssi {} dBm, error {}", - ADDRESS_TO_LOGGABLE_STR(address), handle, loghex(cmd_status), - rssi, ret); + address, handle, loghex(cmd_status), rssi, ret); } } @@ -757,8 +752,7 @@ void LogReadFailedContactCounterResult(const RawAddress& address, log::warn( "failed for {}, handle {}, status {}, failed_contact_counter {} " "packets, error {}", - ADDRESS_TO_LOGGABLE_STR(address), handle, loghex(cmd_status), - failed_contact_counter, ret); + address, handle, loghex(cmd_status), failed_contact_counter, ret); } } @@ -780,8 +774,7 @@ void LogReadTxPowerLevelResult(const RawAddress& address, uint16_t handle, log::warn( "failed for {}, handle {}, status {}, transmit_power_level {} packets, " "error {}", - ADDRESS_TO_LOGGABLE_STR(address), handle, loghex(cmd_status), - transmit_power_level, ret); + address, handle, loghex(cmd_status), transmit_power_level, ret); } } @@ -804,8 +797,7 @@ void LogSmpPairingEvent(const RawAddress& address, uint8_t smp_cmd, if (ret < 0) { log::warn( "failed for {}, smp_cmd {}, direction {}, smp_fail_reason {}, error {}", - ADDRESS_TO_LOGGABLE_STR(address), loghex(smp_cmd), direction, - loghex(smp_fail_reason), ret); + address, loghex(smp_cmd), direction, loghex(smp_fail_reason), ret); } } @@ -828,9 +820,8 @@ void LogClassicPairingEvent(const RawAddress& address, uint16_t handle, uint32_t log::warn( "failed for {}, handle {}, hci_cmd {}, hci_event {}, cmd_status {}, " "reason {}, event_value {}, error {}", - ADDRESS_TO_LOGGABLE_STR(address), handle, loghex(hci_cmd), - loghex(hci_event), loghex(cmd_status), loghex(reason_code), event_value, - ret); + address, handle, loghex(hci_cmd), loghex(hci_event), loghex(cmd_status), + loghex(reason_code), event_value, ret); } } @@ -853,8 +844,7 @@ void LogSdpAttribute(const RawAddress& address, uint16_t protocol_uuid, protocol_uuid, attribute_id, attribute_field, metric_id); if (ret < 0) { log::warn("failed for {}, protocol_uuid {}, attribute_id {}, error {}", - ADDRESS_TO_LOGGABLE_STR(address), loghex(protocol_uuid), - loghex(attribute_id), ret); + address, loghex(protocol_uuid), loghex(attribute_id), ret); } } @@ -881,8 +871,8 @@ void LogSocketConnectionState( log::warn( "failed for {}, port {}, type {}, state {}, tx_bytes {}, rx_bytes {}, " "uid {}, server_port {}, socket_role {}, error {}", - ADDRESS_TO_LOGGABLE_STR(address), port, type, connection_state, - tx_bytes, rx_bytes, uid, server_port, socket_role, ret); + address, port, type, connection_state, tx_bytes, rx_bytes, uid, + server_port, socket_role, ret); } } @@ -914,9 +904,9 @@ void LogManufacturerInfo(const RawAddress& address, "failed for {}, source_type {}, source_name {}, manufacturer {}, model " "{}, hardware_version {}, software_version {} MAC address type {} MAC " "address prefix {} {} {}, error {}", - ADDRESS_TO_LOGGABLE_STR(address), source_type, source_name, - manufacturer, model, hardware_version, software_version, address_type, - address.address[5], address.address[4], address.address[3], ret); + address, source_type, source_name, manufacturer, model, + hardware_version, software_version, address_type, address.address[5], + address.address[4], address.address[3], ret); } } @@ -934,8 +924,7 @@ void LogBluetoothHalCrashReason(const RawAddress& address, uint32_t error_code, obfuscated_id_field, error_code, vendor_error_code); if (ret < 0) { log::warn("failed for {}, error_code {}, vendor_error_code {}, error {}", - ADDRESS_TO_LOGGABLE_STR(address), loghex(error_code), - loghex(vendor_error_code), ret); + address, loghex(error_code), loghex(vendor_error_code), ret); } } diff --git a/system/device/src/interop.cc b/system/device/src/interop.cc index 47e4d8fcc2..83ef4ad2b0 100644 --- a/system/device/src/interop.cc +++ b/system/device/src/interop.cc @@ -941,7 +941,7 @@ static bool load_to_database(int feature, const char* key, const char* value, log::warn( "key {} or Bluetooth Address {} is invalid, not added to interop " "list", - key, ADDRESS_TO_LOGGABLE_CSTR(addr)); + key, addr); return false; } @@ -1049,7 +1049,7 @@ static bool load_to_database(int feature, const char* key, const char* value, log::warn( "key {} or Bluetooth Address {} is invalid, not added to interop " "list", - key, ADDRESS_TO_LOGGABLE_CSTR(addr)); + key, addr); return false; } @@ -1115,7 +1115,7 @@ static bool load_to_database(int feature, const char* key, const char* value, log::warn( "key {} or Bluetooth Address {} is invalid, not added to interop " "list", - key, ADDRESS_TO_LOGGABLE_CSTR(addr)); + key, addr); return false; } @@ -1142,8 +1142,7 @@ static bool load_to_database(int feature, const char* key, const char* value, if (!get_addr_range(tmp_key, &addr_start, &addr_end)) { log::warn( "key: {} addr_start {} or addr end {} is added to interop list", key, - ADDRESS_TO_LOGGABLE_CSTR(addr_start), - ADDRESS_TO_LOGGABLE_CSTR(addr_end)); + addr_start, addr_end); return false; } @@ -1369,8 +1368,7 @@ bool interop_database_match_addr(const interop_feature_t feature, &entry, NULL, (interop_entry_type)(INTEROP_ENTRY_TYPE_STATIC | INTEROP_ENTRY_TYPE_DYNAMIC))) { - log::warn("Device {} is a match for interop workaround {}.", - ADDRESS_TO_LOGGABLE_CSTR(*addr), + log::warn("Device {} is a match for interop workaround {}.", *addr, interop_feature_string_(feature)); return true; } @@ -1382,8 +1380,7 @@ bool interop_database_match_addr(const interop_feature_t feature, if (interop_database_match(&entry, NULL, (interop_entry_type)(INTEROP_ENTRY_TYPE_STATIC))) { - log::warn("Device {} is a match for interop workaround {}.", - ADDRESS_TO_LOGGABLE_CSTR(*addr), + log::warn("Device {} is a match for interop workaround {}.", *addr, interop_feature_string_(feature)); return true; } @@ -1429,8 +1426,7 @@ bool interop_database_match_addr_get_max_lat(const interop_feature_t feature, &entry, &ret_entry, (interop_entry_type)(INTEROP_ENTRY_TYPE_STATIC | INTEROP_ENTRY_TYPE_DYNAMIC))) { - log::warn("Device {} is a match for interop workaround {}.", - ADDRESS_TO_LOGGABLE_CSTR(*addr), + log::warn("Device {} is a match for interop workaround {}.", *addr, interop_feature_string_(feature)); *max_lat = ret_entry->entry_type.ssr_max_lat_entry.max_lat; return true; @@ -1476,8 +1472,7 @@ bool interop_database_match_addr_get_lmp_ver(const interop_feature_t feature, &entry, &ret_entry, (interop_entry_type)(INTEROP_ENTRY_TYPE_STATIC | INTEROP_ENTRY_TYPE_DYNAMIC))) { - log::warn("Device {} is a match for interop workaround {}.", - ADDRESS_TO_LOGGABLE_CSTR(*addr), + log::warn("Device {} is a match for interop workaround {}.", *addr, interop_feature_string_(feature)); *lmp_ver = ret_entry->entry_type.lmp_version_entry.lmp_ver; *lmp_sub_ver = ret_entry->entry_type.lmp_version_entry.lmp_sub_ver; @@ -1537,8 +1532,7 @@ bool interop_database_remove_addr(const interop_feature_t feature, entry.entry_type.addr_entry.feature = (interop_feature_t)feature; entry.entry_type.addr_entry.length = sizeof(RawAddress); if (interop_database_remove_(&entry)) { - log::warn("Device {} is a removed from interop workaround {}.", - ADDRESS_TO_LOGGABLE_CSTR(*addr), + log::warn("Device {} is a removed from interop workaround {}.", *addr, interop_feature_string_(feature)); return true; } @@ -1653,8 +1647,7 @@ bool interop_database_remove_addr_max_lat(const interop_feature_t feature, entry.entry_type.ssr_max_lat_entry.max_lat = max_lat; if (interop_database_remove_(&entry)) { - log::warn("Device {} is a removed from interop workaround {}.", - ADDRESS_TO_LOGGABLE_CSTR(*addr), + log::warn("Device {} is a removed from interop workaround {}.", *addr, interop_feature_string_(feature)); return true; } @@ -1695,8 +1688,7 @@ bool interop_database_remove_addr_lmp_version(const interop_feature_t feature, entry.entry_type.lmp_version_entry.lmp_sub_ver = lmp_sub_ver; if (interop_database_remove_(&entry)) { - log::warn("Device {} is a removed from interop workaround {}.", - ADDRESS_TO_LOGGABLE_CSTR(*addr), + log::warn("Device {} is a removed from interop workaround {}.", *addr, interop_feature_string_(feature)); return true; } diff --git a/system/gd/common/metric_id_manager.cc b/system/gd/common/metric_id_manager.cc index 76c74f9d8e..5a8acab080 100644 --- a/system/gd/common/metric_id_manager.cc +++ b/system/gd/common/metric_id_manager.cc @@ -75,7 +75,7 @@ bool MetricIdManager::Init( log::fatal( "Invalid Bluetooth Metric Id in config. Id {} of {} is out of range [{}, {}]", p.second, - ADDRESS_TO_LOGGABLE_CSTR(p.first), + p.first, kMinId, kMaxId); } diff --git a/system/gd/hci/acl_manager/acl_scheduler.cc b/system/gd/hci/acl_manager/acl_scheduler.cc index e19c4feadd..f1190b9571 100644 --- a/system/gd/hci/acl_manager/acl_scheduler.cc +++ b/system/gd/hci/acl_manager/acl_scheduler.cc @@ -103,9 +103,7 @@ struct AclScheduler::impl { [&]() { cancel_connection.Invoke(); }, [&](auto /* entry */) { cancel_connection_completed.Invoke(); }); if (!ok) { - log::error( - "Attempted to cancel connection to {} that does not exist", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Attempted to cancel connection to {} that does not exist", address); } } @@ -152,9 +150,7 @@ struct AclScheduler::impl { [&]() { cancel_request.Invoke(); }, [](auto entry) { std::get<RemoteNameRequestQueueEntry>(entry).callback_when_cancelled.Invoke(); }); if (!ok) { - log::error( - "Attempted to cancel remote name request to {} that does not exist", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::error("Attempted to cancel remote name request to {} that does not exist", address); } }; diff --git a/system/gd/hci/acl_manager/assembler.h b/system/gd/hci/acl_manager/assembler.h index de438a1ec5..09125dd855 100644 --- a/system/gd/hci/acl_manager/assembler.h +++ b/system/gd/hci/acl_manager/assembler.h @@ -135,9 +135,7 @@ struct assembler { return; } if (incoming_queue_.size() > kMaxQueuedPacketsPerConnection) { - log::error( - "Dropping packet from {} due to congestion", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type_)); + log::error("Dropping packet from {} due to congestion", address_with_type_); recombination_stage_ = PacketViewForRecombination(); return; } diff --git a/system/gd/hci/acl_manager/classic_impl.h b/system/gd/hci/acl_manager/classic_impl.h index 75649e7db8..995c35e0d5 100644 --- a/system/gd/hci/acl_manager/classic_impl.h +++ b/system/gd/hci/acl_manager/classic_impl.h @@ -293,7 +293,7 @@ struct classic_impl { void actually_create_connection(Address address, std::unique_ptr<CreateConnectionBuilder> packet) { if (is_classic_link_already_connected(address)) { - log::warn("already connected: {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("already connected: {}", address); acl_scheduler_->ReportOutgoingAclConnectionFailure(); return; } @@ -362,9 +362,7 @@ struct classic_impl { if (delayed_role_change_ == nullptr) { callbacks->OnRoleChange(hci::ErrorCode::SUCCESS, current_role); } else if (delayed_role_change_->GetBdAddr() == address) { - log::info( - "Sending delayed role change for {}", - ADDRESS_TO_LOGGABLE_CSTR(delayed_role_change_->GetBdAddr())); + log::info("Sending delayed role change for {}", delayed_role_change_->GetBdAddr()); callbacks->OnRoleChange(delayed_role_change_->GetStatus(), delayed_role_change_->GetNewRole()); delayed_role_change_.reset(); } @@ -398,14 +396,11 @@ struct classic_impl { Address address, ErrorCode status, std::string valid_incoming_addresses) { - log::warn( - "No matching connection to {} ({})", - ADDRESS_TO_LOGGABLE_CSTR(address), - ErrorCodeText(status)); + log::warn("No matching connection to {} ({})", address, ErrorCodeText(status)); log::assert_that( status != ErrorCode::SUCCESS, "No prior connection request for {} expecting:{}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, valid_incoming_addresses.c_str()); remote_name_request_module->ReportRemoteNameRequestCancellation(address); }, @@ -674,13 +669,11 @@ struct classic_impl { }); if (!sent) { if (delayed_role_change_ != nullptr) { - log::warn( - "Second delayed role change (@{} dropped)", - ADDRESS_TO_LOGGABLE_CSTR(delayed_role_change_->GetBdAddr())); + log::warn("Second delayed role change (@{} dropped)", delayed_role_change_->GetBdAddr()); } log::info( "Role change for {} with no matching connection (new role: {})", - ADDRESS_TO_LOGGABLE_CSTR(role_change_view.GetBdAddr()), + role_change_view.GetBdAddr(), RoleText(role_change_view.GetNewRole())); delayed_role_change_ = std::make_unique<RoleChangeView>(role_change_view); } diff --git a/system/gd/hci/acl_manager/le_impl.h b/system/gd/hci/acl_manager/le_impl.h index b5ba9da538..53825fdd17 100644 --- a/system/gd/hci/acl_manager/le_impl.h +++ b/system/gd/hci/acl_manager/le_impl.h @@ -326,7 +326,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { void on_common_le_connection_complete(AddressWithType address_with_type) { auto connecting_addr_with_type = connecting_le_.find(address_with_type); if (connecting_addr_with_type == connecting_le_.end()) { - log::warn("No prior connection request for {}", ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + log::warn("No prior connection request for {}", address_with_type); } connecting_le_.clear(); @@ -400,9 +400,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { on_common_le_connection_complete(remote_address); if (status == ErrorCode::UNKNOWN_CONNECTION) { if (remote_address.GetAddress() != Address::kEmpty) { - log::info( - "Controller send non-empty address field:{}", - ADDRESS_TO_LOGGABLE_CSTR(remote_address.GetAddress())); + log::info("Controller send non-empty address field:{}", remote_address.GetAddress()); } // direct connect canceled due to connection timeout, start background connect create_le_connection(remote_address, false, false); @@ -443,8 +441,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { if (in_filter_accept_list) { log::info( - "Received incoming connection of device in filter accept_list, {}", - ADDRESS_TO_LOGGABLE_CSTR(remote_address)); + "Received incoming connection of device in filter accept_list, {}", remote_address); direct_connect_remove(remote_address); remove_device_from_accept_list(remote_address); } @@ -707,9 +704,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { } if (accept_list.find(address_with_type) != accept_list.end()) { - log::warn( - "Device already exists in acceptlist and cannot be added: {}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + log::warn("Device already exists in acceptlist and cannot be added: {}", address_with_type); return; } @@ -725,9 +720,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { void remove_device_from_accept_list(AddressWithType address_with_type) { if (accept_list.find(address_with_type) == accept_list.end()) { - log::warn( - "Device not in acceptlist and cannot be removed: {}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + log::warn("Device not in acceptlist and cannot be removed: {}", address_with_type); return; } accept_list.erase(address_with_type); @@ -1021,8 +1014,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { } void on_create_connection_timeout(AddressWithType address_with_type) { - log::info( - "on_create_connection_timeout, address: {}", ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + log::info("on_create_connection_timeout, address: {}", address_with_type); direct_connect_remove(address_with_type); if (background_connections_.find(address_with_type) != background_connections_.end()) { diff --git a/system/gd/hci/address.h b/system/gd/hci/address.h index f8fcb896d1..bc0ce89167 100644 --- a/system/gd/hci/address.h +++ b/system/gd/hci/address.h @@ -26,6 +26,7 @@ #include <string> #include "common/interfaces/ILoggable.h" +#include "os/logging/log_adapter.h" #include "packet/custom_field_fixed_size_interface.h" #include "storage/serializable.h" @@ -127,3 +128,21 @@ struct hash<bluetooth::hci::Address> { } }; } // namespace std + +#if __has_include(<bluetooth/log.h>) +#include <bluetooth/log.h> + +namespace fmt { +template <> +struct formatter<bluetooth::hci::Address> : formatter<std::string> { + template <class Context> + typename Context::iterator format(const bluetooth::hci::Address& address, Context& ctx) const { + std::string repr = bluetooth::os::should_log_be_redacted() + ? address.ToRedactedStringForLogging() + : address.ToStringForLogging(); + return fmt::formatter<std::string>::format(repr, ctx); + } +}; +} // namespace fmt + +#endif // __has_include(<bluetooth/log.h> diff --git a/system/gd/hci/address_with_type.h b/system/gd/hci/address_with_type.h index c07ceb0ce6..604b6a6cb1 100644 --- a/system/gd/hci/address_with_type.h +++ b/system/gd/hci/address_with_type.h @@ -27,6 +27,7 @@ #include "hci/address.h" #include "hci/hci_packets.h" #include "hci/octets.h" +#include "os/logging/log_adapter.h" namespace bluetooth { namespace hci { @@ -156,3 +157,22 @@ struct hash<bluetooth::hci::AddressWithType> { } }; } // namespace std + +#if __has_include(<bluetooth/log.h>) +#include <bluetooth/log.h> + +namespace fmt { +template <> +struct formatter<bluetooth::hci::AddressWithType> : formatter<std::string> { + template <class Context> + typename Context::iterator format( + const bluetooth::hci::AddressWithType& address, Context& ctx) const { + std::string repr = bluetooth::os::should_log_be_redacted() + ? address.ToRedactedStringForLogging() + : address.ToStringForLogging(); + return fmt::formatter<std::string>::format(repr, ctx); + } +}; +} // namespace fmt + +#endif // __has_include(<bluetooth/log.h> diff --git a/system/gd/hci/distance_measurement_manager.cc b/system/gd/hci/distance_measurement_manager.cc index e99f26a8d3..7a7f0a0b7e 100644 --- a/system/gd/hci/distance_measurement_manager.cc +++ b/system/gd/hci/distance_measurement_manager.cc @@ -163,12 +163,12 @@ struct DistanceMeasurementManager::impl { void start_distance_measurement( const Address& address, uint16_t interval, DistanceMeasurementMethod method) { - log::info("Address:{}, method:{}", ADDRESS_TO_LOGGABLE_CSTR(address), method); + log::info("Address:{}, method:{}", address, method); uint16_t connection_handle = acl_manager_->HACK_GetLeHandle(address); // Remove this check if we support any connection less method if (connection_handle == kIllegalConnectionHandle) { - log::warn("Can't find any LE connection for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Can't find any LE connection for {}", address); distance_measurement_callbacks_->OnDistanceMeasurementStartFail( address, REASON_NO_LE_CONNECTION, method); return; @@ -200,10 +200,7 @@ struct DistanceMeasurementManager::impl { void start_distance_measurement_with_cs( const Address& cs_remote_address, uint16_t connection_handle, uint16_t interval) { - log::info( - "connection_handle: {}, address: {}", - connection_handle, - ADDRESS_TO_LOGGABLE_CSTR(cs_remote_address)); + log::info("connection_handle: {}, address: {}", connection_handle, cs_remote_address); if (!IS_FLAG_ENABLED(channel_sounding_in_stack)) { log::error("Channel Sounding is not enabled"); distance_measurement_callbacks_->OnDistanceMeasurementStartFail( @@ -213,7 +210,7 @@ struct DistanceMeasurementManager::impl { if (cs_trackers_.find(connection_handle) != cs_trackers_.end() && cs_trackers_[connection_handle].address != cs_remote_address) { - log::warn("Remove old tracker for {}", ADDRESS_TO_LOGGABLE_CSTR(cs_remote_address)); + log::warn("Remove old tracker for {}", cs_remote_address); cs_trackers_.erase(connection_handle); } @@ -251,12 +248,12 @@ struct DistanceMeasurementManager::impl { } void stop_distance_measurement(const Address& address, DistanceMeasurementMethod method) { - log::info("Address:{}, method:{}", ADDRESS_TO_LOGGABLE_CSTR(address), method); + log::info("Address:{}, method:{}", address, method); switch (method) { case METHOD_AUTO: case METHOD_RSSI: { if (rssi_trackers.find(address) == rssi_trackers.end()) { - log::warn("Can't find rssi tracker for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Can't find rssi tracker for {}", address); } else { hci_layer_->EnqueueCommand( LeSetTransmitPowerReportingEnableBuilder::Create( @@ -270,7 +267,7 @@ struct DistanceMeasurementManager::impl { case METHOD_CS: { uint16_t connection_handle = acl_manager_->HACK_GetLeHandle(address); if (cs_trackers_.find(connection_handle) == cs_trackers_.end()) { - log::warn("Can't find CS tracker for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Can't find CS tracker for {}", address); } else { cs_trackers_[connection_handle].repeating_alarm->Cancel(); cs_trackers_[connection_handle].repeating_alarm.reset(); @@ -283,12 +280,12 @@ struct DistanceMeasurementManager::impl { void send_read_rssi(const Address& address) { if (rssi_trackers.find(address) == rssi_trackers.end()) { - log::warn("Can't find rssi tracker for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Can't find rssi tracker for {}", address); return; } uint16_t connection_handle = acl_manager_->HACK_GetLeHandle(address); if (connection_handle == kIllegalConnectionHandle) { - log::warn("Can't find connection for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Can't find connection for {}", address); if (rssi_trackers.find(address) != rssi_trackers.end()) { distance_measurement_callbacks_->OnDistanceMeasurementStopped( address, REASON_NO_LE_CONNECTION, METHOD_RSSI); @@ -416,7 +413,7 @@ struct DistanceMeasurementManager::impl { // Check if the connection still exists uint16_t connection_handle_from_acl_manager = acl_manager_->HACK_GetLeHandle(address); if (connection_handle_from_acl_manager == kIllegalConnectionHandle) { - log::warn("Can't find connection for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Can't find connection for {}", address); distance_measurement_callbacks_->OnDistanceMeasurementStopped( address, REASON_NO_LE_CONNECTION, METHOD_CS); cs_trackers_[connection_handle].repeating_alarm->Cancel(); @@ -512,7 +509,7 @@ struct DistanceMeasurementManager::impl { log::info( "Setup phase complete, connection_handle: {}, address: {}", connection_handle, - ADDRESS_TO_LOGGABLE_CSTR(cs_trackers_[connection_handle].address)); + cs_trackers_[connection_handle].address); if (cs_trackers_[connection_handle].role == CsRole::INITIATOR) { send_le_cs_create_config(connection_handle); } @@ -1299,12 +1296,12 @@ struct DistanceMeasurementManager::impl { } if (rssi_trackers.find(address) == rssi_trackers.end()) { - log::warn("Can't find rssi tracker for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Can't find rssi tracker for {}", address); distance_measurement_callbacks_->OnDistanceMeasurementStartFail( address, REASON_INTERNAL_ERROR, METHOD_RSSI); rssi_trackers.erase(address); } else { - log::info("Track rssi for address {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Track rssi for address {}", address); rssi_trackers[address].started = true; distance_measurement_callbacks_->OnDistanceMeasurementStarted(address, METHOD_RSSI); rssi_trackers[address].repeating_alarm->Schedule( @@ -1320,7 +1317,7 @@ struct DistanceMeasurementManager::impl { return; } if (rssi_trackers.find(address) == rssi_trackers.end()) { - log::warn("Can't find rssi tracker for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Can't find rssi tracker for {}", address); return; } double remote_tx_power = (int8_t)rssi_trackers[address].remote_tx_power; diff --git a/system/gd/hci/facade/acl_manager_facade.cc b/system/gd/hci/facade/acl_manager_facade.cc index 522f81fd10..a502b3c0a7 100644 --- a/system/gd/hci/facade/acl_manager_facade.cc +++ b/system/gd/hci/facade/acl_manager_facade.cc @@ -349,10 +349,7 @@ class AclManagerFacadeService : public AclManagerFacade::Service, public Connect } void on_incoming_acl(std::shared_ptr<ClassicAclConnection> connection, uint16_t handle) { - log::info( - "handle={}, addr={}", - connection->GetHandle(), - ADDRESS_TO_LOGGABLE_CSTR(connection->GetAddress())); + log::info("handle={}, addr={}", connection->GetHandle(), connection->GetAddress()); auto packet = connection->GetAclQueueEnd()->TryDequeue(); auto connection_tracker = acl_connections_.find(handle); log::assert_that(connection_tracker != acl_connections_.end(), "handle {}", handle); @@ -364,10 +361,7 @@ class AclManagerFacadeService : public AclManagerFacade::Service, public Connect } void OnConnectSuccess(std::unique_ptr<ClassicAclConnection> connection) override { - log::info( - "handle={}, addr={}", - connection->GetHandle(), - ADDRESS_TO_LOGGABLE_CSTR(connection->GetAddress())); + log::info("handle={}, addr={}", connection->GetHandle(), connection->GetAddress()); std::unique_lock<std::mutex> lock(acl_connections_mutex_); std::shared_ptr<ClassicAclConnection> shared_connection = std::move(connection); uint16_t handle = to_handle(current_connection_request_); @@ -395,7 +389,7 @@ class AclManagerFacadeService : public AclManagerFacade::Service, public Connect } void OnConnectFail(Address address, ErrorCode reason, bool /* locally_initiated */) override { - log::info("addr={}, reason={}", ADDRESS_TO_LOGGABLE_CSTR(address), ErrorCodeText(reason)); + log::info("addr={}, reason={}", address, ErrorCodeText(reason)); std::unique_ptr<BasePacketBuilder> builder = ConnectionCompleteBuilder::Create(reason, 0, address, LinkType::ACL, Enable::DISABLED); ConnectionEvent fail; diff --git a/system/gd/hci/facade/le_acl_manager_facade.cc b/system/gd/hci/facade/le_acl_manager_facade.cc index 01f11e62f1..f933cf9e83 100644 --- a/system/gd/hci/facade/le_acl_manager_facade.cc +++ b/system/gd/hci/facade/le_acl_manager_facade.cc @@ -285,10 +285,7 @@ class LeAclManagerFacadeService : public LeAclManagerFacade::Service, public LeC } void on_incoming_acl(std::shared_ptr<LeAclConnection> connection, uint16_t handle) { - log::info( - "handle={}, addr={}", - connection->GetHandle(), - ADDRESS_TO_LOGGABLE_CSTR(connection->GetRemoteAddress())); + log::info("handle={}, addr={}", connection->GetHandle(), connection->GetRemoteAddress()); auto packet = connection->GetAclQueueEnd()->TryDequeue(); auto connection_tracker = acl_connections_.find(handle); log::assert_that(connection_tracker != acl_connections_.end(), "handle {}", handle); @@ -299,7 +296,7 @@ class LeAclManagerFacadeService : public LeAclManagerFacade::Service, public LeC } void OnLeConnectSuccess(AddressWithType peer, std::unique_ptr<LeAclConnection> connection) override { - log::info("handle={}, addr={}", connection->GetHandle(), ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::info("handle={}, addr={}", connection->GetHandle(), peer); std::unique_lock<std::mutex> lock(acl_connections_mutex_); std::shared_ptr<LeAclConnection> shared_connection = std::move(connection); uint16_t handle = shared_connection->GetHandle(); @@ -344,7 +341,7 @@ class LeAclManagerFacadeService : public LeAclManagerFacade::Service, public LeC } void OnLeConnectFail(AddressWithType address, ErrorCode reason) override { - log::info("addr={}, reason={}", ADDRESS_TO_LOGGABLE_CSTR(address), ErrorCodeText(reason)); + log::info("addr={}, reason={}", address, ErrorCodeText(reason)); std::unique_ptr<BasePacketBuilder> builder = LeConnectionCompleteBuilder::Create( reason, 0, Role::CENTRAL, address.GetAddressType(), address.GetAddress(), 0, 0, 0, ClockAccuracy::PPM_20); LeConnectionEvent fail; diff --git a/system/gd/hci/facade/le_advertising_manager_facade.cc b/system/gd/hci/facade/le_advertising_manager_facade.cc index e889fbf3a3..fbb92d97ec 100644 --- a/system/gd/hci/facade/le_advertising_manager_facade.cc +++ b/system/gd/hci/facade/le_advertising_manager_facade.cc @@ -484,10 +484,7 @@ class LeAdvertisingManagerFacadeService : public LeAdvertisingManagerFacade::Ser }; void OnOwnAddressRead(uint8_t advertiser_id, uint8_t address_type, Address address) { - log::info( - "OnOwnAddressRead Address:{}, address_type:{}", - ADDRESS_TO_LOGGABLE_CSTR(address), - address_type); + log::info("OnOwnAddressRead Address:{}, address_type:{}", address, address_type); AddressMsg msg; msg.set_message_type(AdvertisingCallbackMsgType::OWN_ADDRESS_READ); msg.set_advertiser_id(advertiser_id); diff --git a/system/gd/hci/le_address_manager.cc b/system/gd/hci/le_address_manager.cc index a459ae88aa..ed9141a94d 100644 --- a/system/gd/hci/le_address_manager.cc +++ b/system/gd/hci/le_address_manager.cc @@ -677,8 +677,7 @@ void LeAddressManager::OnCommandComplete(bluetooth::hci::CommandCompleteView vie "Received LE_SET_RANDOM_ADDRESS complete with status {}", ErrorCodeText(complete_view.GetStatus())); } else { - log::info( - "update random address : {}", ADDRESS_TO_LOGGABLE_CSTR(cached_address_.GetAddress())); + log::info("update random address : {}", cached_address_.GetAddress()); le_address_ = cached_address_; } } diff --git a/system/gd/hci/le_advertising_manager.cc b/system/gd/hci/le_advertising_manager.cc index 4ecc856489..a054b7f778 100644 --- a/system/gd/hci/le_advertising_manager.cc +++ b/system/gd/hci/le_advertising_manager.cc @@ -1738,7 +1738,7 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb log::info( "update random address for advertising set {} : {}", advertiser_id, - ADDRESS_TO_LOGGABLE_CSTR(address_with_type.GetAddress())); + address_with_type.GetAddress()); advertising_sets_[advertiser_id].current_address = address_with_type; } } diff --git a/system/gd/hci/le_periodic_sync_manager.h b/system/gd/hci/le_periodic_sync_manager.h index eeb3996167..55ecd85456 100644 --- a/system/gd/hci/le_periodic_sync_manager.h +++ b/system/gd/hci/le_periodic_sync_manager.h @@ -109,10 +109,7 @@ class PeriodicSyncManager { "Invalid address type {}", AddressTypeText(address_type)); periodic_syncs_.emplace_back(request); - log::debug( - "address = {}, sid = {}", - ADDRESS_TO_LOGGABLE_CSTR(request.address_with_type), - request.advertiser_sid); + log::debug("address = {}, sid = {}", request.address_with_type, request.advertiser_sid); pending_sync_requests_.emplace_back( request.advertiser_sid, request.address_with_type, skip, sync_timeout, handler_); HandleNextRequest(); @@ -228,7 +225,7 @@ class PeriodicSyncManager { OpCodeText(view.GetCommandOpCode()), ErrorCodeText(status), request.advertiser_sid, - ADDRESS_TO_LOGGABLE_CSTR(request.address_with_type)); + request.address_with_type); uint8_t adv_sid = request.advertiser_sid; AddressWithType address_with_type = request.address_with_type; @@ -263,7 +260,7 @@ class PeriodicSyncManager { OpCodeText(view.GetCommandOpCode()), ErrorCodeText(status), request.advertiser_sid, - ADDRESS_TO_LOGGABLE_CSTR(request.address_with_type)); + request.address_with_type); AdvanceRequest(); } } @@ -302,12 +299,10 @@ class PeriodicSyncManager { log::assert_that(event_view.IsValid(), "assert failed: event_view.IsValid()"); log::debug( "[PSync]: status={}, sync_handle={}, address={}, s_id={}, address_type={}, adv_phy={}, " - "adv_interval={}, " - "clock_acc={}", + "adv_interval={}, clock_acc={}", (uint16_t)event_view.GetStatus(), event_view.GetSyncHandle(), - ADDRESS_TO_LOGGABLE_CSTR(AddressWithType( - event_view.GetAdvertiserAddress(), event_view.GetAdvertiserAddressType())), + AddressWithType(event_view.GetAdvertiserAddress(), event_view.GetAdvertiserAddressType()), event_view.GetAdvertisingSid(), (uint16_t)event_view.GetAdvertiserAddressType(), (uint16_t)event_view.GetAdvertiserPhy(), @@ -431,7 +426,7 @@ class PeriodicSyncManager { event_view.GetSyncHandle(), event_view.GetAdvertisingSid(), (uint8_t)event_view.GetAdvertiserAddressType(), - ADDRESS_TO_LOGGABLE_CSTR(event_view.GetAdvertiserAddress()), + event_view.GetAdvertiserAddress(), advertiser_phy, event_view.GetPeriodicAdvertisingInterval(), (uint8_t)event_view.GetAdvertiserClockAccuracy()); @@ -450,9 +445,7 @@ class PeriodicSyncManager { void OnStartSyncTimeout() { auto& request = pending_sync_requests_.front(); log::warn( - "sync timeout SID={:04X}, bd_addr={}", - request.advertiser_sid, - ADDRESS_TO_LOGGABLE_CSTR(request.address_with_type)); + "sync timeout SID={:04X}, bd_addr={}", request.advertiser_sid, request.address_with_type); uint8_t adv_sid = request.advertiser_sid; AddressWithType address_with_type = request.address_with_type; auto sync = GetSyncFromAddressWithTypeAndSid(address_with_type, adv_sid); @@ -583,7 +576,7 @@ class PeriodicSyncManager { log::info( "executing sync request SID={:04X}, bd_addr={}", request.advertiser_sid, - ADDRESS_TO_LOGGABLE_CSTR(request.address_with_type)); + request.address_with_type); if (request.busy) { log::info("Request is already busy"); return; @@ -613,7 +606,7 @@ class PeriodicSyncManager { log::info( "removing connection request SID={:04X}, bd_addr={}, busy={}", it->advertiser_sid, - ADDRESS_TO_LOGGABLE_CSTR(it->address_with_type), + it->address_with_type, it->busy); it = pending_sync_requests_.erase(it); } else { diff --git a/system/gd/l2cap/classic/facade.cc b/system/gd/l2cap/classic/facade.cc index 8637803ba1..ae0d76e20f 100644 --- a/system/gd/l2cap/classic/facade.cc +++ b/system/gd/l2cap/classic/facade.cc @@ -194,7 +194,7 @@ class L2capClassicModuleFacadeService : public L2capClassicModuleFacade::Service "assert failed: hci::Address::FromString(request->address(), peer)"); auto entry = security_link_map_.find(peer); if (entry == security_link_map_.end()) { - log::warn("Unknown address '{}'", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::warn("Unknown address '{}'", peer); } else { entry->second->Hold(); } @@ -211,7 +211,7 @@ class L2capClassicModuleFacadeService : public L2capClassicModuleFacade::Service "assert failed: hci::Address::FromString(request->address(), peer)"); auto entry = security_link_map_.find(peer); if (entry == security_link_map_.end()) { - log::warn("Unknown address '{}'", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::warn("Unknown address '{}'", peer); } else { entry->second->EnsureAuthenticated(); } @@ -229,7 +229,7 @@ class L2capClassicModuleFacadeService : public L2capClassicModuleFacade::Service outgoing_pairing_remote_devices_.erase(peer); auto entry = security_link_map_.find(peer); if (entry == security_link_map_.end()) { - log::warn("Unknown address '{}'", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::warn("Unknown address '{}'", peer); } else { entry->second->Release(); } @@ -247,7 +247,7 @@ class L2capClassicModuleFacadeService : public L2capClassicModuleFacade::Service outgoing_pairing_remote_devices_.erase(peer); auto entry = security_link_map_.find(peer); if (entry == security_link_map_.end()) { - log::warn("Unknown address '{}'", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::warn("Unknown address '{}'", peer); } else { entry->second->Disconnect(); } @@ -269,7 +269,7 @@ class L2capClassicModuleFacadeService : public L2capClassicModuleFacade::Service void OnLinkDisconnected(hci::Address remote) override { auto entry = security_link_map_.find(remote); if (entry == security_link_map_.end()) { - log::warn("Unknown address '{}'", ADDRESS_TO_LOGGABLE_CSTR(remote)); + log::warn("Unknown address '{}'", remote); return; } entry->second.reset(); diff --git a/system/gd/l2cap/classic/internal/link_manager.cc b/system/gd/l2cap/classic/internal/link_manager.cc index 8544b071fb..50c170fa3d 100644 --- a/system/gd/l2cap/classic/internal/link_manager.cc +++ b/system/gd/l2cap/classic/internal/link_manager.cc @@ -107,7 +107,7 @@ void LinkManager::ConnectDynamicChannelServices( void LinkManager::InitiateConnectionForSecurity(hci::Address remote) { auto* link = GetLink(remote); if (link != nullptr) { - log::error("Link already exists for {}", ADDRESS_TO_LOGGABLE_CSTR(remote)); + log::error("Link already exists for {}", remote); } acl_manager_->CreateConnection(remote); } @@ -299,7 +299,7 @@ void LinkManager::OnConnectFail(hci::Address device, hci::ErrorCode reason, bool // There is no pending link, exit log::info( "Connection to {} failed without a pending link; reason: {}", - ADDRESS_TO_LOGGABLE_CSTR(device), + device, hci::ErrorCodeText(reason)); if (pending_dynamic_channels_callbacks_.find(device) != pending_dynamic_channels_callbacks_.end()) { for (Link::PendingDynamicChannelConnection& callbacks : pending_dynamic_channels_callbacks_[device]) { diff --git a/system/gd/l2cap/internal/dynamic_channel_allocator.cc b/system/gd/l2cap/internal/dynamic_channel_allocator.cc index bb4d520788..3dd7d0a40a 100644 --- a/system/gd/l2cap/internal/dynamic_channel_allocator.cc +++ b/system/gd/l2cap/internal/dynamic_channel_allocator.cc @@ -91,10 +91,7 @@ void DynamicChannelAllocator::FreeChannel(Cid cid) { used_cid_.erase(cid); auto channel = FindChannelByCid(cid); if (channel == nullptr) { - log::info( - "Channel is not in use: cid {}, device {}", - cid, - ADDRESS_TO_LOGGABLE_CSTR(link_->GetDevice())); + log::info("Channel is not in use: cid {}, device {}", cid, link_->GetDevice()); return; } used_remote_cid_.erase(channel->GetRemoteCid()); diff --git a/system/gd/l2cap/le/internal/link_manager.cc b/system/gd/l2cap/le/internal/link_manager.cc index f57511cdf9..71392f37a8 100644 --- a/system/gd/l2cap/le/internal/link_manager.cc +++ b/system/gd/l2cap/le/internal/link_manager.cc @@ -136,9 +136,7 @@ void LinkManager::OnLeConnectFail(hci::AddressWithType address_with_type, hci::E auto pending_link = pending_links_.find(address_with_type); if (pending_link == pending_links_.end()) { // There is no pending link, exit - log::info( - "Connection to {} failed without a pending link", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + log::info("Connection to {} failed without a pending link", address_with_type); return; } for (auto& pending_fixed_channel_connection : pending_link->second.pending_fixed_channel_connections_) { diff --git a/system/gd/metrics/metrics_state.cc b/system/gd/metrics/metrics_state.cc index 657fd0d11c..afe25296af 100644 --- a/system/gd/metrics/metrics_state.cc +++ b/system/gd/metrics/metrics_state.cc @@ -151,9 +151,7 @@ void LEConnectionMetricsRemoteDevice::UploadLEConnectionSession(const hci::Addre session_options.acl_latency = session_options.latency; session_options.is_cancelled = it->second->is_cancelled; metrics_logger_module->LogMetricBluetoothLESession(session_options); - log::info( - "LEConnectionMetricsRemoteDevice: The session is uploaded for {}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("LEConnectionMetricsRemoteDevice: The session is uploaded for {}", address); opened_devices.erase(it); } } diff --git a/system/gd/os/android/metrics.cc b/system/gd/os/android/metrics.cc index 16d06aaf6c..5ad9a3bc80 100644 --- a/system/gd/os/android/metrics.cc +++ b/system/gd/os/android/metrics.cc @@ -138,7 +138,7 @@ void LogMetricA2dpAudioUnderrunEvent( if (ret < 0) { log::warn( "Failed for {}, encoding_interval_nanos {}, num_missing_pcm_bytes {}, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, std::to_string(encoding_interval_nanos), num_missing_pcm_bytes, ret); @@ -169,7 +169,7 @@ void LogMetricA2dpAudioOverrunEvent( log::warn( "Failed to log for {}, encoding_interval_nanos {}, num_dropped_buffers {}, " "num_dropped_encoded_frames {}, num_dropped_encoded_bytes {}, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, std::to_string(encoding_interval_nanos), num_dropped_buffers, num_dropped_encoded_frames, @@ -188,7 +188,7 @@ void LogMetricA2dpPlaybackEvent(const Address& address, int playback_state, int if (ret < 0) { log::warn( "Failed to log for {}, playback_state {}, audio_coding_mode {},error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, playback_state, audio_coding_mode, ret); @@ -230,7 +230,7 @@ void LogMetricReadRssiResult(const Address& address, uint16_t handle, uint32_t c if (ret < 0) { log::warn( "Failed for {}, handle {}, status {}, rssi {} dBm, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, handle, common::ToHexString(cmd_status), rssi, @@ -254,7 +254,7 @@ void LogMetricReadFailedContactCounterResult( if (ret < 0) { log::warn( "Failed for {}, handle {}, status {}, failed_contact_counter {} packets, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, handle, common::ToHexString(cmd_status), failed_contact_counter, @@ -273,7 +273,7 @@ void LogMetricReadTxPowerLevelResult( if (ret < 0) { log::warn( "Failed for {}, handle {}, status {}, transmit_power_level {} packets, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, handle, common::ToHexString(cmd_status), transmit_power_level, @@ -292,7 +292,7 @@ void LogMetricSmpPairingEvent( if (ret < 0) { log::warn( "Failed for {}, smp_cmd {}, direction {}, smp_fail_reason {}, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, common::ToHexString(smp_cmd), direction, common::ToHexString(smp_fail_reason), @@ -326,7 +326,7 @@ void LogMetricClassicPairingEvent( log::warn( "Failed for {}, handle {}, hci_cmd {}, hci_event {}, cmd_status {}, reason {}, event_value " "{}, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, handle, common::ToHexString(hci_cmd), common::ToHexString(hci_event), @@ -357,7 +357,7 @@ void LogMetricSdpAttribute( if (ret < 0) { log::warn( "Failed for {}, protocol_uuid {}, attribute_id {}, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, common::ToHexString(protocol_uuid), common::ToHexString(attribute_id), ret); @@ -394,7 +394,7 @@ void LogMetricSocketConnectionState( log::warn( "Failed for {}, port {}, type {}, state {}, tx_bytes {}, rx_bytes {}, uid {}, server_port " "{}, socket_role {}, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, port, type, connection_state, @@ -439,7 +439,7 @@ void LogMetricManufacturerInfo( "Failed for {}, source_type {}, source_name {}, manufacturer {}, model {}, " "hardware_version {}, software_version {}, MAC address type {} MAC address prefix {} {} " "{}, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, source_type, source_name, manufacturer, @@ -463,7 +463,7 @@ void LogMetricBluetoothHalCrashReason( if (ret < 0) { log::warn( "Failed for {}, error_code {}, vendor_error_code {}, error {}", - ADDRESS_TO_LOGGABLE_CSTR(address), + address, common::ToHexString(error_code), common::ToHexString(vendor_error_code), ret); @@ -589,7 +589,7 @@ void LogMetricBluetoothLEConnection(os::LEConnectionSessionOptions session_optio log::warn( "Failed BluetoothLeSessionConnected - Address: {}, ACL Connection State: {}, Origin Type: " "{}", - ADDRESS_TO_LOGGABLE_CSTR(session_options.remote_address), + session_options.remote_address, common::ToHexString(session_options.acl_connection_state), common::ToHexString(session_options.origin_type)); } diff --git a/system/gd/rust/topshim/hfp/hfp_shim.cc b/system/gd/rust/topshim/hfp/hfp_shim.cc index 205b041851..45db60ef6a 100644 --- a/system/gd/rust/topshim/hfp/hfp_shim.cc +++ b/system/gd/rust/topshim/hfp/hfp_shim.cc @@ -150,12 +150,12 @@ class DBusHeadsetCallbacks : public headset::Callbacks { // headset::Callbacks void ConnectionStateCallback(headset::bthf_connection_state_t state, RawAddress* bd_addr) override { - log::info("ConnectionStateCallback from {}", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::info("ConnectionStateCallback from {}", *bd_addr); topshim::rust::internal::connection_state_cb(state, bd_addr); } void AudioStateCallback(headset::bthf_audio_state_t state, RawAddress* bd_addr) override { - log::info("AudioStateCallback {} from {}", state, ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::info("AudioStateCallback {} from {}", state, *bd_addr); topshim::rust::internal::audio_state_cb(state, bd_addr); } @@ -174,12 +174,10 @@ class DBusHeadsetCallbacks : public headset::Callbacks { if (volume < 0) return; if (volume > 15) volume = 15; if (type == headset::bthf_volume_type_t::BTHF_VOLUME_TYPE_SPK) { - log::info( - "VolumeControlCallback (Spk) {} from {}", volume, ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::info("VolumeControlCallback (Spk) {} from {}", volume, *bd_addr); topshim::rust::internal::volume_update_cb(volume, bd_addr); } else if (type == headset::bthf_volume_type_t::BTHF_VOLUME_TYPE_MIC) { - log::info( - "VolumeControlCallback (Mic) {} from {}", volume, ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::info("VolumeControlCallback (Mic) {} from {}", volume, *bd_addr); topshim::rust::internal::mic_volume_update_cb(volume, bd_addr); } } @@ -194,13 +192,13 @@ class DBusHeadsetCallbacks : public headset::Callbacks { [[maybe_unused]] headset::bthf_nrec_t nrec, [[maybe_unused]] RawAddress* bd_addr) override {} void WbsCallback(headset::bthf_wbs_config_t wbs, RawAddress* addr) override { - log::info("WbsCallback {} from {}", wbs, ADDRESS_TO_LOGGABLE_CSTR(*addr)); + log::info("WbsCallback {} from {}", wbs, *addr); rusty::hfp_wbs_caps_update_callback(wbs == headset::BTHF_WBS_YES, *addr); } void SwbCallback( headset::bthf_swb_codec_t codec, headset::bthf_swb_config_t swb, RawAddress* addr) override { - log::info("SwbCallback codec:{}, swb:{} from {}", codec, swb, ADDRESS_TO_LOGGABLE_CSTR(*addr)); + log::info("SwbCallback codec:{}, swb:{} from {}", codec, swb, *addr); rusty::hfp_swb_caps_update_callback( (codec == headset::BTHF_SWB_CODEC_LC3 && swb == headset::BTHF_SWB_YES), *addr); } @@ -220,7 +218,7 @@ class DBusHeadsetCallbacks : public headset::Callbacks { } void AtCopsCallback(RawAddress* bd_addr) override { - log::warn("Respond +COPS: 0 to AT+COPS? from {}", ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::warn("Respond +COPS: 0 to AT+COPS? from {}", *bd_addr); headset_->CopsResponse("", bd_addr); } @@ -256,9 +254,7 @@ class DBusHeadsetCallbacks : public headset::Callbacks { void AtBindCallback(char* at_string, RawAddress* bd_addr) override { log::warn( - "AT+BIND {} from addr {}: Bluetooth HF Indicators is not supported.", - at_string, - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + "AT+BIND {} from addr {}: Bluetooth HF Indicators is not supported.", at_string, *bd_addr); } void AtBievCallback(headset::bthf_hf_ind_type_t ind_id, int ind_value, RawAddress* bd_addr) override { @@ -272,23 +268,13 @@ class DBusHeadsetCallbacks : public headset::Callbacks { headset_->AtResponse(headset::BTHF_AT_RESPONSE_OK, 0, bd_addr); break; default: - log::warn( - "AT+BIEV indicator {} with value {} from addr {}", - ind_id, - ind_value, - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::warn("AT+BIEV indicator {} with value {} from addr {}", ind_id, ind_value, *bd_addr); return; } } void AtBiaCallback(bool service, bool roam, bool signal, bool battery, RawAddress* bd_addr) override { - log::warn( - "AT+BIA=,,{},{},{},{},from addr {}", - service, - signal, - roam, - battery, - ADDRESS_TO_LOGGABLE_CSTR(*bd_addr)); + log::warn("AT+BIA=,,{},{},{},{},from addr {}", service, signal, roam, battery, *bd_addr); } void DebugDumpCallback( diff --git a/system/gd/security/channel/security_manager_channel.cc b/system/gd/security/channel/security_manager_channel.cc index 1483edf2d3..5a4bf01e4c 100644 --- a/system/gd/security/channel/security_manager_channel.cc +++ b/system/gd/security/channel/security_manager_channel.cc @@ -44,7 +44,7 @@ void SecurityManagerChannel::Connect(hci::Address address) { log::assert_that(l2cap_security_interface_ != nullptr, "L2cap Security Interface is null!"); auto entry = link_map_.find(address); if (entry != link_map_.end()) { - log::warn("Already connected to '{}'", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Already connected to '{}'", address); entry->second->Hold(); entry->second->EnsureAuthenticated(); return; @@ -56,7 +56,7 @@ void SecurityManagerChannel::Connect(hci::Address address) { void SecurityManagerChannel::Release(hci::Address address) { auto entry = link_map_.find(address); if (entry == link_map_.end()) { - log::warn("Unknown address '{}'", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Unknown address '{}'", address); return; } entry->second->Release(); @@ -66,7 +66,7 @@ void SecurityManagerChannel::Disconnect(hci::Address address) { outgoing_pairing_remote_devices_.erase(address); auto entry = link_map_.find(address); if (entry == link_map_.end()) { - log::warn("Unknown address '{}'", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Unknown address '{}'", address); return; } entry->second->Disconnect(); @@ -106,7 +106,7 @@ void SecurityManagerChannel::OnLinkConnected(std::unique_ptr<l2cap::classic::Lin void SecurityManagerChannel::OnLinkDisconnected(hci::Address address) { auto entry = link_map_.find(address); if (entry == link_map_.end()) { - log::warn("Unknown address '{}'", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Unknown address '{}'", address); return; } entry->second.reset(); diff --git a/system/gd/security/facade.cc b/system/gd/security/facade.cc index 48c937f1b3..db3b7a1a9b 100644 --- a/system/gd/security/facade.cc +++ b/system/gd/security/facade.cc @@ -517,14 +517,14 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, } void DisconnectEventOccurred(bluetooth::hci::AddressWithType peer) { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::info("{}", peer); DisconnectMsg msg; *msg.mutable_address() = ToFacadeAddressWithType(peer); disconnect_events_.OnIncomingEvent(msg); } void DisplayPairingPrompt(const bluetooth::hci::AddressWithType& peer, std::string /* name */) { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::info("{}", peer); UiMsg display_yes_no; *display_yes_no.mutable_peer() = ToFacadeAddressWithType(peer); display_yes_no.set_message_type(UiMsgType::DISPLAY_PAIRING_PROMPT); @@ -536,7 +536,7 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, const bluetooth::hci::AddressWithType& peer = data.GetAddressWithType(); std::string name = data.GetName(); uint32_t numeric_value = data.GetNumericValue(); - log::info("{} value = 0x{:x}", ADDRESS_TO_LOGGABLE_CSTR(peer), numeric_value); + log::info("{} value = 0x{:x}", peer, numeric_value); UiMsg display_with_value; *display_with_value.mutable_peer() = ToFacadeAddressWithType(peer); display_with_value.set_message_type(UiMsgType::DISPLAY_YES_NO_WITH_VALUE); @@ -548,7 +548,7 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, void DisplayYesNoDialog(ConfirmationData data) override { const bluetooth::hci::AddressWithType& peer = data.GetAddressWithType(); std::string name = data.GetName(); - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::info("{}", peer); UiMsg display_yes_no; *display_yes_no.mutable_peer() = ToFacadeAddressWithType(peer); display_yes_no.set_message_type(UiMsgType::DISPLAY_YES_NO); @@ -560,7 +560,7 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, const bluetooth::hci::AddressWithType& peer = data.GetAddressWithType(); std::string name = data.GetName(); uint32_t passkey = data.GetNumericValue(); - log::info("{} value = 0x{:x}", ADDRESS_TO_LOGGABLE_CSTR(peer), passkey); + log::info("{} value = 0x{:x}", peer, passkey); UiMsg display_passkey; *display_passkey.mutable_peer() = ToFacadeAddressWithType(peer); display_passkey.set_message_type(UiMsgType::DISPLAY_PASSKEY); @@ -572,7 +572,7 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, void DisplayEnterPasskeyDialog(ConfirmationData data) override { const bluetooth::hci::AddressWithType& peer = data.GetAddressWithType(); std::string name = data.GetName(); - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::info("{}", peer); UiMsg display_passkey_input; *display_passkey_input.mutable_peer() = ToFacadeAddressWithType(peer); display_passkey_input.set_message_type(UiMsgType::DISPLAY_PASSKEY_ENTRY); @@ -583,7 +583,7 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, void DisplayEnterPinDialog(ConfirmationData data) override { const bluetooth::hci::AddressWithType& peer = data.GetAddressWithType(); std::string name = data.GetName(); - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::info("{}", peer); UiMsg display_pin_input; *display_pin_input.mutable_peer() = ToFacadeAddressWithType(peer); display_pin_input.set_message_type(UiMsgType::DISPLAY_PIN_ENTRY); @@ -592,7 +592,7 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, } void Cancel(const bluetooth::hci::AddressWithType& peer) override { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::info("{}", peer); UiMsg display_cancel; *display_cancel.mutable_peer() = ToFacadeAddressWithType(peer); display_cancel.set_message_type(UiMsgType::DISPLAY_CANCEL); @@ -601,7 +601,7 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, } void OnDeviceBonded(hci::AddressWithType peer) override { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::info("{}", peer); BondMsg bonded; *bonded.mutable_peer() = ToFacadeAddressWithType(peer); bonded.set_message_type(BondMsgType::DEVICE_BONDED); @@ -611,7 +611,7 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, void OnEncryptionStateChanged(hci::EncryptionChangeView /* encryption_change_view */) override {} void OnDeviceUnbonded(hci::AddressWithType peer) override { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::info("{}", peer); BondMsg unbonded; *unbonded.mutable_peer() = ToFacadeAddressWithType(peer); unbonded.set_message_type(BondMsgType::DEVICE_UNBONDED); @@ -619,7 +619,7 @@ class SecurityModuleFacadeService : public SecurityModuleFacade::Service, } void OnDeviceBondFailed(hci::AddressWithType peer, PairingFailure status) override { - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(peer)); + log::info("{}", peer); BondMsg bond_failed; *bond_failed.mutable_peer() = ToFacadeAddressWithType(peer); bond_failed.set_message_type(BondMsgType::DEVICE_BOND_FAILED); diff --git a/system/gd/security/internal/security_manager_impl.cc b/system/gd/security/internal/security_manager_impl.cc index f3191ea289..453a152b1b 100644 --- a/system/gd/security/internal/security_manager_impl.cc +++ b/system/gd/security/internal/security_manager_impl.cc @@ -276,7 +276,7 @@ void SecurityManagerImpl::HandleEvent(T packet) { event_code != hci::EventCode::IO_CAPABILITY_RESPONSE) { log::error( "No classic pairing handler for device '{}' ready for command {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), + bd_addr, hci::EventCodeText(event_code)); return; } @@ -360,7 +360,7 @@ void SecurityManagerImpl::OnHciEventReceived(hci::EventView packet) { void SecurityManagerImpl::OnConnectionClosed(hci::Address address) { auto entry = pairing_handler_map_.find(address); if (entry != pairing_handler_map_.end()) { - log::info("Cancelling pairing handler for '{}'", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Cancelling pairing handler for '{}'", address); entry->second->Cancel(); } auto record = security_database_.FindOrCreate(hci::AddressWithType(address, hci::AddressType::PUBLIC_DEVICE_ADDRESS)); @@ -433,10 +433,10 @@ void SecurityManagerImpl::OnPasskeyEntry(const bluetooth::hci::AddressWithType& void SecurityManagerImpl::OnPinEntry(const bluetooth::hci::AddressWithType& address, std::vector<uint8_t> pin) { auto entry = pairing_handler_map_.find(address.GetAddress()); if (entry != pairing_handler_map_.end()) { - log::info("PIN for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("PIN for {}", address); entry->second->OnPinEntry(address, pin); } else { - log::warn("No handler found for PIN for {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("No handler found for PIN for {}", address); // TODO(jpawlowski): Implement LE version } } @@ -729,7 +729,7 @@ void SecurityManagerImpl::OnPairingFinished(security::PairingResultOrFailure pai } auto result = std::get<PairingResult>(pairing_result); - log::info("Pairing with {} was successful", ADDRESS_TO_LOGGABLE_CSTR(result.connection_address)); + log::info("Pairing with {} was successful", result.connection_address); // TODO: ensure that the security level is not weaker than what we already have. auto record = this->security_database_.FindOrCreate(result.connection_address); @@ -852,8 +852,7 @@ void SecurityManagerImpl::InternalEnforceSecurityPolicy( void SecurityManagerImpl::UpdateLinkSecurityCondition(hci::AddressWithType remote) { auto entry = enforce_security_policy_callback_map_.find(remote); if (entry == enforce_security_policy_callback_map_.end()) { - log::error( - "No L2CAP security policy callback pending for {}", ADDRESS_TO_LOGGABLE_CSTR(remote)); + log::error("No L2CAP security policy callback pending for {}", remote); return; } std::move(entry->second.callback_).Invoke(IsSecurityRequirementSatisfied(remote, entry->second.policy_)); diff --git a/system/gd/security/pairing/classic_pairing_handler.cc b/system/gd/security/pairing/classic_pairing_handler.cc index d7a9391d54..96cb791303 100644 --- a/system/gd/security/pairing/classic_pairing_handler.cc +++ b/system/gd/security/pairing/classic_pairing_handler.cc @@ -107,7 +107,7 @@ void ClassicPairingHandler::OnPinEntry(const bluetooth::hci::AddressWithType& ad for (size_t i = 0; i < 16 && i < pin.size(); i++) { padded_pin[i] = pin[i]; } - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(address.GetAddress())); + log::info("{}", address.GetAddress()); GetChannel()->SendCommand(hci::PinCodeRequestReplyBuilder::Create(address.GetAddress(), pin.size(), padded_pin)); } diff --git a/system/gd/security/record/security_record_storage.cc b/system/gd/security/record/security_record_storage.cc index 0532a7e92b..244762ff4d 100644 --- a/system/gd/security/record/security_record_storage.cc +++ b/system/gd/security/record/security_record_storage.cc @@ -124,7 +124,7 @@ void SecurityRecordStorage::SaveSecurityRecords(std::set<std::shared_ptr<record: mutation.Add(device.SetDeviceType(hci::DeviceType::LE)); log::warn( "Cannot determine device type from security record for '{}'; defaulting to LE", - ADDRESS_TO_LOGGABLE_CSTR(*record->GetPseudoAddress())); + *record->GetPseudoAddress()); } mutation.Commit(); SetClassicData(mutation, record, device); diff --git a/system/gd/security/test/pairing_handler_le_pair_test.cc b/system/gd/security/test/pairing_handler_le_pair_test.cc index e741802530..8e240e2fc6 100644 --- a/system/gd/security/test/pairing_handler_le_pair_test.cc +++ b/system/gd/security/test/pairing_handler_le_pair_test.cc @@ -106,8 +106,7 @@ void OnPairingFinishedCentral(PairingResultOrFailure r) { pairing_result_central = r; if (std::holds_alternative<PairingResult>(r)) { log::info( - "pairing finished successfully with {}", - ADDRESS_TO_LOGGABLE_CSTR(std::get<PairingResult>(r).connection_address)); + "pairing finished successfully with {}", std::get<PairingResult>(r).connection_address); } else { log::info("pairing with ... failed: {}", std::get<PairingFailure>(r).message); } @@ -117,8 +116,7 @@ void OnPairingFinishedPeripheral(PairingResultOrFailure r) { pairing_result_peripheral = r; if (std::holds_alternative<PairingResult>(r)) { log::info( - "pairing finished successfully with {}", - ADDRESS_TO_LOGGABLE_CSTR(std::get<PairingResult>(r).connection_address)); + "pairing finished successfully with {}", std::get<PairingResult>(r).connection_address); } else { log::info("pairing with ... failed: {}", std::get<PairingFailure>(r).message); } diff --git a/system/main/shim/acl.cc b/system/main/shim/acl.cc index fca60d3003..85fae109d4 100644 --- a/system/main/shim/acl.cc +++ b/system/main/shim/acl.cc @@ -117,6 +117,20 @@ struct hash<ConnectAddressWithType> { }; } // namespace std +namespace fmt { +template <> +struct formatter<ConnectAddressWithType> : formatter<std::string> { + template <class Context> + typename Context::iterator format(const ConnectAddressWithType& address, + Context& ctx) const { + std::string repr = bluetooth::os::should_log_be_redacted() + ? address.ToRedactedStringForLogging() + : address.ToStringForLogging(); + return fmt::formatter<std::string>::format(repr, ctx); + } +}; +} // namespace fmt + namespace { constexpr uint32_t kRunicBjarkan = 0x0016D2; @@ -165,7 +179,7 @@ class ShadowAcceptlist { if (!acceptlist_set_.insert(ConnectAddressWithType(address_with_type)) .second) { log::warn("Attempted to add duplicate le address to acceptlist:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + address_with_type); } return true; } @@ -174,7 +188,7 @@ class ShadowAcceptlist { auto iter = acceptlist_set_.find(ConnectAddressWithType(address_with_type)); if (iter == acceptlist_set_.end()) { log::warn("Unknown device being removed from acceptlist:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + address_with_type); return false; } acceptlist_set_.erase(ConnectAddressWithType(*iter)); @@ -212,7 +226,7 @@ class ShadowAddressResolutionList { if (!address_resolution_set_.insert(address_with_type).second) { log::warn( "Attempted to add duplicate le address to address_resolution:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + address_with_type); } return true; } @@ -221,7 +235,7 @@ class ShadowAddressResolutionList { auto iter = address_resolution_set_.find(address_with_type); if (iter == address_resolution_set_.end()) { log::warn("Unknown device being removed from address_resolution:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + address_with_type); return false; } address_resolution_set_.erase(iter); @@ -1082,7 +1096,7 @@ struct shim::legacy::Acl::impl { connection->second->InitiateDisconnect( ToDisconnectReasonFromLegacy(reason)); log::debug("Disconnection initiated classic remote:{} handle:{}", - ADDRESS_TO_LOGGABLE_CSTR(remote_address), handle); + remote_address, handle); BTM_LogHistory(kBtmLogTag, ToRawAddress(remote_address), "Disconnection initiated", base::StringPrintf("classic reason:%s comment:%s", @@ -1107,7 +1121,7 @@ struct shim::legacy::Acl::impl { connection->second->InitiateDisconnect( ToDisconnectReasonFromLegacy(reason)); log::debug("Disconnection initiated le remote:{} handle:{}", - ADDRESS_TO_LOGGABLE_CSTR(remote_address_with_type), handle); + remote_address_with_type, handle); BTM_LogHistory(kBtmLogTag, ToLegacyAddressWithType(remote_address_with_type), "Disconnection initiated", @@ -1146,8 +1160,7 @@ struct shim::legacy::Acl::impl { shadow_acceptlist_.Add(address_with_type); promise.set_value(true); GetAclManager()->CreateLeConnection(address_with_type, is_direct); - log::debug("Allow Le connection from remote:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + log::debug("Allow Le connection from remote:{}", address_with_type); BTM_LogHistory(kBtmLogTag, ToLegacyAddressWithType(address_with_type), "Allow connection from", "Le"); } @@ -1156,8 +1169,7 @@ struct shim::legacy::Acl::impl { const hci::AddressWithType& address_with_type) { shadow_acceptlist_.Remove(address_with_type); GetAclManager()->CancelLeConnect(address_with_type); - log::debug("Ignore Le connection from remote:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + log::debug("Ignore Le connection from remote:{}", address_with_type); BTM_LogHistory(kBtmLogTag, ToLegacyAddressWithType(address_with_type), "Ignore connection from", "Le"); } @@ -1189,7 +1201,7 @@ struct shim::legacy::Acl::impl { // TODO This should really be removed upon successful removal if (!shadow_address_resolution_list_.Remove(address_with_type)) { log::warn("Unable to remove from Le Address Resolution list device:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + address_with_type); } GetAclManager()->RemoveDeviceFromResolvingList(address_with_type); } @@ -1214,7 +1226,7 @@ struct shim::legacy::Acl::impl { log::debug("Shadow le accept list size:{:<3} controller_max_size:{}", acceptlist.size(), shadow_acceptlist_.GetMaxSize()); for (auto& entry : acceptlist) { - log::debug("acceptlist:{}", ADDRESS_TO_LOGGABLE_CSTR(entry)); + log::debug("acceptlist:{}", entry); } } @@ -1436,13 +1448,12 @@ bool shim::legacy::Acl::CheckForOrphanedAclConnections() const { if (!pimpl_->handle_to_classic_connection_map_.empty()) { log::error("About to destroy classic active ACL"); for (const auto& connection : pimpl_->handle_to_classic_connection_map_) { - log::error( - "Orphaned classic ACL handle:0x{:04x} bd_addr:{} created:{}", - connection.second->Handle(), - ADDRESS_TO_LOGGABLE_CSTR(connection.second->GetRemoteAddress()), - common::StringFormatTimeWithMilliseconds( - kConnectionDescriptorTimeFormat, - connection.second->GetCreationTime())); + log::error("Orphaned classic ACL handle:0x{:04x} bd_addr:{} created:{}", + connection.second->Handle(), + connection.second->GetRemoteAddress(), + common::StringFormatTimeWithMilliseconds( + kConnectionDescriptorTimeFormat, + connection.second->GetCreationTime())); } orphaned_acl_connections = true; } @@ -1452,8 +1463,7 @@ bool shim::legacy::Acl::CheckForOrphanedAclConnections() const { for (const auto& connection : pimpl_->handle_to_le_connection_map_) { log::error("Orphaned le ACL handle:0x{:04x} bd_addr:{} created:{}", connection.second->Handle(), - ADDRESS_TO_LOGGABLE_CSTR( - connection.second->GetRemoteAddressWithType()), + connection.second->GetRemoteAddressWithType(), common::StringFormatTimeWithMilliseconds( kConnectionDescriptorTimeFormat, connection.second->GetCreationTime())); @@ -1495,16 +1505,14 @@ void shim::legacy::Acl::Flush(HciHandle handle) { void shim::legacy::Acl::CreateClassicConnection(const hci::Address& address) { GetAclManager()->CreateConnection(address); - log::debug("Connection initiated for classic to remote:{}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("Connection initiated for classic to remote:{}", address); BTM_LogHistory(kBtmLogTag, ToRawAddress(address), "Initiated connection", "classic"); } void shim::legacy::Acl::CancelClassicConnection(const hci::Address& address) { GetAclManager()->CancelConnect(address); - log::debug("Connection cancelled for classic to remote:{}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("Connection cancelled for classic to remote:{}", address); BTM_LogHistory(kBtmLogTag, ToRawAddress(address), "Cancelled connection", "classic"); } @@ -1512,16 +1520,14 @@ void shim::legacy::Acl::CancelClassicConnection(const hci::Address& address) { void shim::legacy::Acl::AcceptLeConnectionFrom( const hci::AddressWithType& address_with_type, bool is_direct, std::promise<bool> promise) { - log::debug("AcceptLeConnectionFrom {}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type.GetAddress())); + log::debug("AcceptLeConnectionFrom {}", address_with_type.GetAddress()); handler_->CallOn(pimpl_.get(), &Acl::impl::accept_le_connection_from, address_with_type, is_direct, std::move(promise)); } void shim::legacy::Acl::IgnoreLeConnectionFrom( const hci::AddressWithType& address_with_type) { - log::debug("IgnoreLeConnectionFrom {}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type.GetAddress())); + log::debug("IgnoreLeConnectionFrom {}", address_with_type.GetAddress()); handler_->CallOn(pimpl_.get(), &Acl::impl::ignore_le_connection_from, address_with_type); } @@ -1542,8 +1548,7 @@ void shim::legacy::Acl::OnClassicLinkDisconnected(HciHandle handle, ToLegacyHciErrorCode(hci::ErrorCode::SUCCESS), handle, ToLegacyHciErrorCode(reason)); log::debug("Disconnected classic link remote:{} handle:{} reason:{}", - ADDRESS_TO_LOGGABLE_CSTR(remote_address), handle, - ErrorCodeText(reason)); + remote_address, handle, ErrorCodeText(reason)); BTM_LogHistory( kBtmLogTag, ToRawAddress(remote_address), "Disconnected", base::StringPrintf("classic reason:%s", ErrorCodeText(reason).c_str())); @@ -1616,8 +1621,7 @@ void shim::legacy::Acl::OnLeLinkDisconnected(HciHandle handle, ToLegacyHciErrorCode(hci::ErrorCode::SUCCESS), handle, ToLegacyHciErrorCode(reason)); log::debug("Disconnected le link remote:{} handle:{} reason:{}", - ADDRESS_TO_LOGGABLE_CSTR(remote_address_with_type), handle, - ErrorCodeText(reason)); + remote_address_with_type, handle, ErrorCodeText(reason)); BTM_LogHistory( kBtmLogTag, ToLegacyAddressWithType(remote_address_with_type), "Disconnected", @@ -1650,8 +1654,7 @@ void shim::legacy::Acl::OnConnectSuccess( TRY_POSTING_ON_MAIN(acl_interface_.connection.classic.on_connected, bd_addr, handle, false, locally_initiated); log::debug("Connection successful classic remote:{} handle:{} initiator:{}", - ADDRESS_TO_LOGGABLE_CSTR(remote_address), handle, - (locally_initiated) ? "local" : "remote"); + remote_address, handle, (locally_initiated) ? "local" : "remote"); BTM_LogHistory(kBtmLogTag, ToRawAddress(remote_address), "Connection successful", (locally_initiated) ? "classic Local initiated" @@ -1666,8 +1669,7 @@ void shim::legacy::Acl::OnConnectRequest(hci::Address address, TRY_POSTING_ON_MAIN(acl_interface_.connection.classic.on_connect_request, bd_addr, cod); log::debug("Received connect request remote:{} gd_cod:{} legacy_dev_class:{}", - ADDRESS_TO_LOGGABLE_CSTR(address), cod.ToString(), - dev_class_text(dev_class)); + address, cod.ToString(), dev_class_text(dev_class)); BTM_LogHistory(kBtmLogTag, ToRawAddress(address), "Connection request", base::StringPrintf("gd_cod:%s legacy_dev_class:%s", cod.ToString().c_str(), @@ -1680,8 +1682,8 @@ void shim::legacy::Acl::OnConnectFail(hci::Address address, const RawAddress bd_addr = ToRawAddress(address); TRY_POSTING_ON_MAIN(acl_interface_.connection.classic.on_failed, bd_addr, ToLegacyHciErrorCode(reason), locally_initiated); - log::warn("Connection failed classic remote:{} reason:{}", - ADDRESS_TO_LOGGABLE_CSTR(address), hci::ErrorCodeText(reason)); + log::warn("Connection failed classic remote:{} reason:{}", address, + hci::ErrorCodeText(reason)); BTM_LogHistory(kBtmLogTag, ToRawAddress(address), "Connection failed", base::StringPrintf("classic reason:%s", hci::ErrorCodeText(reason).c_str())); @@ -1739,12 +1741,10 @@ void shim::legacy::Acl::OnLeConnectSuccess( if (IsRpa(address_with_type)) { log::debug("Connection address is rpa:{} identity_addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type), - ADDRESS_TO_LOGGABLE_CSTR(peer_address_with_type)); + address_with_type, peer_address_with_type); pimpl_->shadow_acceptlist_.Remove(peer_address_with_type); } else { - log::debug("Connection address is not rpa addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + log::debug("Connection address is not rpa addr:{}", address_with_type); pimpl_->shadow_acceptlist_.Remove(address_with_type); } @@ -1771,7 +1771,7 @@ void shim::legacy::Acl::OnLeConnectSuccess( peer_addr_type, can_read_discoverable_characteristics); log::debug("Connection successful le remote:{} handle:{} initiator:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type), handle, + address_with_type, handle, (locally_initiated) ? "local" : "remote"); BTM_LogHistory(kBtmLogTag, ToLegacyAddressWithType(address_with_type), "Connection successful", "Le"); @@ -1790,8 +1790,7 @@ void shim::legacy::Acl::OnLeConnectFail(hci::AddressWithType address_with_type, legacy_address_with_type, handle, enhanced, status); pimpl_->shadow_acceptlist_.Remove(address_with_type); - log::warn("Connection failed le remote:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + log::warn("Connection failed le remote:{}", address_with_type); BTM_LogHistory( kBtmLogTag, ToLegacyAddressWithType(address_with_type), "Connection failed", diff --git a/system/main/test/main_shim_stack_dumpsys_test.cc b/system/main/test/main_shim_stack_dumpsys_test.cc index e782856ec0..7cdd262e40 100644 --- a/system/main/test/main_shim_stack_dumpsys_test.cc +++ b/system/main/test/main_shim_stack_dumpsys_test.cc @@ -171,8 +171,7 @@ class TestStackDumpsysBase : public bluetooth::Module, static const ModuleFactory Factory; virtual void TestMethod(TestData test_data) const { - log::info("Test base class iter:{} tag:{}", test_data.iter, - test_data.tag.c_str()); + log::info("Test base class iter:{} tag:{}", test_data.iter, test_data.tag); } protected: @@ -321,8 +320,7 @@ class TestStackDumpsys4 : public TestStackDumpsysBase { static const ModuleFactory Factory; void TestMethod(TestData test_data) const override { - log::info("mod:{} iter:{} tag:{}", __func__, test_data.iter, - test_data.tag.c_str()); + log::info("mod:{} iter:{} tag:{}", __func__, test_data.iter, test_data.tag); } private: diff --git a/system/main/test/main_shim_stack_lifecycle_test.cc b/system/main/test/main_shim_stack_lifecycle_test.cc index 39c9636a4e..f8c4048d79 100644 --- a/system/main/test/main_shim_stack_lifecycle_test.cc +++ b/system/main/test/main_shim_stack_lifecycle_test.cc @@ -152,8 +152,7 @@ class TestStackModuleBase : public bluetooth::Module, static const ModuleFactory Factory; virtual void TestMethod(TestData test_data) const { - log::info("Test base class iter:{} tag:{}", test_data.iter, - test_data.tag.c_str()); + log::info("Test base class iter:{} tag:{}", test_data.iter, test_data.tag); } protected: @@ -285,8 +284,7 @@ class TestStackModule4 : public TestStackModuleBase { static const ModuleFactory Factory; void TestMethod(TestData test_data) const override { - log::info("mod:{} iter:{} tag:{}", __func__, test_data.iter, - test_data.tag.c_str()); + log::info("mod:{} iter:{} tag:{}", __func__, test_data.iter, test_data.tag); } private: diff --git a/system/osi/test/stack_power_telemetry_test.cc b/system/osi/test/stack_power_telemetry_test.cc index 55e7799cda..8668e39c01 100644 --- a/system/osi/test/stack_power_telemetry_test.cc +++ b/system/osi/test/stack_power_telemetry_test.cc @@ -1,8 +1,8 @@ -#include "osi/include/stack_power_telemetry.h" +#include "osi/src/stack_power_telemetry.cc" #include <gtest/gtest.h> -#include "osi/src/stack_power_telemetry.cc" +#include "osi/include/stack_power_telemetry.h" #include "types/raw_address.h" class PowerTelemetryTest : public ::testing::Test { diff --git a/system/pdl/hci/include/hci/address.h b/system/pdl/hci/include/hci/address.h index 283c9c3baf..d176a74774 100644 --- a/system/pdl/hci/include/hci/address.h +++ b/system/pdl/hci/include/hci/address.h @@ -26,6 +26,7 @@ #include <string> #include "common/interfaces/ILoggable.h" +#include "os/logging/log_adapter.h" #include "packet/custom_field_fixed_size_interface.h" #include "storage/serializable.h" @@ -110,3 +111,22 @@ struct hash<bluetooth::hci::Address> { } }; } // namespace std + +#if __has_include(<bluetooth/log.h>) +#include <bluetooth/log.h> + +namespace fmt { +template <> +struct formatter<bluetooth::hci::Address> : formatter<std::string> { + template <class Context> + typename Context::iterator format(const bluetooth::hci::Address& address, + Context& ctx) const { + std::string repr = bluetooth::os::should_log_be_redacted() + ? address.ToRedactedStringForLogging() + : address.ToStringForLogging(); + return fmt::formatter<std::string>::format(repr, ctx); + } +}; +} // namespace fmt + +#endif // __has_include(<bluetooth/log.h>) diff --git a/system/profile/avrcp/connection_handler.cc b/system/profile/avrcp/connection_handler.cc index 9339dc39b9..a30c6a8a6a 100644 --- a/system/profile/avrcp/connection_handler.cc +++ b/system/profile/avrcp/connection_handler.cc @@ -125,13 +125,11 @@ void ConnectionHandler::InitForTesting(ConnectionHandler* handler) { } bool ConnectionHandler::ConnectDevice(const RawAddress& bdaddr) { - log::info("Attempting to connect to device {}", - ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::info("Attempting to connect to device {}", bdaddr); for (const auto& pair : device_map_) { if (bdaddr == pair.second->GetAddress()) { - log::warn("Already connected to device with address {}", - ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::warn("Already connected to device with address {}", bdaddr); return false; } } @@ -212,7 +210,7 @@ bool ConnectionHandler::SdpLookup(const RawAddress& bdaddr, SdpCallback cb, } bool ConnectionHandler::AvrcpConnect(bool initiator, const RawAddress& bdaddr) { - log::info("Connect to device {}", ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::info("Connect to device {}", bdaddr); tAVRC_CONN_CB open_cb; if (initiator) { @@ -368,8 +366,7 @@ void ConnectionHandler::AcceptorControlCb(uint8_t handle, uint8_t event, device_map_[handle] = newDevice; connection_cb_.Run(newDevice); - log::info("Performing SDP on connected device. address={}", - ADDRESS_TO_LOGGABLE_STR(*peer_addr)); + log::info("Performing SDP on connected device. address={}", *peer_addr); auto sdp_lambda = [](ConnectionHandler* instance_, uint8_t handle, uint16_t status, uint16_t version, uint16_t features) { @@ -500,8 +497,7 @@ void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb, sdp_record = sdp_->FindServiceInDb(disc_db, UUID_SERVCLASS_AV_REMOTE_CONTROL, nullptr); if (sdp_record != nullptr) { - log::info("Device {} supports remote control", - ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::info("Device {} supports remote control", bdaddr); peer_features |= BTA_AV_FEAT_RCCT; if ((sdp_->FindAttributeInRec(sdp_record, ATTR_ID_BT_PROFILE_DESC_LIST)) != @@ -509,14 +505,13 @@ void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb, /* get profile version (if failure, version parameter is not updated) */ sdp_->FindProfileVersionInRec( sdp_record, UUID_SERVCLASS_AV_REMOTE_CONTROL, &peer_avrcp_version); - log::verbose("Device {} peer avrcp version={}", - ADDRESS_TO_LOGGABLE_STR(bdaddr), loghex(peer_avrcp_version)); + log::verbose("Device {} peer avrcp version={}", bdaddr, + loghex(peer_avrcp_version)); if (peer_avrcp_version >= AVRC_REV_1_3) { // These are the standard features, another way to check this is to // search for CAT1 on the remote device - log::verbose("Device {} supports metadata", - ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::verbose("Device {} supports metadata", bdaddr); peer_features |= (BTA_AV_FEAT_VENDOR | BTA_AV_FEAT_METADATA); } if (peer_avrcp_version >= AVRC_REV_1_4) { @@ -530,15 +525,13 @@ void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb, log::verbose("Get Supported categories SDP ATTRIBUTES != null"); uint16_t categories = sdp_attribute->attr_value.v.u16; if (categories & AVRC_SUPF_CT_CAT2) { - log::verbose("Device {} supports advanced control", - ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::verbose("Device {} supports advanced control", bdaddr); if (IsAbsoluteVolumeEnabled(&bdaddr)) { peer_features |= (BTA_AV_FEAT_ADV_CTRL); } } if (categories & AVRC_SUPF_CT_BROWSE) { - log::verbose("Device {} supports browsing", - ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::verbose("Device {} supports browsing", bdaddr); peer_features |= (BTA_AV_FEAT_BROWSE); } } @@ -553,14 +546,12 @@ void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb, sdp_record = sdp_->FindServiceInDb(disc_db, UUID_SERVCLASS_AV_REM_CTRL_TARGET, nullptr); if (sdp_record != nullptr) { - log::verbose("Device {} supports remote control target", - ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::verbose("Device {} supports remote control target", bdaddr); uint16_t peer_avrcp_target_version = 0; sdp_->FindProfileVersionInRec(sdp_record, UUID_SERVCLASS_AV_REMOTE_CONTROL, &peer_avrcp_target_version); - log::verbose("Device {} peer avrcp target version={}", - ADDRESS_TO_LOGGABLE_STR(bdaddr), + log::verbose("Device {} peer avrcp target version={}", bdaddr, loghex(peer_avrcp_target_version)); if ((sdp_->FindAttributeInRec(sdp_record, ATTR_ID_BT_PROFILE_DESC_LIST)) != @@ -576,8 +567,7 @@ void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb, log::verbose("Get Supported categories SDP ATTRIBUTES != null"); uint16_t categories = sdp_attribute->attr_value.v.u16; if (categories & AVRC_SUPF_CT_CAT2) { - log::verbose("Device {} supports advanced control", - ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::verbose("Device {} supports advanced control", bdaddr); if (IsAbsoluteVolumeEnabled(&bdaddr)) { peer_features |= (BTA_AV_FEAT_ADV_CTRL); } @@ -638,8 +628,7 @@ void ConnectionHandler::SendMessage( } void ConnectionHandler::RegisterVolChanged(const RawAddress& bdaddr) { - log::info("Attempting to RegisterVolChanged device {}", - ADDRESS_TO_LOGGABLE_STR(bdaddr)); + log::info("Attempting to RegisterVolChanged device {}", bdaddr); for (auto it = device_map_.begin(); it != device_map_.end(); it++) { if (bdaddr == it->second->GetAddress()) { const auto& feature_iter = feature_map_.find(bdaddr); diff --git a/system/profile/avrcp/device.cc b/system/profile/avrcp/device.cc index 13dc333c63..89de0ad464 100644 --- a/system/profile/avrcp/device.cc +++ b/system/profile/avrcp/device.cc @@ -80,13 +80,12 @@ void Device::RegisterInterfaces( base::WeakPtr<Device> Device::Get() { return weak_ptr_factory_.GetWeakPtr(); } void Device::SetBrowseMtu(uint16_t browse_mtu) { - log::info("{}: browse_mtu = {}", ADDRESS_TO_LOGGABLE_STR(address_), - browse_mtu); + log::info("{}: browse_mtu = {}", address_, browse_mtu); browse_mtu_ = browse_mtu; } void Device::SetBipClientStatus(bool connected) { - log::info("{}: connected = {}", ADDRESS_TO_LOGGABLE_STR(address_), connected); + log::info("{}: connected = {}", address_, connected); has_bip_client_ = connected; } @@ -116,8 +115,7 @@ void Device::VendorPacketHandler(uint8_t label, log::verbose("pdu={}", pkt->GetCommandPdu()); if (!pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(static_cast<CommandPdu>(0), Status::INVALID_COMMAND); send_message(label, false, std::move(response)); @@ -140,8 +138,7 @@ void Device::VendorPacketHandler(uint8_t label, (btif_av_src_sink_coexist_enabled() && register_notification->GetEvent() == Event::VOLUME_CHANGED)) && !register_notification->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -153,8 +150,7 @@ void Device::VendorPacketHandler(uint8_t label, if (register_notification->GetEvent() != Event::VOLUME_CHANGED) { log::warn("{}: Unhandled register notification received: {}", - ADDRESS_TO_LOGGABLE_STR(address_), - register_notification->GetEvent()); + address_, register_notification->GetEvent()); return; } HandleVolumeChanged(label, register_notification); @@ -166,8 +162,8 @@ void Device::VendorPacketHandler(uint8_t label, // about the response to this message. break; default: - log::warn("{}: Unhandled Response: pdu={}", - ADDRESS_TO_LOGGABLE_STR(address_), pkt->GetCommandPdu()); + log::warn("{}: Unhandled Response: pdu={}", address_, + pkt->GetCommandPdu()); break; } return; @@ -189,8 +185,7 @@ void Device::VendorPacketHandler(uint8_t label, Packet::Specialize<GetElementAttributesRequest>(pkt); if (!get_element_attributes_request_pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -220,8 +215,7 @@ void Device::VendorPacketHandler(uint8_t label, Packet::Specialize<SetAddressedPlayerRequest>(pkt); if (!set_addressed_player_request->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -259,8 +253,7 @@ void Device::VendorPacketHandler(uint8_t label, Packet::Specialize<ListPlayerApplicationSettingValuesRequest>(pkt); if (!list_player_setting_values_request->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -271,8 +264,7 @@ void Device::VendorPacketHandler(uint8_t label, list_player_setting_values_request->GetRequestedAttribute(); if (attribute < PlayerAttribute::EQUALIZER || attribute > PlayerAttribute::SCAN) { - log::warn("{}: Player Setting Attribute is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Player Setting Attribute is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -298,8 +290,7 @@ void Device::VendorPacketHandler(uint8_t label, pkt); if (!get_current_player_setting_value_request->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -311,8 +302,7 @@ void Device::VendorPacketHandler(uint8_t label, for (auto attribute : attributes) { if (attribute < PlayerAttribute::EQUALIZER || attribute > PlayerAttribute::SCAN) { - log::warn("{}: Player Setting Attribute is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Player Setting Attribute is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -338,8 +328,7 @@ void Device::VendorPacketHandler(uint8_t label, Packet::Specialize<SetPlayerApplicationSettingValueRequest>(pkt); if (!set_player_setting_value_request->IsValid()) { - log::warn("{} : Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{} : Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -355,8 +344,7 @@ void Device::VendorPacketHandler(uint8_t label, for (size_t i = 0; i < attributes.size(); i++) { if (attributes[i] < PlayerAttribute::EQUALIZER || attributes[i] > PlayerAttribute::SCAN) { - log::warn("{}: Player Setting Attribute is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Player Setting Attribute is not valid", address_); invalid_request = true; break; } @@ -365,8 +353,7 @@ void Device::VendorPacketHandler(uint8_t label, PlayerRepeatValue value = static_cast<PlayerRepeatValue>(values[i]); if (value < PlayerRepeatValue::OFF || value > PlayerRepeatValue::GROUP) { - log::warn("{}: Player Repeat Value is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Player Repeat Value is not valid", address_); invalid_request = true; break; } @@ -374,8 +361,7 @@ void Device::VendorPacketHandler(uint8_t label, PlayerShuffleValue value = static_cast<PlayerShuffleValue>(values[i]); if (value < PlayerShuffleValue::OFF || value > PlayerShuffleValue::GROUP) { - log::warn("{}: Player Shuffle Value is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Player Shuffle Value is not valid", address_); invalid_request = true; break; } @@ -397,8 +383,7 @@ void Device::VendorPacketHandler(uint8_t label, } break; default: { - log::error("{}: Unhandled Vendor Packet: {}", - ADDRESS_TO_LOGGABLE_STR(address_), pkt->ToString()); + log::error("{}: Unhandled Vendor Packet: {}", address_, pkt->ToString()); auto response = RejectBuilder::MakeBuilder( (CommandPdu)pkt->GetCommandPdu(), Status::INVALID_COMMAND); send_message(label, false, std::move(response)); @@ -409,8 +394,7 @@ void Device::VendorPacketHandler(uint8_t label, void Device::HandleGetCapabilities( uint8_t label, const std::shared_ptr<GetCapabilitiesRequest>& pkt) { if (!pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -448,8 +432,7 @@ void Device::HandleGetCapabilities( } break; default: { - log::warn("{}: Unhandled Capability: {}", - ADDRESS_TO_LOGGABLE_STR(address_), + log::warn("{}: Unhandled Capability: {}", address_, pkt->GetCapabilityRequested()); auto response = RejectBuilder::MakeBuilder(CommandPdu::GET_CAPABILITIES, Status::INVALID_PARAMETER); @@ -461,8 +444,7 @@ void Device::HandleGetCapabilities( void Device::HandleNotification( uint8_t label, const std::shared_ptr<RegisterNotificationRequest>& pkt) { if (!pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -544,8 +526,8 @@ void Device::HandleNotification( } break; default: { - log::error("{}: Unknown event registered. Event ID={}", - ADDRESS_TO_LOGGABLE_STR(address_), pkt->GetEventRegistered()); + log::error("{}: Unknown event registered. Event ID={}", address_, + pkt->GetEventRegistered()); auto response = RejectBuilder::MakeBuilder( (CommandPdu)pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -574,7 +556,7 @@ void Device::RegisterVolumeChanged() { if (label == MAX_TRANSACTION_LABEL) { log::fatal("{}: Abandon all hope, something went catastrophically wrong", - ADDRESS_TO_LOGGABLE_STR(address_)); + address_); } send_message_cb_.Run(label, false, std::move(request)); @@ -630,7 +612,7 @@ void Device::SetVolume(int8_t volume) { log::verbose("volume={}", (int)volume); if (volume == volume_) { log::warn("{}: Ignoring volume change same as current volume level", - ADDRESS_TO_LOGGABLE_STR(address_)); + address_); return; } auto request = SetAbsoluteVolumeRequestBuilder::MakeBuilder(volume); @@ -673,7 +655,7 @@ void Device::TrackChangedNotificationResponse(uint8_t label, bool interim, // Case for browsing not supported; // PTS BV-04-C and BV-5-C assume browsing not supported if (stack_config_get_interface()->get_pts_avrcp_test()) { - log::warn("{}: pts test mode", ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: pts test mode", address_); uint64_t uid = curr_song_id.empty() ? 0xffffffffffffffff : 0; auto response = RegisterNotificationResponseBuilder::MakeTrackChangedBuilder(interim, @@ -696,8 +678,7 @@ void Device::TrackChangedNotificationResponse(uint8_t label, bool interim, if (uid == 0) { // uid 0 is not valid here when browsing is supported - log::error("{}: No match for media ID found", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::error("{}: No match for media ID found", address_); } auto response = RegisterNotificationResponseBuilder::MakeTrackChangedBuilder( @@ -721,7 +702,7 @@ void Device::PlaybackStatusNotificationResponse(uint8_t label, bool interim, if (!IsActive()) state_to_send = PlayState::PAUSED; if (!interim && state_to_send == last_play_status_.state) { log::verbose("Not sending notification due to no state update {}", - ADDRESS_TO_LOGGABLE_STR(address_)); + address_); return; } @@ -750,8 +731,7 @@ void Device::PlaybackPosNotificationResponse(uint8_t label, bool interim, } if (!interim && last_play_status_.position == status.position) { - log::warn("{}: No update to play position", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: No update to play position", address_); return; } @@ -873,8 +853,7 @@ void Device::GetElementAttributesResponse( void Device::MessageReceived(uint8_t label, std::shared_ptr<Packet> pkt) { if (!pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(static_cast<CommandPdu>(0), Status::INVALID_COMMAND); send_message(label, false, std::move(response)); @@ -900,8 +879,7 @@ void Device::MessageReceived(uint8_t label, std::shared_ptr<Packet> pkt) { auto pass_through_packet = Packet::Specialize<PassThroughPacket>(pkt); if (!pass_through_packet->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(static_cast<CommandPdu>(0), Status::INVALID_COMMAND); send_message(label, false, std::move(response)); @@ -924,8 +902,7 @@ void Device::MessageReceived(uint8_t label, std::shared_ptr<Packet> pkt) { if (!d) return; if (!d->IsActive()) { - log::info("Setting {} to be the active device", - ADDRESS_TO_LOGGABLE_STR(d->address_)); + log::info("Setting {} to be the active device", d->address_); d->media_interface_->SetActiveDevice(d->address_); if (s.state == PlayState::PLAYING) { @@ -956,8 +933,7 @@ void Device::MessageReceived(uint8_t label, std::shared_ptr<Packet> pkt) { void Device::HandlePlayItem(uint8_t label, std::shared_ptr<PlayItemRequest> pkt) { if (!pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = RejectBuilder::MakeBuilder(pkt->GetCommandPdu(), Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); @@ -975,8 +951,7 @@ void Device::HandlePlayItem(uint8_t label, media_id = vfs_ids_.get_media_id(pkt->GetUid()); break; default: - log::warn("{}: Unknown scope for play item", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Unknown scope for play item", address_); } if (media_id == "") { @@ -1077,8 +1052,7 @@ void Device::SetPlayerApplicationSettingValueResponse(uint8_t label, CommandPdu pdu, bool success) { if (!success) { - log::error("{}: Set Player Application Setting Value failed", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::error("{}: Set Player Application Setting Value failed", address_); auto response = RejectBuilder::MakeBuilder(pdu, Status::INVALID_PARAMETER); send_message(label, false, std::move(response)); return; @@ -1092,8 +1066,7 @@ void Device::SetPlayerApplicationSettingValueResponse(uint8_t label, void Device::BrowseMessageReceived(uint8_t label, std::shared_ptr<BrowsePacket> pkt) { if (!pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = GeneralRejectBuilder::MakeBuilder(Status::INVALID_COMMAND); send_message(label, false, std::move(response)); return; @@ -1122,7 +1095,7 @@ void Device::BrowseMessageReceived(uint8_t label, label, Packet::Specialize<GetTotalNumberOfItemsRequest>(pkt)); break; default: - log::warn("{}: pdu={}", ADDRESS_TO_LOGGABLE_STR(address_), pkt->GetPdu()); + log::warn("{}: pdu={}", address_, pkt->GetPdu()); auto response = GeneralRejectBuilder::MakeBuilder(Status::INVALID_COMMAND); send_message(label, true, std::move(response)); @@ -1135,8 +1108,7 @@ void Device::HandleGetFolderItems(uint8_t label, std::shared_ptr<GetFolderItemsRequest> pkt) { if (!pkt->IsValid()) { // The specific get folder items builder is unimportant on failure. - log::warn("{}: Get folder items request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Get folder items request packet is not valid", address_); auto response = GetFolderItemsResponseBuilder::MakePlayerListBuilder( Status::INVALID_PARAMETER, 0x0000, browse_mtu_); send_message(label, true, std::move(response)); @@ -1163,8 +1135,7 @@ void Device::HandleGetFolderItems(uint8_t label, weak_ptr_factory_.GetWeakPtr(), label, pkt)); break; default: - log::error("{}: scope={}", ADDRESS_TO_LOGGABLE_STR(address_), - pkt->GetScope()); + log::error("{}: scope={}", address_, pkt->GetScope()); auto response = GetFolderItemsResponseBuilder::MakePlayerListBuilder( Status::INVALID_PARAMETER, 0, browse_mtu_); send_message(label, true, std::move(response)); @@ -1175,8 +1146,7 @@ void Device::HandleGetFolderItems(uint8_t label, void Device::HandleGetTotalNumberOfItems( uint8_t label, std::shared_ptr<GetTotalNumberOfItemsRequest> pkt) { if (!pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = GetTotalNumberOfItemsResponseBuilder::MakeBuilder( Status::INVALID_PARAMETER, 0x0000, 0); send_message(label, true, std::move(response)); @@ -1204,8 +1174,7 @@ void Device::HandleGetTotalNumberOfItems( weak_ptr_factory_.GetWeakPtr(), label)); break; default: - log::error("{}: scope={}", ADDRESS_TO_LOGGABLE_STR(address_), - pkt->GetScope()); + log::error("{}: scope={}", address_, pkt->GetScope()); break; } } @@ -1240,8 +1209,7 @@ void Device::GetTotalNumberOfItemsNowPlayingResponse( void Device::HandleChangePath(uint8_t label, std::shared_ptr<ChangePathRequest> pkt) { if (!pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = ChangePathResponseBuilder::MakeBuilder(Status::INVALID_PARAMETER, 0); send_message(label, true, std::move(response)); @@ -1253,8 +1221,7 @@ void Device::HandleChangePath(uint8_t label, if (pkt->GetDirection() == Direction::DOWN && vfs_ids_.get_media_id(pkt->GetUid()) == "") { - log::error("{}: No item found for UID={}", - ADDRESS_TO_LOGGABLE_STR(address_), pkt->GetUid()); + log::error("{}: No item found for UID={}", address_, pkt->GetUid()); auto builder = ChangePathResponseBuilder::MakeBuilder(Status::DOES_NOT_EXIST, 0); send_message(label, true, std::move(builder)); @@ -1269,8 +1236,7 @@ void Device::HandleChangePath(uint8_t label, if (current_path_.size() > 1) { current_path_.pop(); } else { - log::error("{}: Trying to change directory up past root.", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::error("{}: Trying to change directory up past root.", address_); auto builder = ChangePathResponseBuilder::MakeBuilder(Status::DOES_NOT_EXIST, 0); send_message(label, true, std::move(builder)); @@ -1299,8 +1265,7 @@ void Device::ChangePathResponse(uint8_t label, void Device::HandleGetItemAttributes( uint8_t label, std::shared_ptr<GetItemAttributesRequest> pkt) { if (!pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto builder = GetItemAttributesResponseBuilder::MakeBuilder( Status::INVALID_PARAMETER, browse_mtu_); send_message(label, true, std::move(builder)); @@ -1310,7 +1275,7 @@ void Device::HandleGetItemAttributes( log::verbose("scope={} uid={} uid counter={}", pkt->GetScope(), loghex(pkt->GetUid()), loghex(pkt->GetUidCounter())); if (pkt->GetUidCounter() != 0x0000) { // For database unaware player, use 0 - log::warn("{}: UidCounter is invalid", ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: UidCounter is invalid", address_); auto builder = GetItemAttributesResponseBuilder::MakeBuilder( Status::UIDS_CHANGED, browse_mtu_); send_message(label, true, std::move(builder)); @@ -1334,8 +1299,7 @@ void Device::HandleGetItemAttributes( weak_ptr_factory_.GetWeakPtr(), label, pkt)); break; default: - log::error("{}: UNKNOWN SCOPE FOR HANDLE GET ITEM ATTRIBUTES", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::error("{}: UNKNOWN SCOPE FOR HANDLE GET ITEM ATTRIBUTES", address_); break; } } @@ -1475,7 +1439,7 @@ void Device::GetMediaPlayerListResponse( // returned by Addressed Player Changed for (auto it = players.begin(); it != players.end(); it++) { if (it->id == curr_player) { - log::verbose(" Adding player to first spot: {}", it->name); + log::verbose("Adding player to first spot: {}", it->name); auto temp_player = *it; players.erase(it); players.insert(players.begin(), temp_player); @@ -1613,8 +1577,7 @@ void Device::GetNowPlayingListResponse( void Device::HandleSetBrowsedPlayer( uint8_t label, std::shared_ptr<SetBrowsedPlayerRequest> pkt) { if (!pkt->IsValid()) { - log::warn("{}: Request packet is not valid", - ADDRESS_TO_LOGGABLE_STR(address_)); + log::warn("{}: Request packet is not valid", address_); auto response = SetBrowsedPlayerResponseBuilder::MakeBuilder( Status::INVALID_PARAMETER, 0x0000, 0, 0, ""); send_message(label, true, std::move(response)); @@ -1743,13 +1706,13 @@ void Device::HandlePlayerSettingChanged(std::vector<PlayerAttribute> attributes, } for (size_t i = 0; i < attributes.size(); i++) { - log::verbose(" attribute: {}", attributes[i]); + log::verbose("attribute: {}", attributes[i]); if (attributes[i] == PlayerAttribute::SHUFFLE) { - log::verbose(" value: {}", (PlayerShuffleValue)values[i]); + log::verbose("value: {}", (PlayerShuffleValue)values[i]); } else if (attributes[i] == PlayerAttribute::REPEAT) { - log::verbose(" value: {}", (PlayerRepeatValue)values[i]); + log::verbose("value: {}", (PlayerRepeatValue)values[i]); } else { - log::verbose(" value: {}", values[i]); + log::verbose("value: {}", values[i]); } } @@ -1764,13 +1727,13 @@ void Device::PlayerSettingChangedNotificationResponse( std::vector<uint8_t> values) { log::verbose("interim: {}", interim); for (size_t i = 0; i < attributes.size(); i++) { - log::verbose(" attribute: {}", attributes[i]); + log::verbose("attribute: {}", attributes[i]); if (attributes[i] == PlayerAttribute::SHUFFLE) { - log::verbose(" value: {}", (PlayerShuffleValue)values[i]); + log::verbose("value: {}", (PlayerShuffleValue)values[i]); } else if (attributes[i] == PlayerAttribute::REPEAT) { - log::verbose(" value: {}", (PlayerRepeatValue)values[i]); + log::verbose("value: {}", (PlayerRepeatValue)values[i]); } else { - log::verbose(" value: {}", values[i]); + log::verbose("value: {}", values[i]); } } @@ -1852,7 +1815,7 @@ void Device::HandleAddressedPlayerUpdate() { log::verbose(""); if (!addr_player_changed_.first) { log::warn("{}: Device is not registered for addressed player updates", - ADDRESS_TO_LOGGABLE_STR(address_)); + address_); return; } media_interface_->GetMediaPlayerList(base::Bind( @@ -1861,7 +1824,7 @@ void Device::HandleAddressedPlayerUpdate() { } void Device::DeviceDisconnected() { - log::info("{} : Device was disconnected", ADDRESS_TO_LOGGABLE_STR(address_)); + log::info("{} : Device was disconnected", address_); play_pos_update_cb_.Cancel(); // TODO (apanicke): Once the interfaces are set in the Device construction, diff --git a/system/stack/a2dp/a2dp_aac_encoder.cc b/system/stack/a2dp/a2dp_aac_encoder.cc index 2021ed886c..6cfdd9ecc9 100644 --- a/system/stack/a2dp/a2dp_aac_encoder.cc +++ b/system/stack/a2dp/a2dp_aac_encoder.cc @@ -177,7 +177,7 @@ static void a2dp_aac_encoder_update(A2dpCodecConfig* a2dp_codec_config, if (!a2dp_codec_config->copyOutOtaCodecConfig(codec_info)) { log::error("Cannot update the codec encoder for {}: invalid codec config", - a2dp_codec_config->name().c_str()); + a2dp_codec_config->name()); return; } const uint8_t* p_codec_info = codec_info; @@ -202,7 +202,7 @@ static void a2dp_aac_encoder_update(A2dpCodecConfig* a2dp_codec_config, a2dp_aac_encoder_cb.TxAaMtuSize = adjust_effective_mtu(peer_params); log::info("MTU={}, peer_mtu={}", a2dp_aac_encoder_cb.TxAaMtuSize, peer_params.peer_mtu); - log::info("sample_rate: {} channel_mode: {} ", p_encoder_params->sample_rate, + log::info("sample_rate: {} channel_mode: {}", p_encoder_params->sample_rate, p_encoder_params->channel_mode); // Set the encoder's parameters: Audio Object Type - MANDATORY diff --git a/system/stack/a2dp/a2dp_aac_encoder_linux.cc b/system/stack/a2dp/a2dp_aac_encoder_linux.cc index 2fd572e0de..6c23efa51d 100644 --- a/system/stack/a2dp/a2dp_aac_encoder_linux.cc +++ b/system/stack/a2dp/a2dp_aac_encoder_linux.cc @@ -158,7 +158,7 @@ void a2dp_aac_encoder_init(const tA2DP_ENCODER_INIT_PEER_PARAMS* p_peer_params, uint8_t codec_info[AVDT_CODEC_SIZE]; if (!a2dp_codec_config->copyOutOtaCodecConfig(codec_info)) { log::error("Cannot update the codec encoder for {}: invalid codec config", - a2dp_codec_config->name().c_str()); + a2dp_codec_config->name()); return; } diff --git a/system/stack/a2dp/a2dp_api.cc b/system/stack/a2dp/a2dp_api.cc index 32272ef999..90ea21301e 100644 --- a/system/stack/a2dp/a2dp_api.cc +++ b/system/stack/a2dp/a2dp_api.cc @@ -311,15 +311,15 @@ tA2DP_STATUS A2DP_FindService(uint16_t service_uuid, const RawAddress& bd_addr, p_db == NULL || p_cback.is_null()) { log::error( "Cannot find service for peer {} UUID 0x{:04x}: invalid parameters", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), service_uuid); + bd_addr, service_uuid); return A2DP_INVALID_PARAMS; } if (a2dp_cb.find.service_uuid == UUID_SERVCLASS_AUDIO_SOURCE || a2dp_cb.find.service_uuid == UUID_SERVCLASS_AUDIO_SINK || a2dp_cb.find.p_db != NULL) { - log::error("Cannot find service for peer {} UUID 0x{:04x}: busy", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), service_uuid); + log::error("Cannot find service for peer {} UUID 0x{:04x}: busy", bd_addr, + service_uuid); return A2DP_BUSY; } @@ -336,7 +336,7 @@ tA2DP_STATUS A2DP_FindService(uint16_t service_uuid, const RawAddress& bd_addr, p_db->p_attrs)) { osi_free_and_reset((void**)&a2dp_cb.find.p_db); log::error("Unable to initialize SDP discovery for peer {} UUID 0x{:04X}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), service_uuid); + bd_addr, service_uuid); return A2DP_FAIL; } @@ -351,12 +351,12 @@ tA2DP_STATUS A2DP_FindService(uint16_t service_uuid, const RawAddress& bd_addr, a2dp_cb.find.p_cback.Reset(); osi_free_and_reset((void**)&a2dp_cb.find.p_db); log::error("Cannot find service for peer {} UUID 0x{:04x}: SDP error", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), service_uuid); + bd_addr, service_uuid); return A2DP_FAIL; } log::info( "A2DP service discovery for peer {} UUID 0x{:04x}: SDP search started", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), service_uuid); + bd_addr, service_uuid); return A2DP_SUCCESS; } diff --git a/system/stack/a2dp/a2dp_codec_config.cc b/system/stack/a2dp/a2dp_codec_config.cc index 6ed652ecf0..6fc3411e74 100644 --- a/system/stack/a2dp/a2dp_codec_config.cc +++ b/system/stack/a2dp/a2dp_codec_config.cc @@ -644,7 +644,7 @@ bool A2dpCodecs::init() { if (codec_config == nullptr) continue; if (codec_priority != BTAV_A2DP_CODEC_PRIORITY_DEFAULT) { - log::info("updated {} codec priority to {}", codec_config->name().c_str(), + log::info("updated {} codec priority to {}", codec_config->name(), codec_priority); } @@ -669,7 +669,7 @@ bool A2dpCodecs::init() { log::error("no Source codecs were initialized"); } else { for (auto iter : ordered_source_codecs_) { - log::info("initialized Source codec {}, idx {}", iter->name().c_str(), + log::info("initialized Source codec {}, idx {}", iter->name(), iter->codecIndex()); } } @@ -677,7 +677,7 @@ bool A2dpCodecs::init() { log::error("no Sink codecs were initialized"); } else { for (auto iter : ordered_sink_codecs_) { - log::info("initialized Sink codec {}, idx {}", iter->name().c_str(), + log::info("initialized Sink codec {}, idx {}", iter->name(), iter->codecIndex()); } } @@ -767,7 +767,7 @@ bool A2dpCodecs::setCodecUserConfig( *p_restart_output = false; *p_config_updated = false; - log::info("Configuring: {}", codec_user_config.ToString().c_str()); + log::info("Configuring: {}", codec_user_config.ToString()); if (codec_user_config.codec_type < BTAV_A2DP_CODEC_INDEX_MAX) { auto iter = indexed_codecs_.find(codec_user_config.codec_type); @@ -906,8 +906,7 @@ bool A2dpCodecs::setCodecOtaConfig( log::warn( "ignoring peer OTA configuration for codec {}: existing user " "configuration for current codec {}", - A2DP_CodecName(p_ota_codec_config), - current_codec_config_->name().c_str()); + A2DP_CodecName(p_ota_codec_config), current_codec_config_->name()); goto fail; } } diff --git a/system/stack/a2dp/a2dp_sbc_encoder.cc b/system/stack/a2dp/a2dp_sbc_encoder.cc index fab6f23bd0..61cd6e4ffa 100644 --- a/system/stack/a2dp/a2dp_sbc_encoder.cc +++ b/system/stack/a2dp/a2dp_sbc_encoder.cc @@ -172,7 +172,7 @@ static void a2dp_sbc_encoder_update(A2dpCodecConfig* a2dp_codec_config, *p_config_updated = false; if (!a2dp_codec_config->copyOutOtaCodecConfig(codec_info)) { log::error("Cannot update the codec encoder for {}: invalid codec config", - a2dp_codec_config->name().c_str()); + a2dp_codec_config->name()); return; } const uint8_t* p_codec_info = codec_info; @@ -857,7 +857,7 @@ static uint32_t a2dp_sbc_frame_length(void) { uint32_t a2dp_sbc_get_bitrate() { SBC_ENC_PARAMS* p_encoder_params = &a2dp_sbc_encoder_cb.sbc_encoder_params; - log::info("bit rate {} ", p_encoder_params->u16BitRate); + log::info("bit rate {}", p_encoder_params->u16BitRate); return p_encoder_params->u16BitRate * 1000; } diff --git a/system/stack/a2dp/a2dp_vendor_aptx_encoder.cc b/system/stack/a2dp/a2dp_vendor_aptx_encoder.cc index f39b205a04..6a7e0aed7b 100644 --- a/system/stack/a2dp/a2dp_vendor_aptx_encoder.cc +++ b/system/stack/a2dp/a2dp_vendor_aptx_encoder.cc @@ -171,7 +171,7 @@ static void a2dp_vendor_aptx_encoder_update(A2dpCodecConfig* a2dp_codec_config, *p_config_updated = false; if (!a2dp_codec_config->copyOutOtaCodecConfig(codec_info)) { log::error("Cannot update the codec encoder for {}: invalid codec config", - a2dp_codec_config->name().c_str()); + a2dp_codec_config->name()); return; } const uint8_t* p_codec_info = codec_info; diff --git a/system/stack/a2dp/a2dp_vendor_aptx_hd_encoder.cc b/system/stack/a2dp/a2dp_vendor_aptx_hd_encoder.cc index a399c2461f..0ebeca3cd1 100644 --- a/system/stack/a2dp/a2dp_vendor_aptx_hd_encoder.cc +++ b/system/stack/a2dp/a2dp_vendor_aptx_hd_encoder.cc @@ -170,7 +170,7 @@ static void a2dp_vendor_aptx_hd_encoder_update( *p_config_updated = false; if (!a2dp_codec_config->copyOutOtaCodecConfig(codec_info)) { log::error("Cannot update the codec encoder for {}: invalid codec config", - a2dp_codec_config->name().c_str()); + a2dp_codec_config->name()); return; } const uint8_t* p_codec_info = codec_info; diff --git a/system/stack/a2dp/a2dp_vendor_ldac_encoder.cc b/system/stack/a2dp/a2dp_vendor_ldac_encoder.cc index c4ef815e59..7faee577d8 100644 --- a/system/stack/a2dp/a2dp_vendor_ldac_encoder.cc +++ b/system/stack/a2dp/a2dp_vendor_ldac_encoder.cc @@ -194,7 +194,7 @@ static void a2dp_vendor_ldac_encoder_update(A2dpCodecConfig* a2dp_codec_config, if (!a2dp_codec_config->copyOutOtaCodecConfig(codec_info)) { log::error("Cannot update the codec encoder for {}: invalid codec config", - a2dp_codec_config->name().c_str()); + a2dp_codec_config->name()); return; } const uint8_t* p_codec_info = codec_info; @@ -224,27 +224,25 @@ static void a2dp_vendor_ldac_encoder_update(A2dpCodecConfig* a2dp_codec_config, if (codec_config.codec_specific_1 != 0) { p_encoder_params->quality_mode_index = codec_config.codec_specific_1 % 10; log::info("setting quality mode to {}", - quality_mode_index_to_name(p_encoder_params->quality_mode_index) - .c_str()); + quality_mode_index_to_name(p_encoder_params->quality_mode_index)); } else { p_encoder_params->quality_mode_index = A2DP_LDAC_QUALITY_ABR; log::info("setting quality mode to default {}", - quality_mode_index_to_name(p_encoder_params->quality_mode_index) - .c_str()); + quality_mode_index_to_name(p_encoder_params->quality_mode_index)); } int ldac_eqmid = LDAC_ABR_MODE_EQMID; if (p_encoder_params->quality_mode_index == A2DP_LDAC_QUALITY_ABR) { if (!ldac_abr_loaded) { p_encoder_params->quality_mode_index = A2DP_LDAC_QUALITY_MID; - log::warn("LDAC ABR library is not loaded, resetting quality mode to {}", - quality_mode_index_to_name(p_encoder_params->quality_mode_index) - .c_str()); + log::warn( + "LDAC ABR library is not loaded, resetting quality mode to {}", + quality_mode_index_to_name(p_encoder_params->quality_mode_index)); } else { - log::info("changing mode from {} to {}", - quality_mode_index_to_name(old_quality_mode_index).c_str(), - quality_mode_index_to_name(p_encoder_params->quality_mode_index) - .c_str()); + log::info( + "changing mode from {} to {}", + quality_mode_index_to_name(old_quality_mode_index), + quality_mode_index_to_name(p_encoder_params->quality_mode_index)); if (a2dp_ldac_encoder_cb.ldac_abr_handle != NULL) { log::info("already in LDAC ABR mode, do nothing."); } else { @@ -260,15 +258,14 @@ static void a2dp_vendor_ldac_encoder_update(A2dpCodecConfig* a2dp_codec_config, p_encoder_params->quality_mode_index = A2DP_LDAC_QUALITY_MID; log::info( "get LDAC ABR handle failed, resetting quality mode to {}.", - quality_mode_index_to_name(p_encoder_params->quality_mode_index) - .c_str()); + quality_mode_index_to_name(p_encoder_params->quality_mode_index)); } } } } else { ldac_eqmid = p_encoder_params->quality_mode_index; log::info("in {} mode, free LDAC ABR handle.", - quality_mode_index_to_name(ldac_eqmid).c_str()); + quality_mode_index_to_name(ldac_eqmid)); if (a2dp_ldac_encoder_cb.has_ldac_abr_handle) { ldac_ABR_free_handle(a2dp_ldac_encoder_cb.ldac_abr_handle); a2dp_ldac_encoder_cb.ldac_abr_handle = NULL; diff --git a/system/stack/a2dp/a2dp_vendor_opus_encoder.cc b/system/stack/a2dp/a2dp_vendor_opus_encoder.cc index 212cd7a592..92d449ffa5 100644 --- a/system/stack/a2dp/a2dp_vendor_opus_encoder.cc +++ b/system/stack/a2dp/a2dp_vendor_opus_encoder.cc @@ -172,7 +172,7 @@ bool A2dpCodecConfigOpusSource::updateEncoderUserConfig( bool* p_restart_output, bool* p_config_updated) { if (a2dp_opus_encoder_cb.peer_mtu == 0) { log::error("Cannot update the codec encoder for {}: invalid peer MTU", - name().c_str()); + name()); return false; } @@ -206,7 +206,7 @@ static bool a2dp_vendor_opus_encoder_update(uint16_t peer_mtu, if (!a2dp_codec_config->copyOutOtaCodecConfig(codec_info)) { log::error("Cannot update the codec encoder for {}: invalid codec config", - a2dp_codec_config->name().c_str()); + a2dp_codec_config->name()); return false; } const uint8_t* p_codec_info = codec_info; diff --git a/system/stack/acl/ble_acl.cc b/system/stack/acl/ble_acl.cc index 40e73fa5a2..bc44d4c837 100644 --- a/system/stack/acl/ble_acl.cc +++ b/system/stack/acl/ble_acl.cc @@ -151,9 +151,8 @@ void acl_ble_connection_fail(const tBLE_BD_ADDR& address_with_type, resolved_address_with_type.bda); } log::warn("LE connection fail peer:{} bd_addr:{} hci_status:{}", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type), - ADDRESS_TO_LOGGABLE_CSTR(resolved_address_with_type.bda), - hci_status_code_text(status).c_str()); + address_with_type, resolved_address_with_type.bda, + hci_status_code_text(status)); } else { btm_cb.ble_ctr_cb.inq_var.adv_mode = BTM_BLE_ADV_DISABLE; } diff --git a/system/stack/acl/btm_acl.cc b/system/stack/acl/btm_acl.cc index 3dae36c518..bc6743610c 100644 --- a/system/stack/acl/btm_acl.cc +++ b/system/stack/acl/btm_acl.cc @@ -201,9 +201,8 @@ void NotifyAclFeaturesReadComplete(tACL_CONN& p_acl, static void disconnect_acl(tACL_CONN& p_acl, tHCI_STATUS reason, std::string comment) { - log::info("Disconnecting peer:{} reason:{} comment:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_acl.remote_addr), - hci_error_code_text(reason).c_str(), comment.c_str()); + log::info("Disconnecting peer:{} reason:{} comment:{}", p_acl.remote_addr, + hci_error_code_text(reason), comment); p_acl.disconnect_reason = reason; return bluetooth::shim::ACL_Disconnect( @@ -221,7 +220,7 @@ void hci_btm_set_link_supervision_timeout(tACL_CONN& link, uint16_t timeout) { if (link.link_role != HCI_ROLE_CENTRAL) { /* Only send if current role is Central; 2.0 spec requires this */ log::warn("Can only set link supervision timeout if central role:{}", - RoleText(link.link_role).c_str()); + RoleText(link.link_role)); return; } @@ -230,13 +229,11 @@ void hci_btm_set_link_supervision_timeout(tACL_CONN& link, uint16_t timeout) { log::warn( "UNSUPPORTED by controller write link supervision timeout:{:.2f}ms " "bd_addr:{}", - supervision_timeout_to_seconds(timeout), - ADDRESS_TO_LOGGABLE_CSTR(link.RemoteAddress())); + supervision_timeout_to_seconds(timeout), link.RemoteAddress()); return; } log::debug("Setting link supervision timeout:{:.2f}s peer:{}", - double(timeout) * 0.01, - ADDRESS_TO_LOGGABLE_CSTR(link.RemoteAddress())); + double(timeout) * 0.01, link.RemoteAddress()); link.link_super_tout = timeout; btsnd_hcic_write_link_super_tout(link.Handle(), timeout); } @@ -327,8 +324,7 @@ void StackAclBtmAcl::btm_acl_consolidate(const RawAddress& identity_addr, if (!p_acl->in_use) continue; if (p_acl->remote_addr == rpa) { - log::info("consolidate {} -> {}", ADDRESS_TO_LOGGABLE_CSTR(rpa), - ADDRESS_TO_LOGGABLE_CSTR(identity_addr)); + log::info("consolidate {} -> {}", rpa, identity_addr); p_acl->remote_addr = identity_addr; return; } @@ -387,7 +383,7 @@ void btm_acl_process_sca_cmpl_pkt(uint8_t len, uint8_t* data) { if (status != HCI_SUCCESS) { log::warn("Peer SCA Command complete failed:{}", - hci_error_code_text(static_cast<tHCI_STATUS>(status)).c_str()); + hci_error_code_text(static_cast<tHCI_STATUS>(status))); return; } @@ -425,8 +421,7 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle, log::warn( "Unable to create duplicate acl when one already exists handle:{} " "role:{} transport:{}", - hci_handle, RoleText(link_role).c_str(), - bt_transport_text(transport).c_str()); + hci_handle, RoleText(link_role), bt_transport_text(transport)); return; } @@ -448,8 +443,8 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle, log::debug( "Created new ACL connection peer:{} role:{} handle:0x{:04x} transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bda), RoleText(p_acl->link_role).c_str(), - hci_handle, bt_transport_text(transport).c_str()); + bda, RoleText(p_acl->link_role), hci_handle, + bt_transport_text(transport)); if (p_acl->is_transport_br_edr()) { BTM_PM_OnConnected(hci_handle, bda); @@ -835,8 +830,7 @@ static void maybe_chain_more_commands_after_read_remote_version_complete( break; default: log::error("Unable to determine transport:{} device:{}", - bt_transport_text(p_acl_cb->transport).c_str(), - ADDRESS_TO_LOGGABLE_CSTR(p_acl_cb->remote_addr)); + bt_transport_text(p_acl_cb->transport), p_acl_cb->remote_addr); } // save remote versions to iot conf file @@ -1057,8 +1051,7 @@ void StackAclBtmAcl::btm_establish_continue(tACL_CONN* p_acl) { default_packet_type_mask)) { log::error( "Unable to change connection packet type types:{:04x} address:{}", - default_packet_type_mask, - ADDRESS_TO_LOGGABLE_CSTR(p_acl->RemoteAddress())); + default_packet_type_mask, p_acl->RemoteAddress()); } btm_set_link_policy(p_acl, btm_cb.acl_cb_.DefaultLinkPolicy()); } @@ -1121,22 +1114,19 @@ tBTM_STATUS BTM_SetLinkSuperTout(const RawAddress& remote_bda, log::warn( "UNSUPPORTED by controller write link supervision timeout:{:.2f}ms " "bd_addr:{}", - supervision_timeout_to_seconds(timeout), - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + supervision_timeout_to_seconds(timeout), remote_bda); return BTM_MODE_UNSUPPORTED; } p_acl->link_super_tout = timeout; btsnd_hcic_write_link_super_tout(p_acl->hci_handle, timeout); log::debug("Set supervision timeout:{:.2f}ms bd_addr:{}", - supervision_timeout_to_seconds(timeout), - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + supervision_timeout_to_seconds(timeout), remote_bda); return BTM_CMD_STARTED; } else { log::warn( "Role is peripheral so unable to set supervision timeout:{:.2f}ms " "bd_addr:{}", - supervision_timeout_to_seconds(timeout), - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + supervision_timeout_to_seconds(timeout), remote_bda); return BTM_SUCCESS; } } @@ -1328,7 +1318,7 @@ void btm_rejectlist_role_change_device(const RawAddress& bd_addr, log::warn( "Device {} rejectlisted for role switching - multiple role switch " "failed attempts: {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), p->switch_role_failed_attempts); + bd_addr, p->switch_role_failed_attempts); interop_database_add(INTEROP_DYNAMIC_ROLE_SWITCH, &bd_addr, 3); } } @@ -1384,9 +1374,7 @@ void StackAclBtmAcl::btm_acl_role_changed(tHCI_STATUS hci_status, tBTM_ROLE_SWITCH_CMPL* p_switch_role = &btm_cb.acl_cb_.switch_role_ref_data; log::debug("Role change event received peer:{} hci_status:{} new_role:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - hci_error_code_text(hci_status).c_str(), - RoleText(new_role).c_str()); + bd_addr, hci_error_code_text(hci_status), RoleText(new_role)); p_switch_role->hci_status = hci_status; if (hci_status == HCI_SUCCESS) { @@ -1495,8 +1483,7 @@ bool StackAclBtmAcl::change_connection_packet_types( link.pkt_types_mask = packet_type_mask; GetInterface().ChangeConnectionPacketType(link.Handle(), link.pkt_types_mask); log::debug("Started change connection packet type:0x{:04x} address:{}", - link.pkt_types_mask, - ADDRESS_TO_LOGGABLE_CSTR(link.RemoteAddress())); + link.pkt_types_mask, link.RemoteAddress()); return true; } @@ -1511,7 +1498,7 @@ void btm_set_packet_types_from_address(const RawAddress& bd_addr, if (!internal_.change_connection_packet_types(*p_acl, pkt_types)) { log::error( "Unable to change connection packet type types:{:04x} address:{}", - pkt_types, ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + pkt_types, bd_addr); } } @@ -1736,7 +1723,7 @@ tBTM_STATUS BTM_ReadTxPower(const RawAddress& remote_bda, #define BTM_READ_RSSI_TYPE_CUR 0x00 #define BTM_READ_RSSI_TYPE_MAX 0X01 - log::verbose("RemBdAddr: {}", ADDRESS_TO_LOGGABLE_STR(remote_bda)); + log::verbose("RemBdAddr: {}", 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); @@ -1831,8 +1818,7 @@ void btm_read_tx_power_complete(uint8_t* p, uint16_t evt_len, bool is_ble) { } log::debug( "Transmit power complete: tx_power:{} hci status:{}", result.tx_power, - hci_error_code_text(static_cast<tHCI_STATUS>(result.hci_status)) - .c_str()); + hci_error_code_text(static_cast<tHCI_STATUS>(result.hci_status))); } else { result.status = BTM_ERR_PROCESSING; } @@ -1961,10 +1947,9 @@ void btm_read_failed_contact_counter_complete(uint8_t* p) { STREAM_TO_UINT16(handle, p); STREAM_TO_UINT16(result.failed_contact_counter, p); - log::debug( - "Failed contact counter complete: counter {}, hci status:{}", - result.failed_contact_counter, - hci_status_code_text(to_hci_status_code(result.hci_status)).c_str()); + log::debug("Failed contact counter complete: counter {}, hci status:{}", + result.failed_contact_counter, + hci_status_code_text(to_hci_status_code(result.hci_status))); tACL_CONN* p_acl_cb = internal_.acl_get_connection_from_handle(handle); if (p_acl_cb != nullptr) { @@ -2010,8 +1995,7 @@ void btm_read_automatic_flush_timeout_complete(uint8_t* p) { log::debug( "Read automatic flush timeout complete timeout:{} hci_status:{}", result.automatic_flush_timeout, - hci_error_code_text(static_cast<tHCI_STATUS>(result.hci_status)) - .c_str()); + hci_error_code_text(static_cast<tHCI_STATUS>(result.hci_status))); tACL_CONN* p_acl_cb = internal_.acl_get_connection_from_handle(handle); if (p_acl_cb != nullptr) { @@ -2061,8 +2045,7 @@ void btm_read_link_quality_complete(uint8_t* p, uint16_t evt_len) { log::debug( "BTM Link Quality Complete: Link Quality {}, hci status:{}", result.link_quality, - hci_error_code_text(static_cast<tHCI_STATUS>(result.hci_status)) - .c_str()); + hci_error_code_text(static_cast<tHCI_STATUS>(result.hci_status))); tACL_CONN* p_acl_cb = internal_.acl_get_connection_from_handle(handle); if (p_acl_cb != nullptr) { @@ -2099,9 +2082,8 @@ tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr, tBT_TRANSPORT transport) { } if (p_acl->Handle() == HCI_INVALID_HANDLE) { - log::warn("Cannot remove unknown acl bd_addr:{} transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - bt_transport_text(transport).c_str()); + log::warn("Cannot remove unknown acl bd_addr:{} transport:{}", bd_addr, + bt_transport_text(transport)); return BTM_UNKNOWN_ADDR; } @@ -2109,8 +2091,7 @@ tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr, tBT_TRANSPORT transport) { log::debug( "Delay disconnect until role switch is complete bd_addr:{} " "transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - bt_transport_text(transport).c_str()); + bd_addr, bt_transport_text(transport)); p_acl->rs_disc_pending = BTM_SEC_DISC_PENDING; return BTM_SUCCESS; } @@ -2189,7 +2170,7 @@ bool acl_refresh_remote_address(const RawAddress& identity_address, p_acl->active_remote_addr = rpa; } - log::debug("active_remote_addr_type: {} ", p_acl->active_remote_addr_type); + log::debug("active_remote_addr_type: {}", p_acl->active_remote_addr_type); return true; } @@ -2267,8 +2248,7 @@ void BTM_ReadConnectionAddr(const RawAddress& remote_bda, tBLE_ADDR_TYPE* p_addr_type, bool ota_address) { tBTM_SEC_DEV_REC* p_sec_rec = btm_find_dev(remote_bda); if (p_sec_rec == nullptr) { - log::warn("No matching known device {} in record", - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + log::warn("No matching known device {} in record", remote_bda); return; } @@ -2333,8 +2313,7 @@ bool BTM_ReadRemoteConnectionAddr(const RawAddress& pseudo_addr, bool ota_address) { tBTM_SEC_DEV_REC* p_sec_rec = btm_find_dev(pseudo_addr); if (p_sec_rec == nullptr) { - log::warn("No matching known device {} in record", - ADDRESS_TO_LOGGABLE_CSTR(pseudo_addr)); + log::warn("No matching known device {} in record", pseudo_addr); return false; } @@ -2484,8 +2463,7 @@ void btm_acl_connected(const RawAddress& bda, uint16_t handle, void btm_acl_disconnected(tHCI_STATUS status, uint16_t handle, tHCI_REASON reason) { if (status != HCI_SUCCESS) { - log::warn("Received disconnect with error:{}", - hci_error_code_text(status).c_str()); + log::warn("Received disconnect with error:{}", hci_error_code_text(status)); } power_telemetry::GetInstance().LogLinkDetails(handle, RawAddress::kEmpty, false, true); @@ -2558,8 +2536,7 @@ void acl_disconnect_after_role_switch(uint16_t conn_handle, tHCI_STATUS reason, log::warn( "Controller will not accept invalid reason parameter:{} instead " "sending:{}", - hci_error_code_text(reason).c_str(), - hci_error_code_text(HCI_ERR_PEER_USER).c_str()); + hci_error_code_text(reason), hci_error_code_text(HCI_ERR_PEER_USER)); reason = HCI_ERR_PEER_USER; } @@ -2579,7 +2556,7 @@ void acl_disconnect_after_role_switch(uint16_t conn_handle, tHCI_STATUS reason, p_acl->rs_disc_pending = BTM_SEC_DISC_PENDING; } else { log::debug("Sending acl disconnect reason:{} [{}]", - hci_error_code_text(reason).c_str(), reason); + hci_error_code_text(reason), reason); disconnect_acl(*p_acl, reason, comment); } } @@ -2587,8 +2564,7 @@ void acl_disconnect_after_role_switch(uint16_t conn_handle, tHCI_STATUS reason, void acl_send_data_packet_br_edr(const RawAddress& bd_addr, BT_HDR* p_buf) { tACL_CONN* p_acl = internal_.btm_bda_to_acl(bd_addr, BT_TRANSPORT_BR_EDR); if (p_acl == nullptr) { - log::warn("Acl br_edr data write for unknown device:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("Acl br_edr data write for unknown device:{}", bd_addr); osi_free(p_buf); return; } @@ -2599,8 +2575,7 @@ void acl_send_data_packet_br_edr(const RawAddress& bd_addr, BT_HDR* p_buf) { void acl_send_data_packet_ble(const RawAddress& bd_addr, BT_HDR* p_buf) { tACL_CONN* p_acl = internal_.btm_bda_to_acl(bd_addr, BT_TRANSPORT_LE); if (p_acl == nullptr) { - log::warn("Acl le data write for unknown device:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("Acl le data write for unknown device:{}", bd_addr); osi_free(p_buf); return; } @@ -2636,15 +2611,14 @@ bool acl_create_le_connection_with_id(uint8_t id, const RawAddress& bd_addr, find_in_device_record(bd_addr, &address_with_type); log::debug("Creating le direct connection to:{} type:{} (initial type: {})", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type), - AddressTypeText(address_with_type.type).c_str(), - AddressTypeText(addr_type).c_str()); + address_with_type, AddressTypeText(address_with_type.type), + AddressTypeText(addr_type)); if (address_with_type.type == BLE_ADDR_ANONYMOUS) { log::warn( "Creating le direct connection to:{}, address type 'anonymous' is " "invalid", - ADDRESS_TO_LOGGABLE_CSTR(address_with_type)); + address_with_type); return false; } @@ -2711,8 +2685,7 @@ void acl_process_supported_features(uint16_t handle, uint64_t features) { "Copied supported feature pages handle:{} current_page_number:{} " "features:{}", handle, current_page_number, - bd_features_text(p_acl->peer_lmp_feature_pages[current_page_number]) - .c_str()); + bd_features_text(p_acl->peer_lmp_feature_pages[current_page_number])); if ((HCI_LMP_EXTENDED_SUPPORTED(p_acl->peer_lmp_feature_pages[0])) && (bluetooth::shim::GetController()->IsSupported( @@ -2743,8 +2716,7 @@ void acl_process_extended_features(uint16_t handle, uint8_t current_page_number, "Copied extended feature pages handle:{} current_page_number:{} " "max_page_number:{} features:{}", handle, current_page_number, max_page_number, - bd_features_text(p_acl->peer_lmp_feature_pages[current_page_number]) - .c_str()); + bd_features_text(p_acl->peer_lmp_feature_pages[current_page_number])); if (max_page_number == 0 || max_page_number == current_page_number) { NotifyAclFeaturesReadComplete(*p_acl, max_page_number); diff --git a/system/stack/acl/btm_pm.cc b/system/stack/acl/btm_pm.cc index a4cb5e03d0..6aece509f5 100644 --- a/system/stack/acl/btm_pm.cc +++ b/system/stack/acl/btm_pm.cc @@ -155,7 +155,7 @@ tBTM_STATUS BTM_PmRegister(uint8_t mask, uint8_t* p_pm_id, void BTM_PM_OnConnected(uint16_t handle, const RawAddress& remote_bda) { if (pm_mode_db.find(handle) != pm_mode_db.end()) { log::error("Overwriting power mode db entry handle:{} peer:{}", handle, - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + remote_bda); } pm_mode_db[handle] = {}; pm_mode_db[handle].Init(remote_bda, handle); @@ -189,16 +189,14 @@ tBTM_STATUS BTM_SetPowerMode(uint8_t pm_id, const RawAddress& remote_bda, } if (!p_mode) { - log::error("pm_id: {}, p_mode is null for {}", unsigned(pm_id), - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + log::error("pm_id: {}, p_mode is null for {}", unsigned(pm_id), remote_bda); return BTM_ILLEGAL_VALUE; } // per ACL link auto* p_cb = btm_pm_get_power_manager_from_address(remote_bda); if (p_cb == nullptr) { - log::warn("Unable to find power manager for peer: {}", - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + log::warn("Unable to find power manager for peer: {}", remote_bda); return BTM_UNKNOWN_ADDR; } uint16_t handle = p_cb->handle_; @@ -222,7 +220,7 @@ tBTM_STATUS BTM_SetPowerMode(uint8_t pm_id, const RawAddress& remote_bda, (mode == BTM_PM_MD_PARK && !controller->SupportsParkMode()) || interop_match_addr(INTEROP_DISABLE_SNIFF, &remote_bda)) { log::error("pm_id {} mode {} is not supported for {}", pm_id, mode, - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + remote_bda); return BTM_MODE_UNSUPPORTED; } } @@ -258,21 +256,19 @@ tBTM_STATUS BTM_SetPowerMode(uint8_t pm_id, const RawAddress& remote_bda, log::info( "Current power mode is hold or pending status or pending links " "state:{}[{}] pm_pending_link:{}", - power_mode_state_text(p_cb->state).c_str(), p_cb->state, pm_pend_link); + power_mode_state_text(p_cb->state), p_cb->state, pm_pend_link); /* command pending */ if (handle != pm_pend_link) { p_cb->state |= BTM_PM_STORED_MASK; - log::info("Setting stored bitmask for peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + log::info("Setting stored bitmask for peer:{}", remote_bda); } return BTM_CMD_STORED; } log::info( "Setting power mode for peer:{} current_mode:{}[{}] new_mode:{}[{}]", - ADDRESS_TO_LOGGABLE_CSTR(remote_bda), - power_mode_state_text(p_cb->state).c_str(), p_cb->state, - power_mode_text(p_mode->mode).c_str(), p_mode->mode); + remote_bda, power_mode_state_text(p_cb->state), p_cb->state, + power_mode_text(p_mode->mode), p_mode->mode); return btm_pm_snd_md_req(p_cb->handle_, pm_id, p_cb->handle_, p_mode); } @@ -298,7 +294,7 @@ bool BTM_ReadPowerMode(const RawAddress& remote_bda, tBTM_PM_MODE* p_mode) { } tBTM_PM_MCB* p_mcb = btm_pm_get_power_manager_from_address(remote_bda); if (p_mcb == nullptr) { - log::warn("Unknown device:{}", ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + log::warn("Unknown device:{}", remote_bda); return false; } *p_mode = static_cast<tBTM_PM_MODE>(p_mcb->state); @@ -327,8 +323,7 @@ tBTM_STATUS BTM_SetSsrParams(const RawAddress& remote_bda, uint16_t max_lat, uint16_t min_rmt_to, uint16_t min_loc_to) { tBTM_PM_MCB* p_cb = btm_pm_get_power_manager_from_address(remote_bda); if (p_cb == nullptr) { - log::warn("Unable to find power manager for peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + log::warn("Unable to find power manager for peer:{}", remote_bda); return BTM_UNKNOWN_ADDR; } @@ -341,8 +336,8 @@ tBTM_STATUS BTM_SetSsrParams(const RawAddress& remote_bda, uint16_t max_lat, log::info( "Set sniff subrating state:{}[{}] max_latency:0x{:04x} " "min_remote_timeout:0x{:04x} min_local_timeout:0x{:04x}", - power_mode_state_text(p_cb->state).c_str(), p_cb->state, max_lat, - min_rmt_to, min_loc_to); + power_mode_state_text(p_cb->state), p_cb->state, max_lat, min_rmt_to, + min_loc_to); send_sniff_subrating(p_cb->handle_, remote_bda, max_lat, min_rmt_to, min_loc_to); return BTM_SUCCESS; @@ -527,11 +522,11 @@ static tBTM_STATUS btm_pm_snd_md_req(uint16_t handle, uint8_t pm_id, mode = btm_pm_get_set_mode(pm_id, p_cb, p_mode, &md_res); md_res.mode = mode; - log::debug("Found controller in mode:{}", power_mode_text(mode).c_str()); + log::debug("Found controller in mode:{}", power_mode_text(mode)); if (p_cb->state == mode) { log::info("Link already in requested mode pm_id:{} link_ind:{} mode:{}[{}]", - pm_id, link_ind, power_mode_text(mode).c_str(), mode); + pm_id, link_ind, power_mode_text(mode), mode); /* already in the resulting mode */ if ((mode == BTM_PM_MD_ACTIVE) || @@ -568,8 +563,8 @@ static tBTM_STATUS btm_pm_snd_md_req(uint16_t handle, uint8_t pm_id, pm_pend_id = pm_id; log::info("Switching from {}[0x{:02x}] to {}[0x{:02x}]", - power_mode_state_text(p_cb->state).c_str(), p_cb->state, - power_mode_state_text(md_res.mode).c_str(), md_res.mode); + power_mode_state_text(p_cb->state), p_cb->state, + power_mode_state_text(md_res.mode), md_res.mode); BTM_LogHistory(kBtmLogTag, p_cb->bda_, "Power mode change", base::StringPrintf( "%s[0x%02x] ==> %s[0x%02x]", @@ -627,7 +622,7 @@ static void btm_pm_continue_pending_mode_changes() { if (entry.second.state & BTM_PM_STORED_MASK) { entry.second.state &= ~BTM_PM_STORED_MASK; log::info("Found another link requiring power mode change:{}", - ADDRESS_TO_LOGGABLE_CSTR(entry.second.bda_)); + entry.second.bda_); btm_pm_snd_md_req(entry.second.handle_, BTM_PM_SET_ONLY_ID, entry.second.handle_, NULL); return; @@ -678,12 +673,12 @@ void btm_pm_proc_cmd_status(tHCI_STATUS status) { if ((pm_pend_id != BTM_PM_SET_ONLY_ID) && (pm_reg_db.mask & BTM_PM_REG_SET)) { const RawAddress bd_addr = pm_mode_db[pm_pend_link].bda_; log::debug("Notifying callback that link power mode is complete peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + bd_addr); (*pm_reg_db.cback)(bd_addr, pm_status, 0, status); } log::info("Clearing pending power mode link state:{}", - power_mode_state_text(p_cb->state).c_str()); + power_mode_state_text(p_cb->state)); pm_pend_link = 0; btm_pm_continue_pending_mode_changes(); @@ -722,8 +717,8 @@ void btm_pm_proc_mode_change(tHCI_STATUS hci_status, uint16_t hci_handle, p_cb->interval = interval; log::info("Power mode switched from {}[{}] to {}[{}]", - power_mode_state_text(old_state).c_str(), old_state, - power_mode_state_text(p_cb->state).c_str(), p_cb->state); + power_mode_state_text(old_state), old_state, + power_mode_state_text(p_cb->state), p_cb->state); if ((p_cb->state == BTM_PM_ST_ACTIVE) || (p_cb->state == BTM_PM_ST_SNIFF)) { l2c_OnHciModeChangeSendPendingPackets(p_cb->bda_); @@ -796,8 +791,7 @@ void process_ssr_event(tHCI_STATUS status, uint16_t handle, log::debug( "Notified sniff subrating registered clients cnt:{} peer:{} use_ssr:{} " "status:{}", - cnt, ADDRESS_TO_LOGGABLE_CSTR(bd_addr), use_ssr, - hci_error_code_text(status).c_str()); + cnt, bd_addr, use_ssr, hci_error_code_text(status)); } void btm_pm_on_sniff_subrating(tHCI_STATUS status, uint16_t handle, diff --git a/system/stack/avct/avct_l2c.cc b/system/stack/avct/avct_l2c.cc index 0be6994502..68b04cc5a0 100644 --- a/system/stack/avct/avct_l2c.cc +++ b/system/stack/avct/avct_l2c.cc @@ -166,7 +166,7 @@ void avct_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, p_lcb->ch_state = AVCT_CH_CFG; } - if (p_lcb) log::verbose("ch_state cni: {} ", p_lcb->ch_state); + if (p_lcb) log::verbose("ch_state cni: {}", p_lcb->ch_state); } static void avct_on_l2cap_error(uint16_t lcid, uint16_t result) { @@ -183,7 +183,7 @@ static void avct_on_l2cap_error(uint16_t lcid, uint16_t result) { avct_lcb_event(p_lcb, AVCT_LCB_LL_CLOSE_EVT, &avct_lcb_evt); } } else if (p_lcb->ch_state == AVCT_CH_CFG) { - log::verbose("ERROR avct_l2c_config_cfm_cback L2CA_DisconnectReq {} ", + log::verbose("ERROR avct_l2c_config_cfm_cback L2CA_DisconnectReq {}", p_lcb->ch_state); /* store result value */ p_lcb->ch_result = result; @@ -236,7 +236,7 @@ void avct_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result) { } p_lcb->conflict_lcid = 0; } - log::verbose("ch_state cnc: {} ", p_lcb->ch_state); + log::verbose("ch_state cnc: {}", p_lcb->ch_state); } } @@ -266,7 +266,7 @@ void avct_l2c_config_cfm_cback(uint16_t lcid, uint16_t initiator, p_lcb->ch_state = AVCT_CH_OPEN; avct_lcb_event(p_lcb, AVCT_LCB_LL_OPEN_EVT, NULL); } - log::verbose("ch_state cfc: {} ", p_lcb->ch_state); + log::verbose("ch_state cfc: {}", p_lcb->ch_state); } } @@ -319,7 +319,7 @@ void avct_l2c_disconnect_ind_cback(uint16_t lcid, bool ack_needed) { tAVCT_LCB_EVT avct_lcb_evt; avct_lcb_evt.result = result; avct_lcb_event(p_lcb, AVCT_LCB_LL_CLOSE_EVT, &avct_lcb_evt); - log::verbose("ch_state di: {} ", p_lcb->ch_state); + log::verbose("ch_state di: {}", p_lcb->ch_state); } } @@ -341,7 +341,7 @@ void avct_l2c_disconnect(uint16_t lcid, uint16_t result) { tAVCT_LCB_EVT avct_lcb_evt; avct_lcb_evt.result = res; avct_lcb_event(p_lcb, AVCT_LCB_LL_CLOSE_EVT, &avct_lcb_evt); - log::verbose("ch_state dc: {} ", p_lcb->ch_state); + log::verbose("ch_state dc: {}", p_lcb->ch_state); } } diff --git a/system/stack/avct/avct_lcb.cc b/system/stack/avct/avct_lcb.cc index f7d4c58a5b..3e9ba5e1a8 100644 --- a/system/stack/avct/avct_lcb.cc +++ b/system/stack/avct/avct_lcb.cc @@ -256,7 +256,7 @@ tAVCT_LCB* avct_lcb_by_bd(const RawAddress& bd_addr) { /* if no lcb found */ p_lcb = NULL; - log::verbose("No lcb for addr {}", ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::verbose("No lcb for addr {}", bd_addr); } return p_lcb; } diff --git a/system/stack/avdt/avdt_api.cc b/system/stack/avdt/avdt_api.cc index 923641ebac..58be182e09 100644 --- a/system/stack/avdt/avdt_api.cc +++ b/system/stack/avdt/avdt_api.cc @@ -280,8 +280,7 @@ uint16_t AVDT_DiscoverReq(const RawAddress& bd_addr, uint8_t channel_index, } if (result != AVDT_SUCCESS) { - log::error("result={} address={}", result, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("result={} address={}", result, bd_addr); } return result; } @@ -333,8 +332,7 @@ static uint16_t avdt_get_cap_req(const RawAddress& bd_addr, } if (result != AVDT_SUCCESS) { - log::error("result={} address={}", result, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("result={} address={}", result, bd_addr); } return result; } @@ -382,8 +380,7 @@ uint16_t AVDT_GetCapReq(const RawAddress& bd_addr, uint8_t channel_index, result = avdt_get_cap_req(bd_addr, channel_index, &getcap); if (result != AVDT_SUCCESS) { - log::error("result={} address={}", result, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("result={} address={}", result, bd_addr); } return result; } @@ -446,8 +443,7 @@ uint16_t AVDT_OpenReq(uint8_t handle, const RawAddress& bd_addr, uint16_t result = AVDT_SUCCESS; tAVDT_SCB_EVT evt; - log::verbose("address={} avdt_handle={} seid={}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), handle, seid); + log::verbose("address={} avdt_handle={} seid={}", bd_addr, handle, seid); /* verify SEID */ if ((seid < AVDT_SEID_MIN) || (seid > AVDT_SEID_MAX)) { @@ -474,7 +470,7 @@ uint16_t AVDT_OpenReq(uint8_t handle, const RawAddress& bd_addr, /* send event to scb */ if (result == AVDT_SUCCESS) { - log::verbose("codec: {}", A2DP_CodecInfoString(p_cfg->codec_info).c_str()); + log::verbose("codec: {}", A2DP_CodecInfoString(p_cfg->codec_info)); evt.msg.config_cmd.hdr.seid = seid; evt.msg.config_cmd.hdr.ccb_idx = avdt_ccb_to_idx(p_ccb); @@ -482,8 +478,7 @@ uint16_t AVDT_OpenReq(uint8_t handle, const RawAddress& bd_addr, evt.msg.config_cmd.p_cfg = p_cfg; avdt_scb_event(p_scb, AVDT_SCB_API_SETCONFIG_REQ_EVT, &evt); } else { - log::error("result={} address={} avdt_handle={}", result, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), handle); + log::error("result={} address={} avdt_handle={}", result, bd_addr, handle); } return result; @@ -901,8 +896,7 @@ uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, uint8_t channel_index, uint16_t result = AVDT_SUCCESS; tAVDT_CCB_EVT evt; - log::warn("address={} channel_index={}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - channel_index); + log::warn("address={} channel_index={}", bd_addr, channel_index); /* find channel control block for this bd addr; if none, allocate one */ p_ccb = avdt_ccb_by_bd(bd_addr); @@ -925,7 +919,7 @@ uint16_t AVDT_ConnectReq(const RawAddress& bd_addr, uint8_t channel_index, avdt_ccb_event(p_ccb, AVDT_CCB_API_CONNECT_REQ_EVT, &evt); } - log::warn("address={} result={}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), result); + log::warn("address={} result={}", bd_addr, result); return result; } @@ -951,12 +945,10 @@ uint16_t AVDT_DisconnectReq(const RawAddress& bd_addr, /* find channel control block for this bd addr; if none, error */ p_ccb = avdt_ccb_by_bd(bd_addr); if (p_ccb == NULL) { - log::error("Unable to find AVDT stream endpoint peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("Unable to find AVDT stream endpoint peer:{}", bd_addr); result = AVDT_BAD_PARAMS; } else { - log::debug("Sending disconnect request to ccb peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Sending disconnect request to ccb peer:{}", bd_addr); evt.disconnect.p_cback = p_cback; avdt_ccb_event(p_ccb, AVDT_CCB_API_DISCONNECT_REQ_EVT, &evt); } diff --git a/system/stack/avdt/avdt_ccb.cc b/system/stack/avdt/avdt_ccb.cc index ca4d1c0cc3..da4a729b86 100644 --- a/system/stack/avdt/avdt_ccb.cc +++ b/system/stack/avdt/avdt_ccb.cc @@ -420,7 +420,7 @@ AvdtpCcb* avdt_ccb_by_bd(const RawAddress& bd_addr) { /* if no ccb found */ p_ccb = NULL; - log::verbose("No ccb for addr {}", ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::verbose("No ccb for addr {}", bd_addr); } return p_ccb; } @@ -441,8 +441,7 @@ AvdtpCcb* avdt_ccb_alloc(const RawAddress& bd_addr) { for (int i = 0; i < AVDT_NUM_LINKS; i++, p_ccb++) { if (!p_ccb->allocated) { p_ccb->Allocate(bd_addr); - log::verbose("allocated (index {}) for peer {}", i, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("allocated (index {}) for peer {}", i, bd_addr); return p_ccb; } } @@ -455,20 +454,19 @@ AvdtpCcb* avdt_ccb_alloc_by_channel_index(const RawAddress& bd_addr, uint8_t channel_index) { // Allocate the entry for the specified channel index if (channel_index >= AVDT_NUM_LINKS) { - log::error("peer {} invalid channel index {} (max {})", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), channel_index, - AVDT_NUM_LINKS); + log::error("peer {} invalid channel index {} (max {})", bd_addr, + channel_index, AVDT_NUM_LINKS); return nullptr; } AvdtpCcb* p_ccb = &avdtp_cb.ccb[channel_index]; if (p_ccb->allocated) { - log::error("peer {} channel index {} already allocated", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), channel_index); + log::error("peer {} channel index {} already allocated", bd_addr, + channel_index); return nullptr; } p_ccb->Allocate(bd_addr); log::verbose("allocated (index {}) peer={} p_ccb={}", channel_index, - ADDRESS_TO_LOGGABLE_CSTR(p_ccb->peer_addr), fmt::ptr(p_ccb)); + p_ccb->peer_addr, fmt::ptr(p_ccb)); return p_ccb; } @@ -495,8 +493,7 @@ void AvdtpCcb::Allocate(const RawAddress& peer_address) { ******************************************************************************/ void avdt_ccb_dealloc(AvdtpCcb* p_ccb, UNUSED_ATTR tAVDT_CCB_EVT* p_data) { log::verbose("deallocated (index {}) peer={} p_ccb={}", - avdt_ccb_to_idx(p_ccb), - ADDRESS_TO_LOGGABLE_CSTR(p_ccb->peer_addr), fmt::ptr(p_ccb)); + avdt_ccb_to_idx(p_ccb), p_ccb->peer_addr, fmt::ptr(p_ccb)); p_ccb->ResetCcb(); } diff --git a/system/stack/avdt/avdt_ccb_act.cc b/system/stack/avdt/avdt_ccb_act.cc index 85f25eb6b6..38cf225558 100644 --- a/system/stack/avdt/avdt_ccb_act.cc +++ b/system/stack/avdt/avdt_ccb_act.cc @@ -1001,7 +1001,7 @@ void avdt_ccb_ll_closed(AvdtpCcb* p_ccb, UNUSED_ATTR tAVDT_CCB_EVT* p_data) { tAVDT_CTRL_CBACK* p_cback; tAVDT_CTRL avdt_ctrl; - log::verbose("peer {}", ADDRESS_TO_LOGGABLE_CSTR(p_ccb->peer_addr)); + log::verbose("peer {}", p_ccb->peer_addr); /* clear any pending commands */ avdt_ccb_clear_cmds(p_ccb, NULL); @@ -1036,8 +1036,7 @@ void avdt_ccb_ll_closed(AvdtpCcb* p_ccb, UNUSED_ATTR tAVDT_CCB_EVT* p_data) { void avdt_ccb_ll_opened(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data) { tAVDT_CTRL avdt_ctrl; - log::verbose("peer {} BtaAvScbIndex={} p_ccb={}", - ADDRESS_TO_LOGGABLE_CSTR(p_ccb->peer_addr), + log::verbose("peer {} BtaAvScbIndex={} p_ccb={}", p_ccb->peer_addr, p_ccb->BtaAvScbIndex(), fmt::ptr(p_ccb)); p_ccb->ll_opened = true; diff --git a/system/stack/avdt/avdt_scb_act.cc b/system/stack/avdt/avdt_scb_act.cc index 58b651a2b2..a802aeaff5 100644 --- a/system/stack/avdt/avdt_scb_act.cc +++ b/system/stack/avdt/avdt_scb_act.cc @@ -566,12 +566,10 @@ void avdt_scb_hdl_setconfig_cmd(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) { fmt::ptr(p_scb), p_scb->stream_config.scb_index); if (!p_scb->in_use) { - log::verbose( - "codec: {}", - A2DP_CodecInfoString(p_scb->stream_config.cfg.codec_info).c_str()); - log::verbose( - "codec: {}", - A2DP_CodecInfoString(p_data->msg.config_cmd.p_cfg->codec_info).c_str()); + log::verbose("codec: {}", + A2DP_CodecInfoString(p_scb->stream_config.cfg.codec_info)); + log::verbose("codec: {}", A2DP_CodecInfoString( + p_data->msg.config_cmd.p_cfg->codec_info)); AvdtpSepConfig* p_cfg = p_data->msg.config_cmd.p_cfg; if (A2DP_GetCodecType(p_scb->stream_config.cfg.codec_info) == A2DP_GetCodecType(p_cfg->codec_info)) { @@ -1209,9 +1207,8 @@ void avdt_scb_snd_open_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) { void avdt_scb_snd_reconfig_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) { log::verbose("p_scb->peer_seid={} p_data->msg.hdr.seid={}", p_scb->peer_seid, p_data->msg.hdr.seid); - log::verbose( - "codec: {}", - A2DP_CodecInfoString(p_data->msg.config_cmd.p_cfg->codec_info).c_str()); + log::verbose("codec: {}", + A2DP_CodecInfoString(p_data->msg.config_cmd.p_cfg->codec_info)); p_scb->req_cfg = *p_data->msg.config_cmd.p_cfg; p_data->msg.hdr.seid = p_scb->peer_seid; @@ -1313,9 +1310,8 @@ void avdt_scb_snd_setconfig_rej(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) { * ******************************************************************************/ void avdt_scb_snd_setconfig_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) { - log::verbose( - "codec: {}", - A2DP_CodecInfoString(p_data->msg.config_cmd.p_cfg->codec_info).c_str()); + log::verbose("codec: {}", + A2DP_CodecInfoString(p_data->msg.config_cmd.p_cfg->codec_info)); /* copy API parameters to scb, set scb as in use */ diff --git a/system/stack/avrc/avrc_api.cc b/system/stack/avrc/avrc_api.cc index 838ff11b48..b31915a1b3 100644 --- a/system/stack/avrc/avrc_api.cc +++ b/system/stack/avrc/avrc_api.cc @@ -1447,10 +1447,9 @@ void AVRC_SaveControllerVersion(const RawAddress& bdaddr, bdaddr.ToString(), BTIF_STORAGE_KEY_AVRCP_CONTROLLER_VERSION, (const uint8_t*)&new_version, sizeof(new_version))) { log::info("store AVRC controller version {:x} for {} into config.", - new_version, ADDRESS_TO_LOGGABLE_CSTR(bdaddr)); + new_version, bdaddr); } else { - log::warn("Failed to store AVRC controller version for {}", - ADDRESS_TO_LOGGABLE_CSTR(bdaddr)); + log::warn("Failed to store AVRC controller version for {}", bdaddr); } } diff --git a/system/stack/avrc/avrc_bld_tg.cc b/system/stack/avrc/avrc_bld_tg.cc index b08123776a..8662e8f6ed 100644 --- a/system/stack/avrc/avrc_bld_tg.cc +++ b/system/stack/avrc/avrc_bld_tg.cc @@ -850,7 +850,7 @@ static tAVRC_STS avrc_bld_set_browsed_player_rsp(tAVRC_SET_BR_PLAYER_RSP* p_rsp, len_left = mtu; } len_left = len_left - p_pkt->offset - p_pkt->len; - log::verbose("len_left:{}, mtu:{} ", len_left, mtu); + log::verbose("len_left:{}, mtu:{}", len_left, mtu); /* get the existing length, if any, and also the num attributes */ p_start = (uint8_t*)(p_pkt + 1) + p_pkt->offset; diff --git a/system/stack/avrc/avrc_pars_ct.cc b/system/stack/avrc/avrc_pars_ct.cc index 3179204ba2..9f532aba10 100644 --- a/system/stack/avrc/avrc_pars_ct.cc +++ b/system/stack/avrc/avrc_pars_ct.cc @@ -553,7 +553,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg, if (len < min_len) goto length_error; BE_STREAM_TO_UINT8(p_result->get_caps.capability_id, p); BE_STREAM_TO_UINT8(p_result->get_caps.count, p); - log::verbose("cap id = {}, cap_count = {} ", + log::verbose("cap id = {}, cap_count = {}", p_result->get_caps.capability_id, p_result->get_caps.count); if (p_result->get_caps.capability_id == AVRC_CAP_COMPANY_ID) { if (p_result->get_caps.count > AVRC_CAP_MAX_NUM_COMP_ID) { @@ -588,7 +588,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg, } min_len += 1; BE_STREAM_TO_UINT8(p_result->list_app_attr.num_attr, p); - log::verbose("attr count = {} ", p_result->list_app_attr.num_attr); + log::verbose("attr count = {}", p_result->list_app_attr.num_attr); if (p_result->list_app_attr.num_attr > AVRC_MAX_APP_ATTR_SIZE) { p_result->list_app_attr.num_attr = AVRC_MAX_APP_ATTR_SIZE; @@ -612,7 +612,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg, p_result->list_app_values.num_val = AVRC_MAX_APP_ATTR_SIZE; } - log::verbose("value count = {} ", p_result->list_app_values.num_val); + log::verbose("value count = {}", p_result->list_app_values.num_val); min_len += p_result->list_app_values.num_val; if (len < min_len) goto length_error; for (int xx = 0; xx < p_result->list_app_values.num_val; xx++) { @@ -627,7 +627,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg, } min_len += 1; BE_STREAM_TO_UINT8(p_result->get_cur_app_val.num_val, p); - log::verbose("attr count = {} ", p_result->get_cur_app_val.num_val); + log::verbose("attr count = {}", p_result->get_cur_app_val.num_val); if (p_result->get_cur_app_val.num_val > AVRC_MAX_APP_ATTR_SIZE) { p_result->get_cur_app_val.num_val = AVRC_MAX_APP_ATTR_SIZE; @@ -659,7 +659,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg, if (num_attrs > AVRC_MAX_APP_ATTR_SIZE) { num_attrs = AVRC_MAX_APP_ATTR_SIZE; } - log::verbose("attr count = {} ", p_result->get_app_attr_txt.num_attr); + log::verbose("attr count = {}", p_result->get_app_attr_txt.num_attr); p_result->get_app_attr_txt.num_attr = num_attrs; p_result->get_app_attr_txt.p_attrs = (tAVRC_APP_SETTING_TEXT*)osi_calloc( @@ -712,7 +712,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg, num_vals = AVRC_MAX_APP_ATTR_SIZE; } p_result->get_app_val_txt.num_attr = num_vals; - log::verbose("value count = {} ", p_result->get_app_val_txt.num_attr); + log::verbose("value count = {}", p_result->get_app_val_txt.num_attr); p_result->get_app_val_txt.p_attrs = (tAVRC_APP_SETTING_TEXT*)osi_calloc( num_vals * sizeof(tAVRC_APP_SETTING_TEXT)); diff --git a/system/stack/avrc/avrc_sdp.cc b/system/stack/avrc/avrc_sdp.cc index 5944a10a8e..4f2d4b6594 100644 --- a/system/stack/avrc/avrc_sdp.cc +++ b/system/stack/avrc/avrc_sdp.cc @@ -157,8 +157,7 @@ uint16_t AVRC_FindService(uint16_t service_uuid, const RawAddress& bd_addr, bd_addr, p_db->p_db, avrc_sdp_cback); if (!result) { - log::error("Failed to init SDP for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("Failed to init SDP for peer {}", bd_addr); avrc_sdp_cback(bd_addr, SDP_GENERIC_ERROR); } } diff --git a/system/stack/avrc/avrc_utils.cc b/system/stack/avrc/avrc_utils.cc index 968cd50daf..ccba3e1933 100644 --- a/system/stack/avrc/avrc_utils.cc +++ b/system/stack/avrc/avrc_utils.cc @@ -117,7 +117,7 @@ bool avrc_is_valid_player_attrib_value(uint8_t attrib, uint8_t value) { if (attrib >= AVRC_PLAYER_SETTING_LOW_MENU_EXT) result = true; if (!result) { - log::error(" found not matching attrib(x{:x})-value(x{:x}) pair!", attrib, + log::error("found not matching attrib(x{:x})-value(x{:x}) pair!", attrib, value); } return result; diff --git a/system/stack/bnep/bnep_api.cc b/system/stack/bnep/bnep_api.cc index c41d786359..a7bfa89dd9 100644 --- a/system/stack/bnep/bnep_api.cc +++ b/system/stack/bnep/bnep_api.cc @@ -137,7 +137,7 @@ tBNEP_RESULT BNEP_Connect(const RawAddress& p_rem_bda, const Uuid& src_uuid, uint16_t cid; tBNEP_CONN* p_bcb = bnepu_find_bcb_by_bd_addr(p_rem_bda); - log::verbose("BDA:{}", ADDRESS_TO_LOGGABLE_STR(p_rem_bda)); + log::verbose("BDA:{}", p_rem_bda); if (!bnep_cb.profile_registered) return BNEP_WRONG_STATE; @@ -164,7 +164,7 @@ tBNEP_RESULT BNEP_Connect(const RawAddress& p_rem_bda, const Uuid& src_uuid, p_bcb->con_state = BNEP_STATE_SEC_CHECKING; log::verbose("BNEP initiating security procedures for src uuid {}", - p_bcb->src_uuid.ToString().c_str()); + p_bcb->src_uuid.ToString()); bnep_sec_check_complete(&p_bcb->rem_bda, BT_TRANSPORT_BR_EDR, p_bcb); } else { diff --git a/system/stack/bnep/bnep_utils.cc b/system/stack/bnep/bnep_utils.cc index dcbb7c052c..edf1592827 100644 --- a/system/stack/bnep/bnep_utils.cc +++ b/system/stack/bnep/bnep_utils.cc @@ -173,7 +173,7 @@ void bnep_send_conn_req(tBNEP_CONN* p_bcb) { uint8_t *p, *p_start; log::verbose("sending setup req with dst uuid {}", - p_bcb->dst_uuid.ToString().c_str()); + p_bcb->dst_uuid.ToString()); p_buf->offset = L2CAP_MIN_OFFSET; p = p_start = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; @@ -201,8 +201,7 @@ void bnep_send_conn_req(tBNEP_CONN* p_bcb) { memcpy(p, p_bcb->src_uuid.To128BitBE().data(), Uuid::kNumBytes128); p += Uuid::kNumBytes128; } else { - log::error("uuid: {}, invalid length: {}", - p_bcb->dst_uuid.ToString().c_str(), + log::error("uuid: {}, invalid length: {}", p_bcb->dst_uuid.ToString(), p_bcb->dst_uuid.GetShortestRepresentationSize()); } @@ -613,7 +612,7 @@ void bnep_process_setup_conn_req(tBNEP_CONN* p_bcb, uint8_t* p_setup, p_bcb->con_flags |= BNEP_FLAGS_SETUP_RCVD; log::debug("BNEP initiating security check for incoming call for uuid {}", - p_bcb->src_uuid.ToString().c_str()); + p_bcb->src_uuid.ToString()); bnep_sec_check_complete(&p_bcb->rem_bda, BT_TRANSPORT_BR_EDR, p_bcb); } @@ -1256,7 +1255,7 @@ tBNEP_RESULT bnep_is_packet_allowed(tBNEP_CONN* p_bcb, if ((p_bcb->rcvd_mcast_filters == 0xFFFF) || (i == p_bcb->rcvd_mcast_filters)) { log::verbose("Ignoring multicast address {} in BNEP data write", - ADDRESS_TO_LOGGABLE_STR(dest_addr)); + dest_addr); return BNEP_IGNORE_CMD; } } diff --git a/system/stack/btm/btm_ble_addr.cc b/system/stack/btm/btm_ble_addr.cc index db0a888935..df55826adb 100644 --- a/system/stack/btm/btm_ble_addr.cc +++ b/system/stack/btm/btm_ble_addr.cc @@ -298,8 +298,7 @@ bool maybe_resolve_address(RawAddress* bda, tBLE_ADDR_TYPE* bda_type) { if (!is_in_security_db && addr_is_rpa) { tBTM_SEC_DEV_REC* match_rec = btm_ble_resolve_random_addr(*bda); if (match_rec) { - log::info("matched/resolved random address:{}", - ADDRESS_TO_LOGGABLE_CSTR(*bda)); + log::info("matched/resolved random address:{}", *bda); is_in_security_db = true; match_rec->ble.active_addr_type = BTM_BLE_ADDR_RRA; match_rec->ble.cur_rand_addr = *bda; @@ -311,8 +310,7 @@ bool maybe_resolve_address(RawAddress* bda, tBLE_ADDR_TYPE* bda_type) { *bda = match_rec->bd_addr; } } else { - log::info("unable to match/resolve random address:{}", - ADDRESS_TO_LOGGABLE_CSTR(*bda)); + log::info("unable to match/resolve random address:{}", *bda); } } return is_in_security_db; diff --git a/system/stack/btm/btm_ble_gap.cc b/system/stack/btm/btm_ble_gap.cc index cc8e34ba88..137232ea69 100644 --- a/system/stack/btm/btm_ble_gap.cc +++ b/system/stack/btm/btm_ble_gap.cc @@ -1059,9 +1059,7 @@ static void sync_queue_cleanup(remove_sync_node_t* p_param) { if (sync_request->sid == p_param->sid && sync_request->address == p_param->address) { log::info("removing connection request SID={:04X}, bd_addr={}, busy={}", - sync_request->sid, - ADDRESS_TO_LOGGABLE_CSTR(sync_request->address), - sync_request->busy); + sync_request->sid, sync_request->address, sync_request->busy); list_remove(sync_queue, sync_request); } } @@ -1105,7 +1103,7 @@ static void btm_queue_sync_next() { sync_node_t* p_head = (sync_node_t*)list_front(sync_queue); log::info("executing sync request SID={:04X}, bd_addr={}", p_head->sid, - ADDRESS_TO_LOGGABLE_CSTR(p_head->address)); + p_head->address); if (p_head->busy) { log::debug("BUSY"); return; @@ -1340,8 +1338,7 @@ static uint8_t btm_set_conn_mode_adv_init_addr( .type = *p_peer_addr_type, .bda = p_peer_addr_ptr, }; - log::debug("Received BLE connect event {}", - ADDRESS_TO_LOGGABLE_CSTR(ble_bd_addr)); + log::debug("Received BLE connect event {}", ble_bd_addr); evt_type = btm_cb.ble_ctr_cb.inq_var.directed_conn; @@ -1553,7 +1550,7 @@ tBTM_STATUS btm_ble_set_discoverability(uint16_t combined_mode) { alarm_cancel(btm_cb.ble_ctr_cb.inq_var.fast_adv_timer); /* update adv params if start advertising */ - log::verbose("evt_type=0x{:x} p-cb->evt_type=0x{:x} ", evt_type, + log::verbose("evt_type=0x{:x} p-cb->evt_type=0x{:x}", evt_type, btm_cb.ble_ctr_cb.inq_var.evt_type); if (new_mode == BTM_BLE_ADV_ENABLE) { @@ -2265,7 +2262,7 @@ void btm_ble_process_adv_addr(RawAddress& bda, tBLE_ADDR_TYPE* addr_type) { /* map address to security record */ bool match = btm_identity_addr_to_random_pseudo(&bda, addr_type, false); - log::verbose("bda={}", ADDRESS_TO_LOGGABLE_STR(bda)); + log::verbose("bda={}", bda); /* always do RRA resolution on host */ if (!match && BTM_BLE_IS_RESOLVE_BDA(bda)) { tBTM_SEC_DEV_REC* match_rec = btm_ble_resolve_random_addr(bda); @@ -2326,8 +2323,7 @@ void btm_ble_process_adv_pkt_cont(uint16_t evt_type, tBLE_ADDR_TYPE addr_type, if (!data_complete) { // If we didn't receive whole adv data yet, don't report the device. - log::verbose("Data not complete yet, waiting for more {}", - ADDRESS_TO_LOGGABLE_STR(bda)); + log::verbose("Data not complete yet, waiting for more {}", bda); return; } @@ -2335,7 +2331,7 @@ void btm_ble_process_adv_pkt_cont(uint16_t evt_type, tBLE_ADDR_TYPE addr_type, btm_cb.ble_ctr_cb.inq_var.scan_type == BTM_BLE_SCAN_MODE_ACTI; if (is_active_scan && is_scannable && !is_scan_resp) { // If we didn't receive scan response yet, don't report the device. - log::verbose(" Waiting for scan response {}", ADDRESS_TO_LOGGABLE_STR(bda)); + log::verbose("Waiting for scan response {}", bda); return; } @@ -2838,7 +2834,7 @@ void btm_ble_read_remote_features_complete(uint8_t* p, uint8_t length) { if (status != HCI_SUCCESS) { if (status != HCI_ERR_UNSUPPORTED_REM_FEATURE) { log::error("Failed to read remote features status:{}", - hci_error_code_text(static_cast<tHCI_STATUS>(status)).c_str()); + hci_error_code_text(static_cast<tHCI_STATUS>(status))); return; } log::warn("Remote does not support reading remote feature"); diff --git a/system/stack/btm/btm_ble_privacy.cc b/system/stack/btm/btm_ble_privacy.cc index 5fd15fa702..da6f1bb4b4 100644 --- a/system/stack/btm/btm_ble_privacy.cc +++ b/system/stack/btm/btm_ble_privacy.cc @@ -384,7 +384,7 @@ void btm_ble_read_resolving_list_entry_complete(const uint8_t* p, p += (2 + 16 + 1 + 6); STREAM_TO_BDADDR(rra, p); - log::info("peer_addr:{}", ADDRESS_TO_LOGGABLE_CSTR(rra)); + log::info("peer_addr:{}", rra); } else { STREAM_TO_BDADDR(rra, p); } @@ -571,13 +571,13 @@ void btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC& dev_rec) { // No need to check for local identity key validity. It remains unchanged. if (!is_peer_identity_key_valid(dev_rec)) { log::info("Peer is not an RPA enabled device:{}", - ADDRESS_TO_LOGGABLE_CSTR(dev_rec.ble.identity_address_with_type)); + dev_rec.ble.identity_address_with_type); return; } if (dev_rec.ble.in_controller_list & BTM_RESOLVING_LIST_BIT) { log::warn("Already in Address Resolving list device:{}", - ADDRESS_TO_LOGGABLE_CSTR(dev_rec.ble.identity_address_with_type)); + dev_rec.ble.identity_address_with_type); return; } @@ -601,7 +601,7 @@ void btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC& dev_rec) { dev_rec.ble.identity_address_with_type, peer_irk, local_irk); log::debug("Added to Address Resolving list device:{}", - ADDRESS_TO_LOGGABLE_CSTR(dev_rec.ble.identity_address_with_type)); + dev_rec.ble.identity_address_with_type); dev_rec.ble.in_controller_list |= BTM_RESOLVING_LIST_BIT; } diff --git a/system/stack/btm/btm_ble_sec.cc b/system/stack/btm/btm_ble_sec.cc index 233013e681..6ac9fbc597 100644 --- a/system/stack/btm/btm_ble_sec.cc +++ b/system/stack/btm/btm_ble_sec.cc @@ -97,8 +97,7 @@ void BTM_SecAddBleDevice(const RawAddress& bd_addr, tBT_DEVICE_TYPE dev_type, p_dev_rec->conn_params.peripheral_latency = BTM_BLE_CONN_PARAM_UNDEF; log::debug("Device added, handle=0x{:x}, p_dev_rec={}, bd_addr={}", - p_dev_rec->ble_hci_handle, fmt::ptr(p_dev_rec), - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + p_dev_rec->ble_hci_handle, fmt::ptr(p_dev_rec), bd_addr); } memset(p_dev_rec->sec_bd_name, 0, sizeof(BD_NAME)); @@ -133,7 +132,7 @@ void BTM_SecAddBleDevice(const RawAddress& bd_addr, tBT_DEVICE_TYPE dev_type, * ******************************************************************************/ bool BTM_GetRemoteDeviceName(const RawAddress& bd_addr, BD_NAME bd_name) { - log::verbose("bd_addr:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("bd_addr:{}", bd_addr); bool ret = FALSE; bt_bdname_t bdname; @@ -173,12 +172,11 @@ void BTM_SecAddBleKey(const RawAddress& bd_addr, tBTM_LE_KEY_VALUE* p_le_key, key_type != BTM_LE_KEY_PCSRK && key_type != BTM_LE_KEY_LENC && key_type != BTM_LE_KEY_LCSRK && key_type != BTM_LE_KEY_LID)) { log::warn("Wrong Type, or No Device record for bdaddr:{}, Type:0{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), key_type); + bd_addr, key_type); return; } - log::debug("Adding BLE key device:{} key_type:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), key_type); + log::debug("Adding BLE key device:{} key_type:{}", bd_addr, key_type); btm_sec_save_le_key(bd_addr, key_type, p_le_key, false); // Only set peer irk. Local irk is always the same. @@ -250,8 +248,7 @@ const Octet16& BTM_GetDeviceDHK() { return btm_sec_cb.devcb.id_keys.dhk; } void BTM_SecurityGrant(const RawAddress& bd_addr, uint8_t res) { const tSMP_STATUS res_smp = (res == BTM_SUCCESS) ? SMP_SUCCESS : SMP_REPEATED_ATTEMPTS; - log::verbose("bd_addr:{}, res:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - smp_status_text(res_smp).c_str()); + log::verbose("bd_addr:{}, res:{}", bd_addr, smp_status_text(res_smp)); BTM_LogHistory(kBtmLogTag, bd_addr, "Granted", base::StringPrintf("passkey_status:%s", smp_status_text(res_smp).c_str())); @@ -276,9 +273,9 @@ void BTM_SecurityGrant(const RawAddress& bd_addr, uint8_t res) { void BTM_BlePasskeyReply(const RawAddress& bd_addr, uint8_t res, uint32_t passkey) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr); - log::verbose("bd_addr:{}, res:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), res); + log::verbose("bd_addr:{}, res:{}", bd_addr, res); if (p_dev_rec == NULL) { - log::error("Unknown device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("Unknown device:{}", bd_addr); return; } @@ -307,9 +304,9 @@ void BTM_BlePasskeyReply(const RawAddress& bd_addr, uint8_t res, ******************************************************************************/ void BTM_BleConfirmReply(const RawAddress& bd_addr, uint8_t res) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr); - log::verbose("bd_addr:{}, res:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), res); + log::verbose("bd_addr:{}, res:{}", bd_addr, res); if (p_dev_rec == NULL) { - log::error("Unknown device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("Unknown device:{}", bd_addr); return; } const tSMP_STATUS res_smp = @@ -344,7 +341,7 @@ void BTM_BleOobDataReply(const RawAddress& bd_addr, uint8_t res, uint8_t len, uint8_t* p_data) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr); if (p_dev_rec == NULL) { - log::error("Unknown device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("Unknown device:{}", bd_addr); return; } @@ -375,7 +372,7 @@ void BTM_BleSecureConnectionOobDataReply(const RawAddress& bd_addr, uint8_t* p_c, uint8_t* p_r) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr); if (p_dev_rec == NULL) { - log::error("Unknown device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("Unknown device:{}", bd_addr); return; } @@ -528,8 +525,7 @@ void BTM_ReadDevInfo(const RawAddress& remote_bda, tBT_DEVICE_TYPE* p_dev_type, } } log::debug("Determined device_type:{} addr_type:{}", - DeviceTypeText(*p_dev_type).c_str(), - AddressTypeText(*p_addr_type).c_str()); + DeviceTypeText(*p_dev_type), AddressTypeText(*p_addr_type)); } /******************************************************************************* @@ -583,12 +579,11 @@ tBTM_STATUS BTM_SetBleDataLength(const RawAddress& bd_addr, return BTM_ILLEGAL_VALUE; } - log::info("bd_addr:{}, tx_pdu_length:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - tx_pdu_length); + log::info("bd_addr:{}, tx_pdu_length:{}", bd_addr, tx_pdu_length); auto p_dev_rec = btm_find_dev(bd_addr); if (p_dev_rec == NULL) { - log::error("Device {} not found", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("Device {} not found", bd_addr); return BTM_UNKNOWN_ADDR; } @@ -831,7 +826,7 @@ void tBTM_SEC_REC::increment_sign_counter(bool local) { bool btm_ble_get_enc_key_type(const RawAddress& bd_addr, uint8_t* p_key_types) { tBTM_SEC_DEV_REC* p_dev_rec; - log::verbose("bd_addr:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("bd_addr:{}", bd_addr); p_dev_rec = btm_find_dev(bd_addr); if (p_dev_rec != NULL) { @@ -921,10 +916,8 @@ void btm_sec_save_le_key(const RawAddress& bd_addr, tBTM_LE_KEY_TYPE key_type, log::verbose( "BTM_LE_KEY_PID key_type=0x{:x} save peer IRK, change bd_addr={} " "to id_addr={} id_addr_type=0x{:x}", - p_rec->sec_rec.ble_keys.key_type, - ADDRESS_TO_LOGGABLE_CSTR(p_rec->bd_addr), - ADDRESS_TO_LOGGABLE_CSTR(p_keys->pid_key.identity_addr), - p_keys->pid_key.identity_addr_type); + p_rec->sec_rec.ble_keys.key_type, p_rec->bd_addr, + p_keys->pid_key.identity_addr, p_keys->pid_key.identity_addr_type); /* update device record address as identity address */ p_rec->bd_addr = p_keys->pid_key.identity_addr; /* combine DUMO device security record if needed */ @@ -988,8 +981,7 @@ void btm_sec_save_le_key(const RawAddress& bd_addr, tBTM_LE_KEY_TYPE key_type, return; } - log::verbose("BLE key type 0x{:x}, updated for BDA:{}", key_type, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("BLE key type 0x{:x}, updated for BDA:{}", key_type, bd_addr); /* Notify the application that one of the BLE keys has been updated If link key is in progress, it will get sent later.*/ @@ -1003,7 +995,7 @@ void btm_sec_save_le_key(const RawAddress& bd_addr, tBTM_LE_KEY_TYPE key_type, } log::warn("BLE key type 0x{:x}, called for Unknown BDA or type:{}", key_type, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + bd_addr); if (p_rec) { log::verbose("sec_flags=0x{:x}", p_rec->sec_rec.sec_flags); @@ -1023,8 +1015,7 @@ void btm_ble_update_sec_key_size(const RawAddress& bd_addr, uint8_t enc_key_size) { tBTM_SEC_DEV_REC* p_rec; - log::verbose("bd_addr:{}, enc_key_size={}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - enc_key_size); + log::verbose("bd_addr:{}, enc_key_size={}", bd_addr, enc_key_size); p_rec = btm_find_dev(bd_addr); if (p_rec != NULL) { @@ -1066,8 +1057,7 @@ void btm_ble_link_sec_check(const RawAddress& bd_addr, tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr); uint8_t req_sec_level = SMP_SEC_NONE, cur_sec_level = SMP_SEC_NONE; - log::verbose("bd_addr:{}, auth_req=0x{:x}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - auth_req); + log::verbose("bd_addr:{}, auth_req=0x{:x}", bd_addr, auth_req); if (p_dev_rec == NULL) { log::error("received for unknown device"); @@ -1227,8 +1217,7 @@ tBTM_STATUS btm_ble_start_encrypt(const RawAddress& bda, bool use_stk, tBTM_SEC_DEV_REC* p_rec = btm_find_dev(bda); BT_OCTET8 dummy_rand = {0}; - log::verbose("bd_addr:{}, use_stk:{}", ADDRESS_TO_LOGGABLE_CSTR(bda), - use_stk); + log::verbose("bd_addr:{}, use_stk:{}", bda, use_stk); if (!p_rec) { log::error("Link is not active, can not encrypt!"); @@ -1315,8 +1304,7 @@ void btm_ble_link_encrypted(const RawAddress& bd_addr, uint8_t encr_enable) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr); bool enc_cback; - log::verbose("bd_addr:{}, encr_enable={}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - encr_enable); + log::verbose("bd_addr:{}, encr_enable={}", bd_addr, encr_enable); if (!p_dev_rec) { log::warn("No Device Found!"); @@ -1378,7 +1366,7 @@ void btm_ble_ltk_request_reply(const RawAddress& bda, bool use_stk, tBTM_SEC_DEV_REC* p_rec = btm_find_dev(bda); tBTM_SEC_CB* p_cb = &btm_sec_cb; - log::debug("bd_addr:{},use_stk:{}", ADDRESS_TO_LOGGABLE_CSTR(bda), use_stk); + log::debug("bd_addr:{},use_stk:{}", bda, use_stk); if (p_rec == NULL) { log::error("unknown device"); @@ -1433,8 +1421,7 @@ void btm_ble_ltk_request_reply(const RawAddress& bda, bool use_stk, static uint8_t btm_ble_io_capabilities_req(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data) { uint8_t callback_rc = BTM_SUCCESS; - log::verbose("p_dev_rec->bd_addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr)); + log::verbose("p_dev_rec->bd_addr:{}", p_dev_rec->bd_addr); if (btm_sec_cb.api.p_le_callback) { /* the callback function implementation may change the IO capability... */ callback_rc = (*btm_sec_cb.api.p_le_callback)( @@ -1499,8 +1486,7 @@ static uint8_t btm_ble_io_capabilities_req(tBTM_SEC_DEV_REC* p_dev_rec, static uint8_t btm_ble_br_keys_req(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_LE_IO_REQ* p_data) { uint8_t callback_rc = BTM_SUCCESS; - log::verbose("p_dev_rec->bd_addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr)); + log::verbose("p_dev_rec->bd_addr:{}", p_dev_rec->bd_addr); *p_data = tBTM_LE_IO_REQ{ .io_cap = BTM_IO_CAP_UNKNOWN, .oob_data = false, @@ -1534,8 +1520,7 @@ void btm_ble_connected(const RawAddress& bda, uint16_t handle, bool can_read_discoverable_characteristics) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda); - log::info("Update timestamp for ble connection:{}", - ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::info("Update timestamp for ble connection:{}", bda); // TODO() Why is timestamp a counter ? p_dev_rec->timestamp = btm_sec_cb.dev_rec_count++; @@ -1568,8 +1553,7 @@ void btm_ble_connected(const RawAddress& bda, uint16_t handle, *****************************************************************************/ tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, const tSMP_EVT_DATA* p_data) { - log::verbose("bd_addr:{}, event={}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - smp_evt_to_text(event).c_str()); + log::verbose("bd_addr:{}, event={}", bd_addr, smp_evt_to_text(event)); if (event == SMP_SC_LOC_OOB_DATA_UP_EVT) { btm_sec_cr_loc_oob_data_cback_event(RawAddress{}, p_data->loc_oob_data); @@ -1704,8 +1688,7 @@ tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, case SMP_SIRK_VERIFICATION_REQ_EVT: res = (*btm_sec_cb.api.p_sirk_verification_callback)(bd_addr); - log::debug("SMP SIRK verification result:{}", - btm_status_text(res).c_str()); + log::debug("SMP SIRK verification result:{}", btm_status_text(res)); if (res != BTM_CMD_STARTED) { return res; } @@ -1713,12 +1696,12 @@ tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, break; default: - log::verbose("unknown event={}", smp_evt_to_text(event).c_str()); + log::verbose("unknown event={}", smp_evt_to_text(event)); break; } } else { log::warn("Unexpected event '{}' for unknown device.", - smp_evt_to_text(event).c_str()); + smp_evt_to_text(event)); } return BTM_SUCCESS; @@ -1836,8 +1819,7 @@ void BTM_BleSirkConfirmDeviceReply(const RawAddress& bd_addr, uint8_t res) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr); tSMP_STATUS res_smp = (res == BTM_SUCCESS) ? SMP_SUCCESS : SMP_FAIL; - log::info("bd_addr:{}, result:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - smp_status_text(res_smp).c_str()); + log::info("bd_addr:{}, result:{}", bd_addr, smp_status_text(res_smp)); if (p_dev_rec == NULL) { log::error("Confirmation of Unknown device"); diff --git a/system/stack/btm/btm_dev.cc b/system/stack/btm/btm_dev.cc index 67f97a97cb..b300cb384a 100644 --- a/system/stack/btm/btm_dev.cc +++ b/system/stack/btm/btm_dev.cc @@ -90,7 +90,7 @@ void BTM_SecAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class, log::info( "Caching new record from config file device: {}, dev_class: 0x{:02x}, " "link_key_type: 0x{:x}", - ADDRESS_TO_LOGGABLE_STR(bd_addr), fmt::join(dev_class, ""), key_type); + bd_addr, fmt::join(dev_class, ""), key_type); p_dev_rec->bd_addr = bd_addr; p_dev_rec->hci_handle = BTM_GetHCIConnHandle(bd_addr, BT_TRANSPORT_BR_EDR); @@ -102,7 +102,7 @@ void BTM_SecAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class, log::info( "Caching existing record from config file device: {}, dev_class: " "0x{:02x}, link_key_type: 0x{:x}", - ADDRESS_TO_LOGGABLE_STR(bd_addr), fmt::join(dev_class, ""), key_type); + bd_addr, fmt::join(dev_class, ""), key_type); /* "Bump" timestamp for existing record */ p_dev_rec->timestamp = btm_sec_cb.dev_rec_count++; @@ -157,8 +157,7 @@ void BTM_AcceptlistRemove(const RawAddress& address); bool BTM_SecDeleteDevice(const RawAddress& bd_addr) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr); if (p_dev_rec == NULL) { - log::warn("Unable to delete link key for unknown device {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("Unable to delete link key for unknown device {}", bd_addr); return true; } @@ -168,15 +167,14 @@ bool BTM_SecDeleteDevice(const RawAddress& bd_addr) { if (BTM_IsAclConnectionUp(bd_addr, BT_TRANSPORT_LE) || BTM_IsAclConnectionUp(bd_addr, BT_TRANSPORT_BR_EDR)) { - log::warn("FAILED: Cannot Delete when connection to {} is active", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("FAILED: Cannot Delete when connection to {} is active", bd_addr); return false; } RawAddress bda = p_dev_rec->bd_addr; log::info("Remove device {} from filter accept list before delete record", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + bd_addr); if (bluetooth::common::init_flags:: use_unified_connection_manager_is_enabled()) { bluetooth::connection::GetConnectionManager() @@ -194,7 +192,7 @@ bool BTM_SecDeleteDevice(const RawAddress& bd_addr) { wipe_secrets_and_remove(p_dev_rec); /* Tell controller to get rid of the link key, if it has one stored */ BTM_DeleteStoredLinkKey(&bda, NULL); - log::info("{} complete", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("{} complete", bd_addr); BTM_LogHistory(kBtmLogTag, bd_addr, "Device removed", base::StringPrintf("device_type:%s bond_type:%s", DeviceTypeText(device_type).c_str(), @@ -256,8 +254,7 @@ tBTM_SEC_DEV_REC* btm_sec_alloc_dev(const RawAddress& bd_addr) { tBTM_SEC_DEV_REC* p_dev_rec = btm_sec_allocate_dev_rec(); - log::debug("Allocated device record bd_addr:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Allocated device record bd_addr:{}", bd_addr); /* Check with the BT manager if details about remote device are known */ /* outgoing connection */ @@ -452,7 +449,7 @@ void btm_dev_consolidate_existing_connections(const RawAddress& bd_addr) { return; } - log::info("{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("{}", bd_addr); list_node_t* end = list_end(btm_sec_cb.sec_dev_rec); list_node_t* node = list_begin(btm_sec_cb.sec_dev_rec); @@ -469,7 +466,7 @@ void btm_dev_consolidate_existing_connections(const RawAddress& bd_addr) { if (btm_ble_addr_resolvable(p_dev_rec->bd_addr, p_target_rec)) { if (p_dev_rec->ble_hci_handle == HCI_INVALID_HANDLE) { log::info("already disconnected - erasing entry {}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr)); + p_dev_rec->bd_addr); wipe_secrets_and_remove(p_dev_rec); continue; } @@ -477,8 +474,7 @@ void btm_dev_consolidate_existing_connections(const RawAddress& bd_addr) { log::info( "Found existing LE connection to just bonded device on {} handle " "0x{:04x}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr), - p_dev_rec->ble_hci_handle); + p_dev_rec->bd_addr, p_dev_rec->ble_hci_handle); RawAddress ble_conn_addr = p_dev_rec->bd_addr; p_target_rec->ble_hci_handle = p_dev_rec->ble_hci_handle; @@ -694,8 +690,8 @@ bool BTM_Sec_AddressKnown(const RawAddress& address) { if (p_dev_rec == NULL || (p_dev_rec->device_type & BT_DEVICE_TYPE_BLE) == 0) return true; - log::warn("{}, device type not BLE: 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(address), p_dev_rec->device_type); + log::warn("{}, device type not BLE: 0x{:02x}", address, + p_dev_rec->device_type); // bonded device with identity address known if (!p_dev_rec->ble.identity_address_with_type.bda.IsEmpty()) { @@ -708,8 +704,8 @@ bool BTM_Sec_AddressKnown(const RawAddress& address) { return true; } - log::warn("{}, the address type is 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(address), p_dev_rec->ble.AddressType()); + log::warn("{}, the address type is 0x{:02x}", address, + p_dev_rec->ble.AddressType()); // Only Resolvable Private Address (RPA) is known, we don't allow it into // the background connection procedure. diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc index df6bead44c..0681153911 100644 --- a/system/stack/btm/btm_inq.cc +++ b/system/stack/btm/btm_inq.cc @@ -781,7 +781,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, tBTM_INQUIRY_STATE::BTM_INQUIRY_STARTED); } else { log::info("Inquiry failed to start status: {}", - bluetooth::hci::ErrorCodeText(status).c_str()); + bluetooth::hci::ErrorCodeText(status)); } })); @@ -826,7 +826,7 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, tBTM_STATUS BTM_ReadRemoteDeviceName(const RawAddress& remote_bda, tBTM_NAME_CMPL_CB* p_cb, tBT_TRANSPORT transport) { - log::verbose("bd addr {}", ADDRESS_TO_LOGGABLE_STR(remote_bda)); + log::verbose("bd addr {}", remote_bda); /* Use LE transport when LE is the only available option */ if (transport == BT_TRANSPORT_LE) { return btm_ble_read_remote_name(remote_bda, p_cb); @@ -1761,8 +1761,7 @@ void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode) { tBTM_INQUIRY_STATE::BTM_INQUIRY_COMPLETE); if (status != HCI_SUCCESS) { - log::warn("Received unexpected hci status:{}", - hci_error_code_text(status).c_str()); + log::warn("Received unexpected hci status:{}", hci_error_code_text(status)); } /* Ignore any stray or late complete messages if the inquiry is not active */ @@ -2230,12 +2229,12 @@ uint8_t BTM_GetEirUuidList(const uint8_t* p_eir, size_t eir_len, if (uuid_size == Uuid::kNumBytes16) { for (yy = 0; yy < *p_num_uuid; yy++) { STREAM_TO_UINT16(*(p_uuid16 + yy), p_uuid_data); - log::verbose(" 0x{:04X}", *(p_uuid16 + yy)); + log::verbose("0x{:04X}", *(p_uuid16 + yy)); } } else if (uuid_size == Uuid::kNumBytes32) { for (yy = 0; yy < *p_num_uuid; yy++) { STREAM_TO_UINT32(*(p_uuid32 + yy), p_uuid_data); - log::verbose(" 0x{:08X}", *(p_uuid32 + yy)); + log::verbose("0x{:08X}", *(p_uuid32 + yy)); } } else if (uuid_size == Uuid::kNumBytes128) { for (yy = 0; yy < *p_num_uuid; yy++) { @@ -2243,7 +2242,7 @@ uint8_t BTM_GetEirUuidList(const uint8_t* p_eir, size_t eir_len, for (xx = 0; xx < Uuid::kNumBytes128; xx++) snprintf(buff + xx * 2, sizeof(buff) - xx * 2, "%02X", *(p_uuid_list + yy * Uuid::kNumBytes128 + xx)); - log::verbose(" 0x{}", buff); + log::verbose("0x{}", buff); } } diff --git a/system/stack/btm/btm_iso_impl.h b/system/stack/btm/btm_iso_impl.h index 5304755f37..e4f43ad384 100644 --- a/system/stack/btm/btm_iso_impl.h +++ b/system/stack/btm/btm_iso_impl.h @@ -353,7 +353,7 @@ struct iso_impl { if (iso == nullptr) { /* That can happen when ACL has been disconnected while ISO patch was * creating */ - log::warn("Invalid connection handle: {}", +conn_handle); + log::warn("Invalid connection handle: {}", conn_handle); return; } @@ -414,7 +414,7 @@ struct iso_impl { if (iso == nullptr) { /* That could happen when ACL has been disconnected while removing data * path */ - log::warn("Invalid connection handle: {}", +conn_handle); + log::warn("Invalid connection handle: {}", conn_handle); return; } @@ -483,7 +483,7 @@ struct iso_impl { if (iso == nullptr) { /* That could happen when ACL has been disconnected while waiting on the * read respose */ - log::warn("Invalid connection handle: {}", +conn_handle); + log::warn("Invalid connection handle: {}", conn_handle); return; } @@ -636,7 +636,7 @@ struct iso_impl { log::assert_that(cig_callbacks_ != nullptr, "Invalid CIG callbacks"); - log::info("flags: {}", +cis->state_flags); + log::info("flags: {}", cis->state_flags); BTM_LogHistory( kBtmLogTag, cis_hdl_to_addr[handle], "CIS disconnected", @@ -709,7 +709,7 @@ struct iso_impl { uint16_t conn_handle; STREAM_TO_UINT16(conn_handle, data); evt.conn_handles.push_back(conn_handle); - log::info(" received BIS conn_hdl {}", +conn_handle); + log::info("received BIS conn_hdl {}", conn_handle); if (evt.status == HCI_SUCCESS) { auto bis = std::unique_ptr<iso_bis>(new iso_bis()); @@ -810,7 +810,7 @@ struct iso_impl { /* Not supported */ break; default: - log::error("Unhandled event code {}", +code); + log::error("Unhandled event code {}", code); } } diff --git a/system/stack/btm/btm_sco.cc b/system/stack/btm/btm_sco.cc index c135fff8de..3f849bd0c4 100644 --- a/system/stack/btm/btm_sco.cc +++ b/system/stack/btm/btm_sco.cc @@ -318,7 +318,7 @@ static tSCO_CONN* btm_get_active_sco() { static void btm_route_sco_data(bluetooth::hci::ScoView valid_packet) { uint16_t handle = valid_packet.GetHandle(); if (handle > HCI_HANDLE_MAX) { - log::error("Dropping SCO data with invalid handle: 0x{:X} > 0x{:X}, ", + log::error("Dropping SCO data with invalid handle: 0x{:X} > 0x{:X},", handle, HCI_HANDLE_MAX); return; } @@ -345,15 +345,15 @@ static void btm_route_sco_data(bluetooth::hci::ScoView valid_packet) { auto status = valid_packet.GetPacketStatusFlag(); if (status != bluetooth::hci::PacketStatusFlag::CORRECTLY_RECEIVED) { - log::debug("{} packet corrupted with status({})", codec.c_str(), - PacketStatusFlagText(status).c_str()); + log::debug("{} packet corrupted with status({})", codec, + PacketStatusFlagText(status)); } auto enqueue_packet = codec_type == BTM_SCO_CODEC_LC3 ? &bluetooth::audio::sco::swb::enqueue_packet : &bluetooth::audio::sco::wbs::enqueue_packet; rc = enqueue_packet( data, status != bluetooth::hci::PacketStatusFlag::CORRECTLY_RECEIVED); - if (!rc) log::debug("Failed to enqueue {} packet", codec.c_str()); + if (!rc) log::debug("Failed to enqueue {} packet", codec); while (rc) { auto decode = codec_type == BTM_SCO_CODEC_LC3 @@ -391,7 +391,7 @@ static void btm_route_sco_data(bluetooth::hci::ScoView valid_packet) { log::info( "Requested to read {} bytes of {} data but got {} bytes of PCM " "data from audio server: WriteOffset:{} ReadOffset:{}", - (unsigned long)to_read, codec.c_str(), (unsigned long)read, + (unsigned long)to_read, codec, (unsigned long)read, (unsigned long)btm_pcm_buf_write_offset, (unsigned long)btm_pcm_buf_read_offset); if (read == 0) break; @@ -403,7 +403,7 @@ static void btm_route_sco_data(bluetooth::hci::ScoView valid_packet) { * buffer to spare the buffer space when the buffer is full */ log::warn( "Buffer is full when we try to read {} packet from audio server", - codec.c_str()); + codec); log::assert_that( btm_pcm_buf_write_offset - btm_pcm_buf_read_offset >= (codec_type == BTM_SCO_CODEC_MSBC ? BTM_MSBC_CODE_SIZE @@ -428,7 +428,7 @@ static void btm_route_sco_data(bluetooth::hci::ScoView valid_packet) { log::debug( "Failed to encode {} data starting at ReadOffset:{} to " "WriteOffset:{}", - codec.c_str(), (unsigned long)btm_pcm_buf_read_offset, + codec, (unsigned long)btm_pcm_buf_read_offset, (unsigned long)btm_pcm_buf_write_offset); /* The offsets should reset some time as the buffer length should always @@ -592,8 +592,7 @@ static tBTM_STATUS btm_send_connect_request(uint16_t acl_handle, acl_handle); } } else { - log::error("Received SCO connect from unknown peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("Received SCO connect from unknown peer:{}", bd_addr); } p_setup->packet_types = temp_packet_types; @@ -681,8 +680,7 @@ tBTM_STATUS BTM_CreateSco(const RawAddress* remote_bda, bool is_orig, } acl_handle = BTM_GetHCIConnHandle(*remote_bda, BT_TRANSPORT_BR_EDR); if (acl_handle == HCI_INVALID_HANDLE) { - log::error("cannot find ACL handle for remote device {}", - ADDRESS_TO_LOGGABLE_STR(*remote_bda)); + log::error("cannot find ACL handle for remote device {}", *remote_bda); return BTM_UNKNOWN_ADDR; } } @@ -694,7 +692,7 @@ tBTM_STATUS BTM_CreateSco(const RawAddress* remote_bda, bool is_orig, (p->state == SCO_ST_PEND_UNPARK)) && (p->esco.data.bd_addr == *remote_bda)) { log::error("a sco connection is already going on for {}, at state {}", - ADDRESS_TO_LOGGABLE_STR(*remote_bda), unsigned(p->state)); + *remote_bda, unsigned(p->state)); return BTM_BUSY; } } @@ -720,16 +718,15 @@ tBTM_STATUS BTM_CreateSco(const RawAddress* remote_bda, bool is_orig, if (BTM_ReadPowerMode(*remote_bda, &state)) { if (state == BTM_PM_ST_SNIFF || state == BTM_PM_ST_PARK || state == BTM_PM_ST_PENDING) { - log::info("{} in sniff, park or pending mode {}", - ADDRESS_TO_LOGGABLE_STR(*remote_bda), unsigned(state)); + log::info("{} in sniff, park or pending mode {}", *remote_bda, + unsigned(state)); if (!BTM_SetLinkPolicyActiveMode(*remote_bda)) { log::warn("Unable to set link policy active"); } p->state = SCO_ST_PEND_UNPARK; } } else { - log::error("failed to read power mode for {}", - ADDRESS_TO_LOGGABLE_STR(*remote_bda)); + log::error("failed to read power mode for {}", *remote_bda); } } p->esco.data.bd_addr = *remote_bda; @@ -777,8 +774,7 @@ tBTM_STATUS BTM_CreateSco(const RawAddress* remote_bda, bool is_orig, if ((btm_send_connect_request(acl_handle, p_setup)) != BTM_CMD_STARTED) { - log::error("failed to send connect request for {}", - ADDRESS_TO_LOGGABLE_STR(*remote_bda)); + log::error("failed to send connect request for {}", *remote_bda); return (BTM_NO_RESOURCES); } @@ -825,14 +821,13 @@ void btm_sco_chk_pend_unpark(tHCI_STATUS hci_status, uint16_t hci_handle) { log::info( "{} unparked, sending connection request, acl_handle={}, " "hci_status={}", - ADDRESS_TO_LOGGABLE_STR(p->esco.data.bd_addr), unsigned(acl_handle), - unsigned(hci_status)); + p->esco.data.bd_addr, unsigned(acl_handle), unsigned(hci_status)); if (btm_send_connect_request(acl_handle, &p->esco.setup) == BTM_CMD_STARTED) { p->state = SCO_ST_CONNECTING; } else { log::error("failed to send connection request for {}", - ADDRESS_TO_LOGGABLE_STR(p->esco.data.bd_addr)); + p->esco.data.bd_addr); } } } @@ -888,7 +883,7 @@ void btm_sco_disc_chk_pend_for_modechange(uint16_t hci_handle) { log::debug( "Checking for SCO pending mode change events hci_handle:0x{:04x} " "p->state:{}", - hci_handle, sco_state_text(p->state).c_str()); + hci_handle, sco_state_text(p->state)); for (uint16_t xx = 0; xx < BTM_MAX_SCO_LINKS; xx++, p++) { if ((p->state == SCO_ST_PEND_MODECHANGE) && @@ -970,7 +965,7 @@ void btm_sco_conn_req(const RawAddress& bda, const DEV_CLASS& dev_class, } /* If here, no one wants the SCO connection. Reject it */ - log::warn("rejecting SCO for {}", ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::warn("rejecting SCO for {}", bda); btm_esco_conn_rsp(BTM_MAX_SCO_LINKS, HCI_ERR_HOST_REJECT_RESOURCES, bda, nullptr); } @@ -1011,8 +1006,7 @@ void btm_sco_connected(const RawAddress& bda, uint16_t hci_handle, BTM_LogHistory(kBtmLogTag, bda, "Connection success", base::StringPrintf("handle:0x%04x %s", hci_handle, (spt) ? "listener" : "initiator")); - log::debug("Connected SCO link handle:0x{:04x} peer:{}", hci_handle, - ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::debug("Connected SCO link handle:0x{:04x} peer:{}", hci_handle, bda); if (!btm_cb.sco_cb.esco_supported) { p->esco.data.link_type = BTM_LINK_TYPE_SCO; @@ -1080,7 +1074,7 @@ void btm_sco_connection_failed(tHCI_STATUS hci_status, const RawAddress& bda, /* Report the error if originator, otherwise remain in Listen mode */ if (p->is_orig) { log::debug("SCO initiating connection failed handle:0x{:04x} reason:{}", - hci_handle, hci_error_code_text(hci_status).c_str()); + hci_handle, hci_error_code_text(hci_status)); switch (hci_status) { case HCI_ERR_ROLE_SWITCH_PENDING: /* If role switch is pending, we need try again after role switch @@ -1104,7 +1098,7 @@ void btm_sco_connection_failed(tHCI_STATUS hci_status, const RawAddress& bda, } else { log::debug( "SCO terminating connection failed handle:0x{:04x} reason:{}", - hci_handle, hci_error_code_text(hci_status).c_str()); + hci_handle, hci_error_code_text(hci_status)); if (p->state == SCO_ST_CONNECTING) { p->state = SCO_ST_UNUSED; (*p->p_disc_cb)(xx); @@ -1171,7 +1165,7 @@ tBTM_STATUS BTM_RemoveSco(uint16_t sco_inx) { GetInterface().Disconnect(p->Handle(), HCI_ERR_PEER_USER); log::debug("Disconnecting link sco_handle:0x{:04x} peer:{}", p->Handle(), - ADDRESS_TO_LOGGABLE_CSTR(p->esco.data.bd_addr)); + p->esco.data.bd_addr); BTM_LogHistory( kBtmLogTag, p->esco.data.bd_addr, "Disconnecting", base::StringPrintf("local initiated handle:0x%04x previous_state:%s", @@ -1223,7 +1217,7 @@ bool btm_sco_removed(uint16_t hci_handle, tHCI_REASON reason) { p->esco.setup.transmit_coding_format.coding_format)); log::debug("Disconnected SCO link handle:{} reason:{}", hci_handle, - hci_reason_code_text(reason).c_str()); + hci_reason_code_text(reason)); return true; } } @@ -1239,13 +1233,13 @@ void btm_sco_on_disconnected(uint16_t hci_handle, tHCI_REASON reason) { if (!p_sco->is_active()) { log::info("Connection is not active handle:0x{:04x} reason:{}", hci_handle, - hci_reason_code_text(reason).c_str()); + hci_reason_code_text(reason)); return; } if (p_sco->state == SCO_ST_LISTENING) { log::info("Connection is in listening state handle:0x{:04x} reason:{}", - hci_handle, hci_reason_code_text(reason).c_str()); + hci_handle, hci_reason_code_text(reason)); return; } @@ -1257,7 +1251,7 @@ void btm_sco_on_disconnected(uint16_t hci_handle, tHCI_REASON reason) { p_sco->esco.p_esco_cback = NULL; /* Deregister eSCO callback */ (*p_sco->p_disc_cb)(btm_cb.sco_cb.get_index(p_sco)); log::debug("Disconnected SCO link handle:{} reason:{}", hci_handle, - hci_reason_code_text(reason).c_str()); + hci_reason_code_text(reason)); BTM_LogHistory(kBtmLogTag, bd_addr, "Disconnected", base::StringPrintf("handle:0x%04x reason:%s", hci_handle, hci_reason_code_text(reason).c_str())); @@ -1284,7 +1278,7 @@ void btm_sco_on_disconnected(uint16_t hci_handle, tHCI_REASON reason) { log::debug( "Stopped SCO codec:{}, num_decoded_frames:{}, " "packet_loss_ratio:{:f}", - codec.c_str(), num_decoded_frames, packet_loss_ratio); + codec, num_decoded_frames, packet_loss_ratio); } else { log::warn("Failed to get the packet loss stats"); } @@ -1488,8 +1482,7 @@ static tBTM_STATUS BTM_ChangeEScoLinkParms(uint16_t sco_inx, log::verbose("-> eSCO Link for handle 0x{:04x}", p_sco->hci_handle); log::verbose( - " txbw 0x{:x}, rxbw 0x{:x}, lat 0x{:x}, retrans 0x{:02x}, pkt " - "0x{:04x}", + "txbw 0x{:x}, rxbw 0x{:x}, lat 0x{:x}, retrans 0x{:02x}, pkt 0x{:04x}", p_setup->transmit_bandwidth, p_setup->receive_bandwidth, p_parms->max_latency_ms, p_parms->retransmission_effort, temp_packet_types); diff --git a/system/stack/btm/btm_sco_hfp_hal_linux.cc b/system/stack/btm/btm_sco_hfp_hal_linux.cc index 7dfa0ea243..0c94590878 100644 --- a/system/stack/btm/btm_sco_hfp_hal_linux.cc +++ b/system/stack/btm/btm_sco_hfp_hal_linux.cc @@ -481,12 +481,12 @@ void notify_sco_connection_change(RawAddress device, bool is_connected, log::error( "Failed to notify HAL of connection change: hci {}, device {}, " "connected {}, codec {}", - hci, ADDRESS_TO_LOGGABLE_CSTR(device), is_connected, codec); + hci, device, is_connected, codec); } else { log::info( "Notified HAL of connection change: hci {}, device {}, connected {}, " "codec {}", - hci, ADDRESS_TO_LOGGABLE_CSTR(device), is_connected, codec); + hci, device, is_connected, codec); } close(fd); diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc index 0d2f4f0adb..95e65c6eaf 100644 --- a/system/stack/btm/btm_sec.cc +++ b/system/stack/btm/btm_sec.cc @@ -301,7 +301,7 @@ bool BTM_SecRegister(const tBTM_APPL_INFO* p_cb_info) { } btm_sec_cb.api = *p_cb_info; - log::info("btm_sec_cb.api.p_le_callback = 0x{} ", + log::info("btm_sec_cb.api.p_le_callback = 0x{}", fmt::ptr(btm_sec_cb.api.p_le_callback)); log::verbose("application registered"); return (true); @@ -606,8 +606,7 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, tBT_TRANSPORT transport) { tBTM_SEC_DEV_REC* p_dev_rec; tBTM_STATUS status; - log::info("Transport used {}, bd_addr={}", transport, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("Transport used {}, bd_addr={}", transport, bd_addr); /* Other security process is in progress */ if (btm_sec_cb.pairing_state != BTM_PAIR_STATE_IDLE) { @@ -929,8 +928,7 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, log::warn( "Security Manager: BTM_SetEncryption not connected peer:{} " "transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - bt_transport_text(transport).c_str()); + bd_addr, bt_transport_text(transport)); if (p_callback) { do_in_main_thread( FROM_HERE, base::BindOnce(p_callback, std::move(owned_bd_addr), @@ -942,8 +940,7 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, log::debug( "Security Manager: BTM_SetEncryption already encrypted peer:{} " "transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - bt_transport_text(transport).c_str()); + bd_addr, bt_transport_text(transport)); if (p_callback) { do_in_main_thread(FROM_HERE, base::BindOnce(p_callback, std::move(owned_bd_addr), @@ -958,8 +955,7 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, log::warn( "Security Manager: BTM_SetEncryption not connected peer:{} " "transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - bt_transport_text(transport).c_str()); + bd_addr, bt_transport_text(transport)); if (p_callback) { do_in_main_thread( FROM_HERE, base::BindOnce(p_callback, std::move(owned_bd_addr), @@ -971,8 +967,7 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, log::debug( "Security Manager: BTM_SetEncryption already encrypted peer:{} " "transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - bt_transport_text(transport).c_str()); + bd_addr, bt_transport_text(transport)); if (p_callback) { do_in_main_thread(FROM_HERE, base::BindOnce(p_callback, std::move(owned_bd_addr), @@ -1020,7 +1015,7 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, if (enqueue) { log::warn("Security Manager: Enqueue request in state:{}", - security_state_text(p_dev_rec->sec_rec.sec_state).c_str()); + security_state_text(p_dev_rec->sec_rec.sec_state)); btm_sec_queue_encrypt_request(bd_addr, transport, p_callback, p_ref_data, sec_act); return BTM_CMD_STARTED; @@ -1079,8 +1074,7 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, default: if (p_callback) { log::debug("Executing encryption callback peer:{} transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - bt_transport_text(transport).c_str()); + bd_addr, bt_transport_text(transport)); p_dev_rec->sec_rec.p_callback = nullptr; do_in_main_thread( FROM_HERE, @@ -1143,7 +1137,7 @@ static tBTM_STATUS btm_sec_send_hci_disconnect(tBTM_SEC_DEV_REC* p_dev_rec, } log::debug("Send hci disconnect handle:0x{:04x} reason:{}", conn_handle, - hci_reason_code_text(reason).c_str()); + hci_reason_code_text(reason)); acl_disconnect_after_role_switch(conn_handle, reason, comment); return status; @@ -1171,9 +1165,8 @@ void BTM_ConfirmReqReply(tBTM_STATUS res, const RawAddress& bd_addr) { (btm_sec_cb.pairing_bda != bd_addr)) { log::warn( "Unexpected pairing confirm for {}, pairing_state: {}, pairing_bda: {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), - ADDRESS_TO_LOGGABLE_CSTR(btm_sec_cb.pairing_bda)); + bd_addr, tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), + btm_sec_cb.pairing_bda); return; } @@ -1319,7 +1312,7 @@ bool BTM_PeerSupportsSecureConnections(const RawAddress& bd_addr) { p_dev_rec = btm_find_dev(bd_addr); if (p_dev_rec == NULL) { - log::warn("unknown BDA: {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("unknown BDA: {}", bd_addr); return false; } @@ -1344,7 +1337,7 @@ bool BTM_PeerSupportsSecureConnections(const RawAddress& bd_addr) { tBT_DEVICE_TYPE BTM_GetPeerDeviceTypeFromFeatures(const RawAddress& bd_addr) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr); if (p_dev_rec == nullptr) { - log::warn("Unknown BDA:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("Unknown BDA:{}", bd_addr); } else { if (p_dev_rec->remote_supports_ble && p_dev_rec->remote_supports_bredr) { return BT_DEVICE_TYPE_DUMO; @@ -1353,8 +1346,7 @@ tBT_DEVICE_TYPE BTM_GetPeerDeviceTypeFromFeatures(const RawAddress& bd_addr) { } else if (p_dev_rec->remote_supports_ble) { return BT_DEVICE_TYPE_BLE; } else { - log::warn("Device features does not support BR/EDR and BLE:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("Device features does not support BR/EDR and BLE:{}", bd_addr); } } return BT_DEVICE_TYPE_BREDR; @@ -1456,7 +1448,7 @@ tBTM_STATUS btm_sec_l2cap_access_req_by_requirement( log::debug( "Checking l2cap access requirements peer:{} security:0x{:x} " "is_initiator:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), security_required, is_originator); + bd_addr, security_required, is_originator); tBTM_STATUS rc = BTM_SUCCESS; bool chk_acp_auth_done = false; @@ -1737,8 +1729,7 @@ tBTM_STATUS btm_sec_mx_access_request(const RawAddress& bd_addr, tBTM_STATUS rc; bool transport = false; /* should check PSM range in LE connection oriented L2CAP connection */ - log::debug("Multiplex access request device:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Multiplex access request device:{}", bd_addr); /* Find or get oldest record */ p_dev_rec = btm_find_or_alloc_dev(bd_addr); @@ -1874,8 +1865,7 @@ tBTM_STATUS btm_sec_mx_access_request(const RawAddress& bd_addr, rc = btm_sec_execute_procedure(p_dev_rec); log::debug("Started security procedure peer:{} btm_status:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->RemoteAddress()), - btm_status_text(rc).c_str()); + p_dev_rec->RemoteAddress(), btm_status_text(rc)); if (rc != BTM_CMD_STARTED) { if (p_callback) { p_dev_rec->sec_rec.p_callback = NULL; @@ -2122,8 +2112,7 @@ 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_sec_cb.pairing_flags |= BTM_PAIR_FLAGS_DISC_WHEN_DONE; - log::info("Security Manager: {}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr)); + log::info("Security Manager: {}", p_dev_rec->bd_addr); btm_sec_cb.change_pairing_state(BTM_PAIR_STATE_WAIT_PIN_REQ); @@ -2140,7 +2129,7 @@ static void call_registered_rmt_name_callbacks(const RawAddress* p_bd_addr, // TODO Still need to send status back to get SDP state machine // running log::error("Unable to issue callback with unknown address status:{}", - hci_status_code_text(status).c_str()); + hci_status_code_text(status)); return; } @@ -2210,8 +2199,7 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, "Remote read request complete for unknown device pairing_state:{} " "status:{} name:{}", tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), - hci_status_code_text(status).c_str(), - reinterpret_cast<char const*>(p_bd_name)); + hci_status_code_text(status), reinterpret_cast<char const*>(p_bd_name)); call_registered_rmt_name_callbacks(p_bd_addr, kDevClassEmpty, nullptr, status); @@ -2225,7 +2213,7 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, "name:{} sec_state:{}", tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), reinterpret_cast<char const*>(p_bd_name), - security_state_text(p_dev_rec->sec_rec.sec_state).c_str()); + security_state_text(p_dev_rec->sec_rec.sec_state)); bd_name_copy(p_dev_rec->sec_bd_name, p_bd_name); p_dev_rec->sec_rec.sec_flags |= BTM_SEC_NAME_KNOWN; @@ -2236,9 +2224,8 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, "Remote read request failed for known device pairing_state:{} " "status:{} name:{} sec_state:{}", tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), - hci_status_code_text(status).c_str(), - reinterpret_cast<char const*>(p_bd_name), - security_state_text(p_dev_rec->sec_rec.sec_state).c_str()); + hci_status_code_text(status), reinterpret_cast<char const*>(p_bd_name), + security_state_text(p_dev_rec->sec_rec.sec_state)); /* Notify all clients waiting for name to be resolved even if it failed so * clients can continue */ @@ -2411,8 +2398,7 @@ void btm_sec_rmt_host_support_feat_evt(const RawAddress bd_addr, p_dev_rec = btm_find_or_alloc_dev(bd_addr); - log::info("Got btm_sec_rmt_host_support_feat_evt from {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("Got btm_sec_rmt_host_support_feat_evt from {}", bd_addr); log::verbose("btm_sec_rmt_host_support_feat_evt sm4: 0x{:x} p[0]: 0x{:x}", p_dev_rec->sm4, features_0); @@ -2441,8 +2427,7 @@ void btm_sec_rmt_host_support_feat_evt(const RawAddress bd_addr, ******************************************************************************/ void btm_io_capabilities_req(RawAddress p) { if (btm_sec_is_a_bonded_dev(p)) { - log::warn("Incoming bond request, but {} is already bonded (removing)", - ADDRESS_TO_LOGGABLE_CSTR(p)); + log::warn("Incoming bond request, but {} is already bonded (removing)", p); bta_dm_process_remove_device(p); } @@ -2676,8 +2661,7 @@ void btm_proc_sp_req_evt(tBTM_SP_EVT event, const RawAddress bda, tBTM_SEC_DEV_REC* p_dev_rec; p_bda = bda; - log::debug("BDA:{}, event:{}, state:{}", ADDRESS_TO_LOGGABLE_CSTR(p_bda), - sp_evt_to_text(event).c_str(), + log::debug("BDA:{}, event:{}, state:{}", p_bda, sp_evt_to_text(event), tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state)); p_dev_rec = btm_find_dev(p_bda); @@ -2750,7 +2734,7 @@ void btm_proc_sp_req_evt(tBTM_SP_EVT event, const RawAddress bda, } break; default: - log::warn("unhandled event:{}", sp_evt_to_text(event).c_str()); + log::warn("unhandled event:{}", sp_evt_to_text(event)); break; } @@ -2816,7 +2800,7 @@ void btm_simple_pair_complete(const RawAddress bd_addr, uint8_t status) { p_dev_rec = btm_find_dev(bd_addr); if (p_dev_rec == NULL) { - log::error("unknown BDA: {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("unknown BDA: {}", bd_addr); return; } @@ -2878,7 +2862,7 @@ void btm_rem_oob_req(const RawAddress bd_addr) { evt_data.bd_addr = bd_addr; RawAddress& p_bda = evt_data.bd_addr; - log::verbose("BDA: {}", ADDRESS_TO_LOGGABLE_CSTR(p_bda)); + log::verbose("BDA: {}", p_bda); p_dev_rec = btm_find_dev(p_bda); if ((p_dev_rec != NULL) && btm_sec_cb.api.p_sp_callback) { evt_data.bd_addr = p_dev_rec->bd_addr; @@ -3015,8 +2999,7 @@ void btm_sec_auth_complete(uint16_t handle, tHCI_STATUS status) { "Security Manager: in state: {}, handle: {}, status: {}, " "dev->sec_rec.sec_state:{}, bda: {}, RName: {}", tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), handle, - status, p_dev_rec->sec_rec.sec_state, - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr), + status, p_dev_rec->sec_rec.sec_state, p_dev_rec->bd_addr, reinterpret_cast<char const*>(p_dev_rec->sec_bd_name)); } else { log::verbose("Security Manager: in state: {}, handle: {}, status: {}", @@ -3177,7 +3160,7 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, if ((status == HCI_ERR_LMP_ERR_TRANS_COLLISION) || (status == HCI_ERR_DIFF_TRANSACTION_COLLISION)) { log::error("Encryption collision failed status:{}", - hci_error_code_text(status).c_str()); + hci_error_code_text(status)); btm_sec_auth_collision(handle); return; } @@ -3188,7 +3171,7 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, log::warn( "Received encryption change for unknown device handle:0x{:04x} " "status:{} enable:0x{:x}", - handle, hci_status_code_text(status).c_str(), encr_enable); + handle, hci_status_code_text(status), encr_enable); return; } @@ -3198,8 +3181,7 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, log::debug( "Security Manager encryption change request hci_status:{} request:{} " "state:{} sec_flags:0x{:x}", - hci_status_code_text(status).c_str(), - (encr_enable) ? "encrypt" : "unencrypt", + hci_status_code_text(status), (encr_enable) ? "encrypt" : "unencrypt", (p_dev_rec->sec_rec.sec_state) ? "encrypted" : "unencrypted", p_dev_rec->sec_rec.sec_flags); @@ -3222,7 +3204,7 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, log::error( "Received encryption change for unknown device handle:0x{:04x} " "status:{} enable:0x{:x}", - handle, hci_status_code_text(status).c_str(), encr_enable); + handle, hci_status_code_text(status), encr_enable); } } else { log::info( @@ -3238,7 +3220,7 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, log::error( "Received encryption change for unknown device handle:0x{:04x} " "status:{} enable:0x{:x}", - handle, hci_status_code_text(status).c_str(), encr_enable); + handle, hci_status_code_text(status), encr_enable); } } } @@ -3474,27 +3456,23 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, "Connected to new device state:{} handle:0x{:04x} status:{} " "enc_mode:{} bda:{}", tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), handle, - hci_status_code_text(status).c_str(), enc_mode, - ADDRESS_TO_LOGGABLE_CSTR(bda)); + hci_status_code_text(status), enc_mode, bda); if (status == HCI_SUCCESS) { p_dev_rec = btm_sec_alloc_dev(bda); - log::debug("Allocated new device record for new connection peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::debug("Allocated new device record for new connection peer:{}", bda); } else { /* If the device matches with stored paring address * reset the paring state to idle */ if ((btm_sec_cb.pairing_state != BTM_PAIR_STATE_IDLE) && btm_sec_cb.pairing_bda == bda) { log::warn("Connection failed during bonding attempt peer:{} reason:{}", - ADDRESS_TO_LOGGABLE_CSTR(bda), - hci_error_code_text(status).c_str()); + bda, hci_error_code_text(status)); btm_sec_cb.change_pairing_state(BTM_PAIR_STATE_IDLE); } - log::debug("Ignoring failed device connection peer:{} reason:{}", - ADDRESS_TO_LOGGABLE_CSTR(bda), - hci_error_code_text(status).c_str()); + log::debug("Ignoring failed device connection peer:{} reason:{}", bda, + hci_error_code_text(status)); return; } } else { @@ -3502,8 +3480,7 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, "Connected to known device state:{} handle:0x{:04x} status:{} " "enc_mode:{} bda:{} RName:{}", tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), handle, - hci_status_code_text(status).c_str(), enc_mode, - ADDRESS_TO_LOGGABLE_CSTR(bda), + hci_status_code_text(status), enc_mode, bda, reinterpret_cast<char const*>(p_dev_rec->sec_bd_name)); bit_shift = (handle == p_dev_rec->ble_hci_handle) ? 8 : 0; @@ -3609,7 +3586,7 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, p_dev_rec->sec_rec.security_required &= ~BTM_SEC_OUT_AUTHENTICATE; p_dev_rec->sec_rec.sec_flags &= ~((BTM_SEC_LINK_KEY_KNOWN | BTM_SEC_LINK_KEY_AUTHED) << bit_shift); - log::verbose("security_required:{:x} ", + log::verbose("security_required:{:x}", p_dev_rec->sec_rec.security_required); btm_sec_cb.change_pairing_state(BTM_PAIR_STATE_IDLE); @@ -3654,7 +3631,7 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, log::debug( "device security record associated with this bda has been removed! " "bda={}, do not callback", - ADDRESS_TO_LOGGABLE_CSTR(bda)); + bda); return; } @@ -3692,8 +3669,7 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, /* Let l2cap start bond timer */ l2cu_update_lcb_4_bonding(p_dev_rec->bd_addr, true); } - log::info("Connection complete during pairing process peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::info("Connection complete during pairing process peer:{}", bda); BTM_LogHistory(kBtmLogTag, bda, "Dedicated bonding", base::StringPrintf("Initiated:%c pairing_flag:0x%02x", (is_pair_flags_we_started_dd) ? 'T' : 'F', @@ -3773,7 +3749,7 @@ void btm_sec_disconnected(uint16_t handle, tHCI_REASON reason, if ((reason != HCI_ERR_CONN_CAUSE_LOCAL_HOST) && (reason != HCI_ERR_PEER_USER) && (reason != HCI_ERR_REMOTE_POWER_OFF)) { log::warn("Got uncommon disconnection reason:{} handle:0x{:04x} comment:{}", - hci_error_code_text(reason).c_str(), handle, comment.c_str()); + hci_error_code_text(reason), handle, comment); } tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(handle); @@ -3827,11 +3803,9 @@ void btm_sec_disconnected(uint16_t handle, tHCI_REASON reason, log::debug( "Disconnection complete device:{} name:{} state:{} reason:{} " "sec_req:{:x}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr), - reinterpret_cast<char const*>(p_dev_rec->sec_bd_name), + p_dev_rec->bd_addr, reinterpret_cast<char const*>(p_dev_rec->sec_bd_name), tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), - hci_reason_code_text(reason).c_str(), - p_dev_rec->sec_rec.security_required); + hci_reason_code_text(reason), p_dev_rec->sec_rec.security_required); // TODO Should this be gated by the transport check below ? btm_ble_update_mode_operation(HCI_ROLE_UNKNOWN, &p_dev_rec->bd_addr, @@ -3867,7 +3841,7 @@ void btm_sec_disconnected(uint16_t handle, tHCI_REASON reason, */ if (is_sample_ltk(p_dev_rec->sec_rec.ble_keys.pltk)) { log::info("removing bond to device that used sample LTK: {}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr)); + p_dev_rec->bd_addr); bta_dm_remove_device(p_dev_rec->bd_addr); return; @@ -3875,7 +3849,7 @@ void btm_sec_disconnected(uint16_t handle, tHCI_REASON reason, if (p_dev_rec->sec_rec.sec_state == BTM_SEC_STATE_DISCONNECTING_BOTH) { log::debug("Waiting for other transport to disconnect current:{}", - bt_transport_text(transport).c_str()); + bt_transport_text(transport)); p_dev_rec->sec_rec.sec_state = (transport == BT_TRANSPORT_LE) ? BTM_SEC_STATE_DISCONNECTING : BTM_SEC_STATE_DISCONNECTING_BLE; @@ -3892,8 +3866,7 @@ void btm_sec_disconnected(uint16_t handle, tHCI_REASON reason, (*p_callback)(&p_dev_rec->bd_addr, transport, p_dev_rec->sec_rec.p_ref_data, BTM_ERR_PROCESSING); log::debug("Cleaned up pending security state device:{} transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr), - bt_transport_text(transport).c_str()); + p_dev_rec->bd_addr, bt_transport_text(transport)); } } @@ -3917,7 +3890,7 @@ static void read_encryption_key_size_complete_after_key_refresh( /* If remote device stop the encryption before we call "Read Encryption Key * Size", we might receive Insufficient Security, which means that link is * no longer encrypted. */ - log::info("encryption stopped on link: 0x{:x} ", handle); + log::info("encryption stopped on link: 0x{:x}", handle); return; } @@ -3965,8 +3938,7 @@ void btm_sec_link_key_notification(const RawAddress& p_bda, bool we_are_bonding = false; bool ltk_derived_lk = false; - log::debug("New link key generated device:{} key_type:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_bda), key_type); + log::debug("New link key generated device:{} key_type:{}", p_bda, key_type); if ((key_type >= BTM_LTK_DERIVED_LKEY_OFFSET + BTM_LKEY_TYPE_COMBINATION) && (key_type <= @@ -4031,8 +4003,7 @@ 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) { - log::verbose("Delayed BDA: {}, Type: {}", ADDRESS_TO_LOGGABLE_CSTR(p_bda), - key_type); + log::verbose("Delayed BDA: {}, Type: {}", p_bda, key_type); p_dev_rec->sec_rec.link_key_not_sent = true; @@ -4081,7 +4052,7 @@ void btm_sec_link_key_notification(const RawAddress& p_bda, void btm_sec_link_key_request(const RawAddress bda) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda); - log::verbose("bda: {}", ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::verbose("bda: {}", bda); if (!concurrentPeerAuthIsEnabled()) { p_dev_rec->sec_rec.sec_state = BTM_SEC_STATE_AUTHENTICATING; } @@ -4184,7 +4155,7 @@ static void btm_sec_pairing_timeout(void* /* data */) { * now it's time to tear down the ACL link*/ if (p_dev_rec == NULL) { log::error("BTM_PAIR_STATE_WAIT_DISCONNECT unknown BDA: {}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + p_cb->pairing_bda); break; } btm_sec_send_hci_disconnect( @@ -4234,8 +4205,7 @@ void btm_sec_pin_code_request(const RawAddress p_bda) { /* it may need to stretch timeouts */ l2c_pin_code_request(p_bda); - log::debug("Controller requests PIN code device:{} state:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_bda), + log::debug("Controller requests PIN code device:{} state:{}", p_bda, tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state)); RawAddress local_bd_addr = bluetooth::ToRawAddress( @@ -4407,14 +4377,13 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) { "security_required:0x{:x} security_flags:0x{:x} security_state:{}[{}]", p_dev_rec->sec_rec.security_required, p_dev_rec->sec_rec.sec_flags, security_state_text( - static_cast<tSECURITY_STATE>(p_dev_rec->sec_rec.sec_state)) - .c_str(), + static_cast<tSECURITY_STATE>(p_dev_rec->sec_rec.sec_state)), p_dev_rec->sec_rec.sec_state); if (p_dev_rec->sec_rec.sec_state != BTM_SEC_STATE_IDLE && p_dev_rec->sec_rec.sec_state != BTM_SEC_STATE_LE_ENCRYPTING) { log::info("No immediate action taken in busy state: {}", - security_state_text(p_dev_rec->sec_rec.sec_state).c_str()); + security_state_text(p_dev_rec->sec_rec.sec_state)); return (BTM_CMD_STARTED); } @@ -4776,7 +4745,7 @@ void btm_sec_dev_rec_cback_event(tBTM_SEC_DEV_REC* p_dev_rec, tBTM_STATUS btm_status, bool is_le_transport) { log::assert_that(p_dev_rec != nullptr, "assert failed: p_dev_rec != nullptr"); log::debug("transport={}, btm_status={}", is_le_transport ? "le" : "classic", - btm_status_text(btm_status).c_str()); + btm_status_text(btm_status)); tBTM_SEC_CALLBACK* p_callback = p_dev_rec->sec_rec.p_callback; p_dev_rec->sec_rec.p_callback = NULL; @@ -5050,7 +5019,7 @@ void btm_sec_set_peer_sec_caps(uint16_t hci_handle, bool ssp_supported, tBTM_STATUS btm_status = btm_sec_execute_procedure(p_dev_rec); if (btm_status != BTM_CMD_STARTED) { log::warn("Security procedure not started! status:{}", - btm_status_text(btm_status).c_str()); + btm_status_text(btm_status)); btm_sec_dev_rec_cback_event(p_dev_rec, btm_status, false); } } diff --git a/system/stack/btm/btm_sec_cb.cc b/system/stack/btm/btm_sec_cb.cc index 1dfbfd94d4..eab48e9430 100644 --- a/system/stack/btm/btm_sec_cb.cc +++ b/system/stack/btm/btm_sec_cb.cc @@ -135,11 +135,11 @@ bool tBTM_SEC_CB::IsDeviceEncrypted(const RawAddress bd_addr, } else if (transport == BT_TRANSPORT_LE) { return sec_rec->is_le_device_encrypted(); } - log::error("unknown transport:{}", bt_transport_text(transport).c_str()); + log::error("unknown transport:{}", bt_transport_text(transport)); return false; } - log::error("unknown device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("unknown device:{}", bd_addr); return false; } @@ -152,11 +152,11 @@ bool tBTM_SEC_CB::IsLinkKeyAuthenticated(const RawAddress bd_addr, } else if (transport == BT_TRANSPORT_LE) { return sec_rec->is_le_link_key_authenticated(); } - log::error("unknown transport:{}", bt_transport_text(transport).c_str()); + log::error("unknown transport:{}", bt_transport_text(transport)); return false; } - log::error("unknown device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("unknown device:{}", bd_addr); return false; } @@ -169,11 +169,11 @@ bool tBTM_SEC_CB::IsDeviceAuthenticated(const RawAddress bd_addr, } else if (transport == BT_TRANSPORT_LE) { return sec_rec->is_le_device_authenticated(); } - log::error("unknown transport:{}", bt_transport_text(transport).c_str()); + log::error("unknown transport:{}", bt_transport_text(transport)); return false; } - log::error("unknown device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("unknown device:{}", bd_addr); return false; } @@ -186,11 +186,11 @@ bool tBTM_SEC_CB::IsLinkKeyKnown(const RawAddress bd_addr, } else if (transport == BT_TRANSPORT_LE) { return sec_rec->is_le_link_key_known(); } - log::error("unknown transport:{}", bt_transport_text(transport).c_str()); + log::error("unknown transport:{}", bt_transport_text(transport)); return false; } - log::error("unknown device:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::error("unknown device:{}", bd_addr); return false; } @@ -203,8 +203,8 @@ bool tBTM_SEC_CB::IsDeviceBonded(const RawAddress bd_addr) { p_dev_rec->sec_rec.is_link_key_known())) { is_bonded = true; } - log::debug("Device record bonded check peer:{} is_bonded:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), is_bonded); + log::debug("Device record bonded check peer:{} is_bonded:{}", bd_addr, + is_bonded); return is_bonded; } @@ -351,7 +351,7 @@ uint8_t tBTM_SEC_CB::RemoveServiceByPsm(uint16_t psm) { for (i = 0; i < BTM_SEC_MAX_SERVICE_RECORDS; i++, p_srec++) { /* Delete services with specified name (if in use and not SDP) */ if ((p_srec->security_flags & BTM_SEC_IN_USE) && (p_srec->psm == psm)) { - log::verbose("BTM_SEC_CLR[{}]: id {} ", i, p_srec->service_id); + log::verbose("BTM_SEC_CLR[{}]: id {}", i, p_srec->service_id); p_srec->security_flags = 0; num_freed++; } diff --git a/system/stack/btm/security_event_parser.cc b/system/stack/btm/security_event_parser.cc index 65ca4d9936..3e0dc4ab95 100644 --- a/system/stack/btm/security_event_parser.cc +++ b/system/stack/btm/security_event_parser.cc @@ -98,7 +98,7 @@ static void parse_central_link_key_complete(const EventView event) { "assert failed: event_opt.has_value()"); auto complete = event_opt.value(); - log::info("Unhandled event: {}", EventCodeText(event.GetEventCode()).c_str()); + log::info("Unhandled event: {}", EventCodeText(event.GetEventCode())); } static void parse_return_link_keys(const EventView event) { auto event_opt = ReturnLinkKeysView::CreateOptional(event); @@ -106,7 +106,7 @@ static void parse_return_link_keys(const EventView event) { "assert failed: event_opt.has_value()"); auto view = event_opt.value(); - log::info("Unhandled event: {}", EventCodeText(event.GetEventCode()).c_str()); + log::info("Unhandled event: {}", EventCodeText(event.GetEventCode())); } static void parse_pin_code_request(const EventView event) { auto event_opt = PinCodeRequestView::CreateOptional(event); @@ -210,7 +210,7 @@ static void parse_keypress_notification(const EventView event) { "assert failed: event_opt.has_value()"); auto notification = event_opt.value(); - log::info("Unhandled event: {}", EventCodeText(event.GetEventCode()).c_str()); + log::info("Unhandled event: {}", EventCodeText(event.GetEventCode())); log_address(notification.GetBdAddr(), event.GetEventCode()); } static void parse_user_confirmation_request(const EventView event) { @@ -289,8 +289,7 @@ void SecurityEventParser::OnSecurityEvent(bluetooth::hci::EventView event) { parse_user_passkey_request(event); break; default: - log::error("Unhandled event {}", - EventCodeText(event.GetEventCode()).c_str()); + log::error("Unhandled event {}", EventCodeText(event.GetEventCode())); } } } // namespace bluetooth::stack::btm diff --git a/system/stack/eatt/eatt_impl.h b/system/stack/eatt/eatt_impl.h index 241625e866..2dcf242b22 100644 --- a/system/stack/eatt/eatt_impl.h +++ b/system/stack/eatt/eatt_impl.h @@ -116,7 +116,7 @@ struct eatt_impl { auto channel = eatt_dev->eatt_channels[lcid]; if (!channel->cl_cmd_q_.empty()) { log::warn("Channel {:c}, for device {} is not empty on disconnection.", - lcid, ADDRESS_TO_LOGGABLE_STR(channel->bda_)); + lcid, channel->bda_); channel->cl_cmd_q_.clear(); } @@ -145,8 +145,7 @@ struct eatt_impl { * for LE case it is not necessary to read it before establish connection. * Therefore assume, device supports EATT since we got request to create * EATT channels. Just create device here. */ - log::info("Adding device: {} on incoming EATT creation request", - ADDRESS_TO_LOGGABLE_STR(bda)); + log::info("Adding device: {} on incoming EATT creation request", bda); eatt_dev = add_eatt_device(bda); } @@ -193,8 +192,7 @@ struct eatt_impl { eatt_device* eatt_dev = find_device_by_address(bda); auto num_of_sdu = stack_config_get_interface()->get_pts_l2cap_ecoc_send_num_of_sdu(); - log::info("device {}, num: {}", ADDRESS_TO_LOGGABLE_CSTR(eatt_dev->bda_), - num_of_sdu); + log::info("device {}, num: {}", eatt_dev->bda_, num_of_sdu); if (num_of_sdu <= 0) { return; @@ -233,7 +231,7 @@ struct eatt_impl { /* This is for the L2CAP ECoC Testing. */ void upper_tester_delay_connect_cb(const RawAddress& bda) { - log::info("device {}", ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::info("device {}", bda); eatt_device* eatt_dev = find_device_by_address(bda); if (eatt_dev == nullptr) { log::error("device is not available"); @@ -266,7 +264,7 @@ struct eatt_impl { if (key_size < min_key_size) { std::vector<uint16_t> empty; log::error("Insufficient key size ({}<{}) for device {}", key_size, - min_key_size, ADDRESS_TO_LOGGABLE_CSTR(bda)); + min_key_size, bda); L2CA_ConnectCreditBasedRsp(bda, identifier, empty, L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP_KEY_SIZE, nullptr); @@ -303,9 +301,8 @@ struct eatt_impl { void eatt_l2cap_connect_ind(const RawAddress& bda, std::vector<uint16_t>& lcids, uint16_t psm, uint16_t peer_mtu, uint8_t identifier) { - log::info("Device {}, num of cids: {}, psm 0x{:04x}, peer_mtu {}", - ADDRESS_TO_LOGGABLE_CSTR(bda), static_cast<int>(lcids.size()), - psm, peer_mtu); + log::info("Device {}, num of cids: {}, psm 0x{:04x}, peer_mtu {}", bda, + static_cast<int>(lcids.size()), psm, peer_mtu); if (!stack_config_get_interface() ->get_pts_connect_eatt_before_encryption() && @@ -316,8 +313,7 @@ struct eatt_impl { if (BTM_IsLinkKeyKnown(bda, BT_TRANSPORT_LE)) { result = L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP; } - log::error("ACL to device {} is unencrypted.", - ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::error("ACL to device {} is unencrypted.", bda); L2CA_ConnectCreditBasedRsp(bda, identifier, empty, result, nullptr); return; } @@ -347,7 +343,7 @@ struct eatt_impl { uint8_t role = L2CA_GetBleConnRole(eatt_dev->bda_); if (role == HCI_ROLE_CENTRAL) { log::info("Retrying EATT setup due to previous collision for device {}", - ADDRESS_TO_LOGGABLE_CSTR(eatt_dev->bda_)); + eatt_dev->bda_); connect_eatt_wrap(eatt_dev); } else if (stack_config_get_interface() ->get_pts_eatt_peripheral_collision_support()) { @@ -360,8 +356,7 @@ struct eatt_impl { /* This is for the L2CAP ECoC Testing. */ void upper_tester_l2cap_connect_cfm(eatt_device* eatt_dev) { - log::info("Upper tester for L2CAP Ecoc {}", - ADDRESS_TO_LOGGABLE_CSTR(eatt_dev->bda_)); + log::info("Upper tester for L2CAP Ecoc {}", eatt_dev->bda_); if (is_channel_connection_pending(eatt_dev)) { log::info("Waiting for all channels to be connected"); return; @@ -381,8 +376,8 @@ struct eatt_impl { void eatt_l2cap_connect_cfm(const RawAddress& bda, uint16_t lcid, uint16_t peer_mtu, uint16_t result) { - log::info("bda: {} cid: {}peer mtu: {} result {}", - ADDRESS_TO_LOGGABLE_STR(bda), +lcid, +peer_mtu, +result); + log::info("bda: {} cid: {}peer mtu: {} result {}", bda, lcid, peer_mtu, + result); eatt_device* eatt_dev = find_device_by_address(bda); if (!eatt_dev) { @@ -460,8 +455,7 @@ struct eatt_impl { void eatt_l2cap_collision_ind(const RawAddress& bda) { eatt_device* eatt_dev = find_device_by_address(bda); if (!eatt_dev) { - log::error("Device {} not available anymore:", - ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::error("Device {} not available anymore:", bda); return; } /* Remote wanted to setup channels as well. Let's retry remote's request @@ -576,8 +570,8 @@ struct eatt_impl { .number_of_channels = num_of_channels, }; - log::info("Connecting device {}, cnt count {}", - ADDRESS_TO_LOGGABLE_CSTR(eatt_dev->bda_), num_of_channels); + log::info("Connecting device {}, cnt count {}", eatt_dev->bda_, + num_of_channels); /* Warning! CIDs in Android are unique across the ACL connections */ std::vector<uint16_t> connecting_cids = @@ -589,10 +583,10 @@ struct eatt_impl { } log::info("Successfully sent CoC request, number of channel: {}", - +connecting_cids.size()); + connecting_cids.size()); for (uint16_t cid : connecting_cids) { - log::info(" \t cid: {}", loghex(cid)); + log::info("\t cid: {}", loghex(cid)); auto chan = std::make_shared<EattChannel>(eatt_dev->bda_, cid, 0, eatt_dev->rx_mtu_); @@ -747,8 +741,7 @@ struct eatt_impl { void start_indication_confirm_timer(const RawAddress& bd_addr, uint16_t cid) { EattChannel* channel = find_eatt_channel_by_cid(bd_addr, cid); if (!channel) { - log::error("Unknown cid: {} or device {}", loghex(cid), - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::error("Unknown cid: {} or device {}", loghex(cid), bd_addr); return; } @@ -760,8 +753,7 @@ struct eatt_impl { void stop_indication_confirm_timer(const RawAddress& bd_addr, uint16_t cid) { EattChannel* channel = find_eatt_channel_by_cid(bd_addr, cid); if (!channel) { - log::error("Unknown cid: {} or device {}", loghex(cid), - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::error("Unknown cid: {} or device {}", loghex(cid), bd_addr); return; } @@ -771,8 +763,7 @@ struct eatt_impl { void start_app_indication_timer(const RawAddress& bd_addr, uint16_t cid) { EattChannel* channel = find_eatt_channel_by_cid(bd_addr, cid); if (!channel) { - log::error("Unknown cid: {} or device {}", loghex(cid), - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::error("Unknown cid: {} or device {}", loghex(cid), bd_addr); return; } @@ -783,8 +774,7 @@ struct eatt_impl { void stop_app_indication_timer(const RawAddress& bd_addr, uint16_t cid) { EattChannel* channel = find_eatt_channel_by_cid(bd_addr, cid); if (!channel) { - log::error("Unknown cid: {} or device {}", loghex(cid), - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::error("Unknown cid: {} or device {}", loghex(cid), bd_addr); return; } @@ -794,14 +784,13 @@ struct eatt_impl { void reconfigure(const RawAddress& bd_addr, uint16_t cid, uint16_t new_mtu) { eatt_device* eatt_dev = find_device_by_address(bd_addr); if (!eatt_dev) { - log::error("Unknown device {}", ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::error("Unknown device {}", bd_addr); return; } EattChannel* channel = find_eatt_channel_by_cid(bd_addr, cid); if (!channel) { - log::error("Unknown cid: {} or device {}", loghex(cid), - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::error("Unknown cid: {} or device {}", loghex(cid), bd_addr); return; } @@ -816,7 +805,7 @@ struct eatt_impl { if (!L2CA_ReconfigCreditBasedConnsReq(eatt_dev->bda_, cids, &cfg)) { log::error("Could not start reconfig cid: {} or device {}", loghex(cid), - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + bd_addr); return; } @@ -824,17 +813,16 @@ struct eatt_impl { } void reconfigure_all(const RawAddress& bd_addr, uint16_t new_mtu) { - log::info("Device {}, new mtu {}", ADDRESS_TO_LOGGABLE_STR(bd_addr), - new_mtu); + log::info("Device {}, new mtu {}", bd_addr, new_mtu); eatt_device* eatt_dev = find_device_by_address(bd_addr); if (!eatt_dev) { - log::error("Unknown device {}", ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::error("Unknown device {}", bd_addr); return; } uint8_t num_of_channels = eatt_dev->eatt_channels.size(); if (num_of_channels == 0) { - log::error("No channels for device {}", ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::error("No channels for device {}", bd_addr); return; } @@ -855,8 +843,7 @@ struct eatt_impl { tL2CAP_LE_CFG_INFO cfg = {.mtu = new_mtu, .mps = eatt_dev->rx_mps_}; if (!L2CA_ReconfigCreditBasedConnsReq(eatt_dev->bda_, cids, &cfg)) { - log::error("Could not start reconfig for device {}", - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::error("Could not start reconfig for device {}", bd_addr); return; } @@ -870,21 +857,19 @@ struct eatt_impl { uint8_t features) { bool is_eatt_supported = features & BLE_GATT_SVR_SUP_FEAT_EATT_BITMASK; - log::info("{} is_eatt_supported = {}", ADDRESS_TO_LOGGABLE_STR(bd_addr), - int(is_eatt_supported)); + log::info("{} is_eatt_supported = {}", bd_addr, int(is_eatt_supported)); if (!is_eatt_supported) return; eatt_device* eatt_dev = this->find_device_by_address(bd_addr); if (!eatt_dev) { - log::info("Adding device: {} on supported features callback.", - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::info("Adding device: {} on supported features callback.", bd_addr); eatt_dev = add_eatt_device(bd_addr); } if (role != HCI_ROLE_CENTRAL) { /* TODO For now do nothing, we could run a timer here and start EATT if * not started by central */ - log::info(" EATT Should be connected by the central. Let's wait for it."); + log::info("EATT Should be connected by the central. Let's wait for it."); return; } @@ -894,8 +879,7 @@ struct eatt_impl { void disconnect_channel(uint16_t cid) { L2CA_DisconnectReq(cid); } void disconnect(const RawAddress& bd_addr, uint16_t cid) { - log::info("Device: {}, cid: 0x{:04x}", ADDRESS_TO_LOGGABLE_STR(bd_addr), - cid); + log::info("Device: {}, cid: 0x{:04x}", bd_addr, cid); eatt_device* eatt_dev = find_device_by_address(bd_addr); if (!eatt_dev) { @@ -913,8 +897,7 @@ struct eatt_impl { if (cid != EATT_ALL_CIDS) { auto chan = find_channel_by_cid(cid); if (!chan) { - log::warn("Cid {} not found for device {}", cid, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("Cid {} not found for device {}", cid, bd_addr); return; } log::info("Disconnecting cid {}", cid); @@ -940,8 +923,8 @@ struct eatt_impl { void upper_tester_connect(const RawAddress& bd_addr, eatt_device* eatt_dev, uint8_t role) { log::info( - "L2CAP Upper tester enabled, {} ({}), role: {}({})", - ADDRESS_TO_LOGGABLE_STR(bd_addr), fmt::ptr(eatt_dev), + "L2CAP Upper tester enabled, {} ({}), role: {}({})", bd_addr, + fmt::ptr(eatt_dev), role == HCI_ROLE_CENTRAL ? "HCI_ROLE_CENTRAL" : "HCI_ROLE_PERIPHERAL", role); @@ -971,8 +954,7 @@ struct eatt_impl { bd_addr, base::BindOnce(&eatt_impl::supported_features_cb, weak_factory_.GetWeakPtr(), role)) == false) { - log::info("Read server supported features failed for device {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("Read server supported features failed for device {}", bd_addr); } } @@ -981,8 +963,7 @@ struct eatt_impl { uint8_t role = L2CA_GetBleConnRole(bd_addr); if (role == HCI_ROLE_UNKNOWN) { - log::error("Could not get device role{}", - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::error("Could not get device role{}", bd_addr); return; } @@ -991,7 +972,7 @@ struct eatt_impl { return; } - log::info("Device {}, role {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), + log::info("Device {}, role {}", bd_addr, (role == HCI_ROLE_CENTRAL ? "central" : "peripheral")); if (eatt_dev) { @@ -1002,7 +983,7 @@ struct eatt_impl { if (role != HCI_ROLE_CENTRAL) { log::info( - " EATT Should be connected by the central. Let's wait for it."); + "EATT Should be connected by the central. Let's wait for it."); return; } @@ -1013,8 +994,7 @@ struct eatt_impl { if (role != HCI_ROLE_CENTRAL) return; if (gatt_profile_get_eatt_support(bd_addr)) { - log::debug("Eatt is supported for device {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Eatt is supported for device {}", bd_addr); supported_features_cb(role, bd_addr, BLE_GATT_SVR_SUP_FEAT_EATT_BITMASK); return; } @@ -1024,15 +1004,14 @@ struct eatt_impl { bd_addr, base::BindOnce(&eatt_impl::supported_features_cb, weak_factory_.GetWeakPtr(), role)) == false) { - log::info("Read server supported features failed for device {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("Read server supported features failed for device {}", bd_addr); } } void add_from_storage(const RawAddress& bd_addr) { eatt_device* eatt_dev = find_device_by_address(bd_addr); - log::info("restoring: {}", ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::info("restoring: {}", bd_addr); if (!eatt_dev) add_eatt_device(bd_addr); } diff --git a/system/stack/gap/gap_ble.cc b/system/stack/gap/gap_ble.cc index 4e99d5d4bd..2485661641 100644 --- a/system/stack/gap/gap_ble.cc +++ b/system/stack/gap/gap_ble.cc @@ -225,7 +225,7 @@ void server_attr_request_cback(uint16_t conn_id, uint32_t trans_id, break; case GATTS_REQ_TYPE_MTU: - log::verbose("Get MTU exchange new mtu size: {}", +p_data->mtu); + log::verbose("Get MTU exchange new mtu size: {}", p_data->mtu); ignore = true; break; @@ -293,8 +293,7 @@ void client_connect_cback(tGATT_IF, const RawAddress& bda, uint16_t conn_id, tBT_TRANSPORT) { tGAP_CLCB* p_clcb = find_clcb_by_bd_addr(bda); if (p_clcb == NULL) { - log::info("No active GAP service found for peer:{} callback:{}", - ADDRESS_TO_LOGGABLE_CSTR(bda), + log::info("No active GAP service found for peer:{} callback:{}", bda, (connected) ? "Connected" : "Disconnected"); return; } diff --git a/system/stack/gatt/att_protocol.cc b/system/stack/gatt/att_protocol.cc index 251ac43aac..d09fc2c956 100644 --- a/system/stack/gatt/att_protocol.cc +++ b/system/stack/gatt/att_protocol.cc @@ -401,7 +401,7 @@ BT_HDR* attp_build_sr_msg(tGATT_TCB& tcb, uint8_t op_code, tGATT_SR_MSG* p_msg, if (payload_size == 0) { log::error( "Cannot send response (op: 0x{:02x}) due to payload size = 0, {}", - op_code, ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda)); + op_code, tcb.peer_bda); return nullptr; } @@ -435,7 +435,7 @@ BT_HDR* attp_build_sr_msg(tGATT_TCB& tcb, uint8_t op_code, tGATT_SR_MSG* p_msg, return attp_build_mtu_cmd(op_code, p_msg->mtu); default: - log::fatal("attp_build_sr_msg: unknown op code = {}", +op_code); + log::fatal("attp_build_sr_msg: unknown op code = {}", op_code); return nullptr; } } @@ -489,8 +489,8 @@ static tGATT_STATUS attp_cl_send_cmd(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, return GATT_CMD_STARTED; } - log::error("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), p_clcb->cid); + log::error("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, + p_clcb->cid); return GATT_INTERNAL_ERROR; } @@ -515,7 +515,7 @@ static tGATT_STATUS attp_cl_send_cmd(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, if (!gatt_cmd_enq(tcb, p_clcb, false, cmd_code, NULL)) { log::error( "Could not queue sent request. {}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), p_clcb->cid); + tcb.peer_bda, p_clcb->cid); return GATT_INTERNAL_ERROR; } @@ -580,7 +580,7 @@ tGATT_STATUS attp_send_cl_msg(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint16_t payload_size = gatt_tcb_get_payload_size(tcb, p_clcb->cid); if (payload_size == 0) { log::error("Cannot send request (op: 0x{:02x}) due to payload size = 0, {}", - op_code, ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda)); + op_code, tcb.peer_bda); return GATT_NO_RESOURCES; } diff --git a/system/stack/gatt/connection_manager.cc b/system/stack/gatt/connection_manager.cc index dc98318d7f..31c726fa8c 100644 --- a/system/stack/gatt/connection_manager.cc +++ b/system/stack/gatt/connection_manager.cc @@ -114,7 +114,7 @@ bool is_anyone_connecting( /** background connection device from the list. Returns pointer to the device * record, or nullptr if not found */ std::set<tAPP_ID> get_apps_connecting_to(const RawAddress& address) { - log::debug("address={}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("address={}", address); auto it = bgconn_dev.find(address); return (it != bgconn_dev.end()) ? it->second.doing_bg_conn : std::set<tAPP_ID>(); @@ -166,22 +166,19 @@ static void target_announcement_observe_results_cb(tBTM_INQ_RESULTS* p_inq, } if (!IsTargetedAnnouncement(p_eir, eir_len)) { - log::debug("Not a targeted announcement for device {}", - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::debug("Not a targeted announcement for device {}", addr); return; } - log::info("Found targeted announcement for device {}", - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::info("Found targeted announcement for device {}", addr); if (it->second.is_in_accept_list) { - log::info("Device {} is already connecting", - ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::info("Device {} is already connecting", addr); return; } if (BTM_GetHCIConnHandle(addr, BT_TRANSPORT_LE) != 0xFFFF) { - log::debug("Device {} already connected", ADDRESS_TO_LOGGABLE_CSTR(addr)); + log::debug("Device {} already connected", addr); return; } @@ -214,8 +211,7 @@ void target_announcements_filtering_set(bool enable) { */ bool background_connect_targeted_announcement_add(tAPP_ID app_id, const RawAddress& address) { - log::info("app_id={}, address={}", static_cast<int>(app_id), - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("app_id={}, address={}", static_cast<int>(app_id), address); bool disable_accept_list = false; @@ -226,7 +222,7 @@ bool background_connect_targeted_announcement_add(tAPP_ID app_id, log::info( "app_id={}, already doing targeted announcement filtering to " "address={}", - static_cast<int>(app_id), ADDRESS_TO_LOGGABLE_CSTR(address)); + static_cast<int>(app_id), address); return true; } @@ -236,7 +232,7 @@ bool background_connect_targeted_announcement_add(tAPP_ID app_id, // Check if connecting if (!it->second.doing_direct_conn.empty()) { log::info("app_id={}, address={}, already in direct connection", - static_cast<int>(app_id), ADDRESS_TO_LOGGABLE_CSTR(address)); + static_cast<int>(app_id), address); } else if (!targeted_filtering_enabled && !it->second.doing_bg_conn.empty()) { @@ -244,7 +240,7 @@ bool background_connect_targeted_announcement_add(tAPP_ID app_id, log::info( "already doing background connection to address={}. Need to disable " "it.", - ADDRESS_TO_LOGGABLE_CSTR(address)); + address); disable_accept_list = true; } } @@ -269,8 +265,7 @@ bool background_connect_targeted_announcement_add(tAPP_ID app_id, /** Add a device from the background connection list. Returns true if device * added to the list, or already in list, false otherwise */ bool background_connect_add(uint8_t app_id, const RawAddress& address) { - log::debug("app_id={}, address={}", static_cast<int>(app_id), - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("app_id={}, address={}", static_cast<int>(app_id), address); auto it = bgconn_dev.find(address); bool in_acceptlist = false; bool is_targeted_announcement_enabled = false; @@ -278,14 +273,14 @@ bool background_connect_add(uint8_t app_id, const RawAddress& address) { // device already in the acceptlist, just add interested app to the list if (it->second.doing_bg_conn.count(app_id)) { log::debug("app_id={}, already doing background connection to address={}", - static_cast<int>(app_id), ADDRESS_TO_LOGGABLE_CSTR(address)); + static_cast<int>(app_id), address); return true; } // Already in acceptlist ? if (it->second.is_in_accept_list) { log::debug("app_id={}, address={}, already in accept list", - static_cast<int>(app_id), ADDRESS_TO_LOGGABLE_CSTR(address)); + static_cast<int>(app_id), address); in_acceptlist = true; } else { is_targeted_announcement_enabled = @@ -299,8 +294,8 @@ bool background_connect_add(uint8_t app_id, const RawAddress& address) { log::debug("Targeted announcement enabled, do not add to AcceptList"); } else { if (!BTM_AcceptlistAdd(address)) { - log::warn("Failed to add device {} to accept list for app {}", - ADDRESS_TO_LOGGABLE_CSTR(address), static_cast<int>(app_id)); + log::warn("Failed to add device {} to accept list for app {}", address, + static_cast<int>(app_id)); return false; } bgconn_dev[address].is_in_accept_list = true; @@ -316,10 +311,10 @@ bool background_connect_add(uint8_t app_id, const RawAddress& address) { /** Removes all registrations for connection for given device. * Returns true if anything was removed, false otherwise */ bool remove_unconditional(const RawAddress& address) { - log::debug("address={}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("address={}", address); auto it = bgconn_dev.find(address); if (it == bgconn_dev.end()) { - log::warn("address {} is not found", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("address {} is not found", address); return false; } @@ -332,11 +327,10 @@ bool remove_unconditional(const RawAddress& address) { * advertising list. Returns true if device was on the list and was * successfully removed */ bool background_connect_remove(uint8_t app_id, const RawAddress& address) { - log::debug("app_id={}, address={}", static_cast<int>(app_id), - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("app_id={}, address={}", static_cast<int>(app_id), address); auto it = bgconn_dev.find(address); if (it == bgconn_dev.end()) { - log::warn("address {} is not found", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("address {} is not found", address); return false; } @@ -349,7 +343,7 @@ bool background_connect_remove(uint8_t app_id, const RawAddress& address) { (it->second.doing_targeted_announcements_conn.erase(app_id) > 0); if (!removed_from_bg_conn && !removed_from_ta) { log::warn("Failed to remove background connection app {} for address {}", - static_cast<int>(app_id), ADDRESS_TO_LOGGABLE_CSTR(address)); + static_cast<int>(app_id), address); return false; } @@ -360,7 +354,7 @@ bool background_connect_remove(uint8_t app_id, const RawAddress& address) { if (is_anyone_connecting(it)) { log::debug("some device is still connecting, app_id={}, address={}", - static_cast<int>(app_id), ADDRESS_TO_LOGGABLE_CSTR(address)); + static_cast<int>(app_id), address); /* Check which method should be used now.*/ if (!accept_list_enabled) { /* Accept list was not used */ @@ -421,7 +415,7 @@ void on_app_deregistered(uint8_t app_id) { static void remove_all_clients_with_pending_connections( const RawAddress& address) { - log::debug("address={}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("address={}", address); auto it = bgconn_dev.find(address); while (it != bgconn_dev.end() && !it->second.doing_direct_conn.empty()) { uint8_t app_id = it->second.doing_direct_conn.begin()->first; @@ -431,14 +425,13 @@ static void remove_all_clients_with_pending_connections( } void on_connection_complete(const RawAddress& address) { - log::info("Le connection completed to device:{}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Le connection completed to device:{}", address); remove_all_clients_with_pending_connections(address); } void on_connection_timed_out_from_shim(const RawAddress& address) { - log::info("Connection failed {}", ADDRESS_TO_LOGGABLE_CSTR(address)); + log::info("Connection failed {}", address); on_connection_timed_out(0x00, address); } @@ -453,8 +446,7 @@ void reset(bool after_reset) { } void wl_direct_connect_timeout_cb(uint8_t app_id, const RawAddress& address) { - log::debug("app_id={}, address={}", static_cast<int>(app_id), - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("app_id={}, address={}", static_cast<int>(app_id), address); on_connection_timed_out(app_id, address); // TODO: this would free the timer, from within the timer callback, which is @@ -465,8 +457,7 @@ void wl_direct_connect_timeout_cb(uint8_t app_id, const RawAddress& address) { /** Add a device to the direct connection list. Returns true if device * added to the list, false otherwise */ bool direct_connect_add(uint8_t app_id, const RawAddress& address) { - log::debug("app_id={}, address={}", static_cast<int>(app_id), - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("app_id={}, address={}", static_cast<int>(app_id), address); bool in_acceptlist = false; auto it = bgconn_dev.find(address); if (it != bgconn_dev.end()) { @@ -513,19 +504,17 @@ static void schedule_direct_connect_add(uint8_t app_id, bool direct_connect_remove(uint8_t app_id, const RawAddress& address, bool connection_timeout) { - log::debug("app_id={}, address={}", static_cast<int>(app_id), - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::debug("app_id={}, address={}", static_cast<int>(app_id), address); auto it = bgconn_dev.find(address); if (it == bgconn_dev.end()) { log::warn("Unable to find background connection to remove peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + address); return false; } auto app_it = it->second.doing_direct_conn.find(app_id); if (app_it == it->second.doing_direct_conn.end()) { - log::warn("Unable to find direct connection to remove peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(address)); + log::warn("Unable to find direct connection to remove peer:{}", address); return false; } @@ -546,7 +535,7 @@ bool direct_connect_remove(uint8_t app_id, const RawAddress& address, log::warn( "Failed to re-add device {} to accept list after connection " "timeout", - ADDRESS_TO_LOGGABLE_CSTR(address)); + address); } } return true; diff --git a/system/stack/gatt/gatt_api.cc b/system/stack/gatt/gatt_api.cc index 4dd8933313..12f6cdd34e 100644 --- a/system/stack/gatt/gatt_api.cc +++ b/system/stack/gatt/gatt_api.cc @@ -655,7 +655,7 @@ tGATT_STATUS GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id, tGATT_SR_CMD* sr_res_p = gatt_sr_get_cmd_by_trans_id(p_tcb, trans_id); if (!sr_res_p) { - log::error("conn_id={} waiting for other op_code ", loghex(conn_id)); + log::error("conn_id={} waiting for other op_code", loghex(conn_id)); return (GATT_WRONG_STATE); } @@ -766,19 +766,17 @@ tGATTC_TryMtuRequestResult GATTC_TryMtuRequest(const RawAddress& remote_bda, tBT_TRANSPORT transport, uint16_t conn_id, uint16_t* current_mtu) { - log::info("{} conn_id=0x{:04x}", ADDRESS_TO_LOGGABLE_STR(remote_bda), conn_id); + log::info("{} conn_id=0x{:04x}", remote_bda, conn_id); *current_mtu = GATT_DEF_BLE_MTU_SIZE; if (transport == BT_TRANSPORT_BR_EDR) { - log::error("Device {} connected over BR/EDR", - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + log::error("Device {} connected over BR/EDR", remote_bda); return MTU_EXCHANGE_NOT_ALLOWED; } tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(remote_bda, transport); if (!p_tcb) { - log::error("Device {} is not connected ", - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + log::error("Device {} is not connected", remote_bda); return MTU_EXCHANGE_DEVICE_DISCONNECTED; } @@ -793,8 +791,7 @@ tGATTC_TryMtuRequestResult GATTC_TryMtuRequest(const RawAddress& remote_bda, uint16_t mtu = gatt_get_mtu(remote_bda, transport); if (mtu == GATT_DEF_BLE_MTU_SIZE || mtu == 0) { - log::debug("MTU not yet updated for {}", - ADDRESS_TO_LOGGABLE_CSTR(remote_bda)); + log::debug("MTU not yet updated for {}", remote_bda); return MTU_EXCHANGE_NOT_DONE_YET; } @@ -818,16 +815,15 @@ tGATTC_TryMtuRequestResult GATTC_TryMtuRequest(const RawAddress& remote_bda, void GATTC_UpdateUserAttMtuIfNeeded(const RawAddress& remote_bda, tBT_TRANSPORT transport, uint16_t user_mtu) { - log::info("{}, mtu={}", ADDRESS_TO_LOGGABLE_CSTR(remote_bda), user_mtu); + log::info("{}, mtu={}", remote_bda, user_mtu); tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(remote_bda, transport); if (!p_tcb) { log::warn("Transport control block not found"); return; } - log::info("{}, current mtu: {}, max_user_mtu:{}, user_mtu: {}", - ADDRESS_TO_LOGGABLE_CSTR(remote_bda), p_tcb->payload_size, - p_tcb->max_user_mtu, user_mtu); + log::info("{}, current mtu: {}, max_user_mtu:{}, user_mtu: {}", remote_bda, + p_tcb->payload_size, p_tcb->max_user_mtu, user_mtu); if (p_tcb->payload_size < user_mtu) { log::info("User requested more than what GATT can handle. Trim it."); @@ -1104,7 +1100,7 @@ tGATT_STATUS GATTC_ExecuteWrite(uint16_t conn_id, bool is_execute) { log::verbose("conn_id={}, is_execute={}", loghex(conn_id), is_execute); if ((p_tcb == NULL) || (p_reg == NULL)) { - log::error(" Illegal param: conn_id={}", loghex(conn_id)); + log::error("Illegal param: conn_id={}", loghex(conn_id)); return GATT_ILLEGAL_PARAMETER; } @@ -1272,7 +1268,7 @@ tGATT_IF GATT_Register(const Uuid& app_uuid128, const std::string& name, * ******************************************************************************/ void GATT_Deregister(tGATT_IF gatt_if) { - log::info("gatt_if={}", +gatt_if); + log::info("gatt_if={}", gatt_if); tGATT_REG* p_reg = gatt_get_regcb(gatt_if); /* Index 0 is GAP and is never deregistered */ @@ -1362,7 +1358,7 @@ void GATT_StartIf(tGATT_IF gatt_if) { gatt_find_the_connected_bda(start_idx, bda, &found_idx, &transport)) { p_tcb = gatt_find_tcb_by_addr(bda, transport); log::info("GATT interface {} already has connected device {}", gatt_if, - ADDRESS_TO_LOGGABLE_CSTR(bda)); + bda); if (p_reg->app_cb.p_conn_cb && p_tcb) { conn_id = GATT_CREATE_CONN_ID(p_tcb->tcb_idx, gatt_if); log::info("Invoking callback with connection id {}", conn_id); @@ -1428,7 +1424,7 @@ bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, bool ret = false; if (is_direct) { log::debug("Starting direct connect gatt_if={} address={}", gatt_if, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + bd_addr); bool tcb_exist = !!gatt_find_tcb_by_addr(bd_addr, transport); if (!IS_FLAG_ENABLED(gatt_reconnect_on_bt_on_fix) || tcb_exist) { @@ -1436,14 +1432,13 @@ bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, ret = gatt_act_connect(p_reg, bd_addr, addr_type, transport, initiating_phys); } else { - log::verbose("Connecting without tcb address: {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("Connecting without tcb address: {}", bd_addr); if (p_reg->direct_connect_request.count(bd_addr) == 0) { p_reg->direct_connect_request.insert(bd_addr); } else { - log::warn(" {} already added to gatt_if {} direct conn list", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), gatt_if); + log::warn("{} already added to gatt_if {} direct conn list", bd_addr, + gatt_if); } ret = acl_create_le_connection_with_id(gatt_if, bd_addr, addr_type); @@ -1451,17 +1446,16 @@ bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, } else { log::debug("Starting background connect gatt_if={} address={}", gatt_if, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + bd_addr); if (!BTM_Sec_AddressKnown(bd_addr)) { // RPA can rotate, causing address to "expire" in the background // connection list. RPA is allowed for direct connect, as such request // times out after 30 seconds log::warn("Unable to add RPA {} to background connection gatt_if={}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), gatt_if); + bd_addr, gatt_if); ret = false; } else { - log::debug("Adding to background connect to device:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::debug("Adding to background connect to device:{}", bd_addr); if (bluetooth::common::init_flags:: use_unified_connection_manager_is_enabled()) { if (connection_type == BTM_BLE_BKG_CONNECT_ALLOW_LIST) { @@ -1533,8 +1527,7 @@ bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, ******************************************************************************/ bool GATT_CancelConnect(tGATT_IF gatt_if, const RawAddress& bd_addr, bool is_direct) { - log::info("gatt_if:{}, address: {}, direct:{}", gatt_if, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), is_direct); + log::info("gatt_if:{}, address: {}, direct:{}", gatt_if, bd_addr, is_direct); tGATT_REG* p_reg; if (gatt_if) { @@ -1551,7 +1544,7 @@ bool GATT_CancelConnect(tGATT_IF gatt_if, const RawAddress& bd_addr, } } - log::verbose(" unconditional"); + log::verbose("unconditional"); /* only LE connection can be cancelled */ tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(bd_addr, BT_TRANSPORT_LE); @@ -1702,13 +1695,11 @@ void gatt_load_bonded(void) { } for (tBTM_SEC_DEV_REC* p_dev_rec : btm_get_sec_dev_rec()) { if (p_dev_rec->sec_rec.is_link_key_known()) { - log::verbose("Add bonded BR/EDR transport {}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr)); + log::verbose("Add bonded BR/EDR transport {}", p_dev_rec->bd_addr); gatt_bonded_check_add_address(p_dev_rec->bd_addr); } if (p_dev_rec->sec_rec.is_le_link_key_known()) { - log::verbose("Add bonded BLE {}", - ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->ble.pseudo_addr)); + log::verbose("Add bonded BLE {}", p_dev_rec->ble.pseudo_addr); gatt_bonded_check_add_address(p_dev_rec->ble.pseudo_addr); } } diff --git a/system/stack/gatt/gatt_attr.cc b/system/stack/gatt/gatt_attr.cc index 63169bb438..6ef95b9a01 100644 --- a/system/stack/gatt/gatt_attr.cc +++ b/system/stack/gatt/gatt_attr.cc @@ -355,13 +355,12 @@ static void gatt_connect_cback(UNUSED_ATTR tGATT_IF gatt_if, const RawAddress& bda, uint16_t conn_id, bool connected, tGATT_DISCONN_REASON reason, tBT_TRANSPORT transport) { - log::verbose("from {} connected: {}, conn_id: {}", - ADDRESS_TO_LOGGABLE_STR(bda), connected, loghex(conn_id)); + log::verbose("from {} connected: {}, conn_id: {}", bda, connected, + loghex(conn_id)); // if the device is not trusted, remove data when the link is disconnected if (!connected && !btm_sec_is_a_bonded_dev(bda)) { - log::info("remove untrusted client status, bda={}", - ADDRESS_TO_LOGGABLE_STR(bda)); + log::info("remove untrusted client status, bda={}", bda); btif_storage_remove_gatt_cl_supp_feat(bda); btif_storage_remove_gatt_cl_db_hash(bda); } @@ -857,8 +856,7 @@ bool gatt_cl_read_sr_supp_feat_req( if (!cb) return false; - log::verbose("BDA: {} read gatt supported features", - ADDRESS_TO_LOGGABLE_STR(peer_bda)); + log::verbose("BDA: {} read gatt supported features", peer_bda); GATT_GetConnIdIfConnected(gatt_cb.gatt_if, peer_bda, &conn_id, BT_TRANSPORT_LE); @@ -901,7 +899,7 @@ bool gatt_cl_read_sirk_req( if (!cb) return false; - log::debug("BDA: {}, read SIRK", ADDRESS_TO_LOGGABLE_CSTR(peer_bda)); + log::debug("BDA: {}, read SIRK", peer_bda); GATT_GetConnIdIfConnected(gatt_cb.gatt_if, peer_bda, &conn_id, BT_TRANSPORT_LE); @@ -938,8 +936,7 @@ bool gatt_cl_read_sirk_req( bool gatt_profile_get_eatt_support(const RawAddress& remote_bda) { uint16_t conn_id; - log::verbose("BDA: {} read GATT support", - ADDRESS_TO_LOGGABLE_STR(remote_bda)); + log::verbose("BDA: {} read GATT support", remote_bda); GATT_GetConnIdIfConnected(gatt_cb.gatt_if, remote_bda, &conn_id, BT_TRANSPORT_LE); @@ -1047,9 +1044,8 @@ void gatt_sr_init_cl_status(tGATT_TCB& tcb) { tcb.is_robust_cache_change_aware = true; } - log::info("bda={}, cl_supp_feat={}, aware={}", - ADDRESS_TO_LOGGABLE_STR(tcb.peer_bda), loghex(tcb.cl_supp_feat), - tcb.is_robust_cache_change_aware); + log::info("bda={}, cl_supp_feat={}, aware={}", tcb.peer_bda, + loghex(tcb.cl_supp_feat), tcb.is_robust_cache_change_aware); } /******************************************************************************* @@ -1073,8 +1069,7 @@ void gatt_sr_update_cl_status(tGATT_TCB& tcb, bool chg_aware) { // only when the status is changed, print the log if (tcb.is_robust_cache_change_aware != chg_aware) { - log::info("bda={}, chg_aware={}", ADDRESS_TO_LOGGABLE_STR(tcb.peer_bda), - chg_aware); + log::info("bda={}, chg_aware={}", tcb.peer_bda, chg_aware); } tcb.is_robust_cache_change_aware = chg_aware; @@ -1137,14 +1132,13 @@ static tGATT_STATUS gatt_sr_write_cl_supp_feat(uint16_t conn_id, // If input length is zero, return value_not_allowed if (tmp.empty()) { - log::info("zero length, conn_id={}, bda={}", loghex(conn_id), - ADDRESS_TO_LOGGABLE_STR(tcb.peer_bda)); + log::info("zero length, conn_id={}, bda={}", loghex(conn_id), tcb.peer_bda); return GATT_VALUE_NOT_ALLOWED; } // if original length is longer than new one, it must be the bit reset case. if (feature_list.size() > tmp.size()) { log::info("shorter length, conn_id={}, bda={}", loghex(conn_id), - ADDRESS_TO_LOGGABLE_STR(tcb.peer_bda)); + tcb.peer_bda); return GATT_VALUE_NOT_ALLOWED; } // new length is longer or equals to the original, need to check bits @@ -1159,7 +1153,7 @@ static tGATT_STATUS gatt_sr_write_cl_supp_feat(uint16_t conn_id, uint8_t val_and = val_xor & *it_new; if (val_and != val_xor) { log::info("bit cannot be reset, conn_id={}, bda={}", loghex(conn_id), - ADDRESS_TO_LOGGABLE_STR(tcb.peer_bda)); + tcb.peer_bda); return GATT_VALUE_NOT_ALLOWED; } } @@ -1172,7 +1166,7 @@ static tGATT_STATUS gatt_sr_write_cl_supp_feat(uint16_t conn_id, // remove robust caching bit tcb.cl_supp_feat &= ~BLE_GATT_CL_SUP_FEAT_CACHING_BITMASK; log::info("reset robust caching bit, conn_id={}, bda={}", loghex(conn_id), - ADDRESS_TO_LOGGABLE_STR(tcb.peer_bda)); + tcb.peer_bda); } // TODO(hylo): save data as byte array btif_storage_set_gatt_cl_supp_feat(tcb.peer_bda, tcb.cl_supp_feat); diff --git a/system/stack/gatt/gatt_cl.cc b/system/stack/gatt/gatt_cl.cc index 977ebd7212..635e1e65d6 100644 --- a/system/stack/gatt/gatt_cl.cc +++ b/system/stack/gatt/gatt_cl.cc @@ -1105,8 +1105,7 @@ void gatt_process_mtu_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint16_t len, STREAM_TO_UINT16(mtu, p_data); log::info("Local pending MTU {}, Remote ({}) MTU {}", - tcb.pending_user_mtu_exchange_value, - ADDRESS_TO_LOGGABLE_STR(tcb.peer_bda), mtu); + tcb.pending_user_mtu_exchange_value, tcb.peer_bda, mtu); /* Aim for default as we did in the request */ if (mtu < GATT_DEF_BLE_MTU_SIZE) { diff --git a/system/stack/gatt/gatt_main.cc b/system/stack/gatt/gatt_main.cc index c6e1b27f3b..03709a4ba2 100644 --- a/system/stack/gatt/gatt_main.cc +++ b/system/stack/gatt/gatt_main.cc @@ -263,8 +263,7 @@ bool gatt_disconnect(tGATT_TCB* p_tcb) { tGATT_CH_STATE ch_state = gatt_get_ch_state(p_tcb); if (ch_state == GATT_CH_CLOSING) { - log::debug("Device already in closing state peer:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_tcb->peer_bda)); + log::debug("Device already in closing state peer:{}", p_tcb->peer_bda); log::verbose("already in closing state"); return true; } @@ -288,8 +287,7 @@ bool gatt_disconnect(tGATT_TCB* p_tcb) { log::info( "GATT connection manager has no record but removed filter " "acceptlist gatt_if:{} peer:{}", - static_cast<uint8_t>(CONN_MGR_ID_L2CAP), - ADDRESS_TO_LOGGABLE_CSTR(p_tcb->peer_bda)); + static_cast<uint8_t>(CONN_MGR_ID_L2CAP), p_tcb->peer_bda); } } @@ -320,7 +318,7 @@ bool gatt_disconnect(tGATT_TCB* p_tcb) { static bool gatt_update_app_hold_link_status(tGATT_IF gatt_if, tGATT_TCB* p_tcb, bool is_add) { log::debug("gatt_if={}, is_add={}, peer_bda={}", gatt_if, is_add, - ADDRESS_TO_LOGGABLE_CSTR(p_tcb->peer_bda)); + p_tcb->peer_bda); auto& holders = p_tcb->app_hold_link; if (is_add) { @@ -382,8 +380,7 @@ void gatt_update_app_use_link_flag(tGATT_IF gatt_if, tGATT_TCB* p_tcb, if (is_add) { if (p_tcb->att_lcid == L2CAP_ATT_CID && is_valid_handle) { - log::info("disable link idle timer for {}", - ADDRESS_TO_LOGGABLE_CSTR(p_tcb->peer_bda)); + log::info("disable link idle timer for {}", p_tcb->peer_bda); /* acl link is connected disable the idle timeout */ GATT_SetIdleTimeout(p_tcb->peer_bda, GATT_LINK_NO_IDLE_TIMEOUT, p_tcb->transport, true /* is_active */); @@ -421,8 +418,8 @@ void gatt_update_app_use_link_flag(tGATT_IF gatt_if, tGATT_TCB* p_tcb, bool gatt_act_connect(tGATT_REG* p_reg, const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, tBT_TRANSPORT transport, int8_t initiating_phys) { - log::verbose("address:{}, transport:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - bt_transport_text(transport).c_str()); + log::verbose("address:{}, transport:{}", bd_addr, + bt_transport_text(transport)); tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(bd_addr, transport); if (p_tcb != NULL) { /* before link down, another app try to open a GATT connection */ @@ -489,8 +486,7 @@ static void gatt_le_connect_cback(uint16_t chan, const RawAddress& bd_addr, return; } - log::verbose("GATT ATT protocol channel with BDA: {} is {}", - ADDRESS_TO_LOGGABLE_STR(bd_addr), + log::verbose("GATT ATT protocol channel with BDA: {} is {}", bd_addr, ((connected) ? "connected" : "disconnected")); p_srv_chg_clt = gatt_is_bda_in_the_srv_chg_clt_list(bd_addr); @@ -530,7 +526,7 @@ static void gatt_le_connect_cback(uint16_t chan, const RawAddress& bd_addr, log::error("CCB max out, no rsources"); if (IS_FLAG_ENABLED(gatt_drop_acl_on_out_of_resources_fix)) { log::error("Disconnecting address:{} due to out of resources.", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + bd_addr); // When single FIXED channel cannot be created, there is no reason to // keep the link btm_remove_acl(bd_addr, transport); @@ -570,7 +566,7 @@ static void gatt_le_connect_cback(uint16_t chan, const RawAddress& bd_addr, } if (stack_config_get_interface()->get_pts_connect_eatt_before_encryption()) { - log::info("Start EATT before encryption "); + log::info("Start EATT before encryption"); EattExtension::GetInstance()->Connect(bd_addr); } } @@ -584,8 +580,7 @@ bool check_cached_model_name(const RawAddress& bd_addr) { if (btif_storage_get_remote_device_property(&bd_addr, &prop) != BT_STATUS_SUCCESS || prop.len == 0) { - log::info("Device {} no cached model name", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::info("Device {} no cached model name", bd_addr); return false; } @@ -608,8 +603,7 @@ static void read_dis_cback(const RawAddress& bd_addr, tDIS_VALUE* p_dis_value) { prop.val = p_dis_value->data_string[i]; prop.len = strlen((char*)prop.val); - log::info("Device {}, model name: {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), ((char*)prop.val)); + log::info("Device {}, model name: {}", bd_addr, ((char*)prop.val)); btif_storage_set_remote_device_property(&bd_addr, &prop); GetInterfaceToProfiles()->events->invoke_remote_device_properties_cb( @@ -949,8 +943,8 @@ static void gatt_send_conn_cback(tGATT_TCB* p_tcb) { if (p_reg->direct_connect_request.count(p_tcb->peer_bda) > 0) { gatt_update_app_use_link_flag(p_reg->gatt_if, p_tcb, true, true); log::info( - "Removing device {} from the direct connect list of gatt_if {} ", - ADDRESS_TO_LOGGABLE_CSTR(p_tcb->peer_bda), p_reg->gatt_if); + "Removing device {} from the direct connect list of gatt_if {}", + p_tcb->peer_bda, p_reg->gatt_if); p_reg->direct_connect_request.erase(p_tcb->peer_bda); } } @@ -986,8 +980,7 @@ void gatt_consolidate(const RawAddress& identity_addr, const RawAddress& rpa) { tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(rpa, BT_TRANSPORT_LE); if (p_tcb == NULL) return; - log::info("consolidate {} -> {}", ADDRESS_TO_LOGGABLE_CSTR(rpa), - ADDRESS_TO_LOGGABLE_CSTR(identity_addr)); + log::info("consolidate {} -> {}", rpa, identity_addr); p_tcb->peer_bda = identity_addr; // Address changed, notify GATT clients/servers device is available under new @@ -1076,8 +1069,7 @@ void gatt_send_srv_chg_ind(const RawAddress& peer_bda) { uint16_t conn_id = gatt_profile_find_conn_id_by_bd_addr(peer_bda); if (conn_id == GATT_INVALID_CONN_ID) { - log::error("Unable to find conn_id for {}", - ADDRESS_TO_LOGGABLE_STR(peer_bda)); + log::error("Unable to find conn_id for {}", peer_bda); return; } diff --git a/system/stack/gatt/gatt_sr.cc b/system/stack/gatt/gatt_sr.cc index 4bba0858a4..94b7efc405 100644 --- a/system/stack/gatt/gatt_sr.cc +++ b/system/stack/gatt/gatt_sr.cc @@ -69,8 +69,7 @@ uint32_t gatt_sr_enqueue_cmd(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid(tcb.peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cid); return 0; } @@ -115,8 +114,7 @@ bool gatt_sr_cmd_empty(tGATT_TCB& tcb, uint16_t cid) { EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid(tcb.peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cid); return false; } @@ -141,8 +139,7 @@ void gatt_dequeue_sr_cmd(tGATT_TCB& tcb, uint16_t cid) { EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid(tcb.peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cid); return; } @@ -447,8 +444,7 @@ void gatt_process_read_multi_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, tGATT_READ_MULTI* multi_req = gatt_sr_get_read_multi(tcb, cid); if (multi_req == nullptr) { - log::error("Could not proceed request. {}, 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::error("Could not proceed request. {}, 0x{:02x}", tcb.peer_bda, cid); return; } multi_req->num_handles = 0; @@ -505,7 +501,7 @@ void gatt_process_read_multi_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, if (sr_cmd_p == nullptr) { log::error( "Could not send response on CID were request arrived. {}, 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + tcb.peer_bda, cid); return; } gatt_sr_reset_cback_cnt(tcb, @@ -1370,8 +1366,7 @@ static bool gatts_process_db_out_of_sync(tGATT_TCB& tcb, uint16_t cid, false); } log::info("database out of sync, device={}, op_code={}, should_rsp={}", - ADDRESS_TO_LOGGABLE_STR(tcb.peer_bda), loghex((uint16_t)op_code), - should_rsp); + tcb.peer_bda, loghex((uint16_t)op_code), should_rsp); gatt_sr_update_cl_status(tcb, /* chg_aware= */ should_rsp); } diff --git a/system/stack/gatt/gatt_utils.cc b/system/stack/gatt/gatt_utils.cc index 11b806533b..df545f13fc 100644 --- a/system/stack/gatt/gatt_utils.cc +++ b/system/stack/gatt/gatt_utils.cc @@ -295,7 +295,7 @@ bool gatt_find_the_connected_bda(uint8_t start_idx, RawAddress& bda, *p_found_idx = i; *p_transport = gatt_cb.tcb[i].transport; found = true; - log::debug("bda: {}", ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::debug("bda: {}", bda); break; } } @@ -347,7 +347,7 @@ bool gatt_is_srv_chg_ind_pending(tGATT_TCB* p_tcb) { * ******************************************************************************/ tGATTS_SRV_CHG* gatt_is_bda_in_the_srv_chg_clt_list(const RawAddress& bda) { - log::verbose("{}", ADDRESS_TO_LOGGABLE_STR(bda)); + log::verbose("{}", bda); if (fixed_queue_is_empty(gatt_cb.srv_chg_clt_q)) return NULL; @@ -1051,8 +1051,7 @@ bool gatt_tcb_is_cid_busy(tGATT_TCB& tcb, uint16_t cid) { EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid(tcb.peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cid); return false; } @@ -1188,8 +1187,7 @@ uint16_t gatt_tcb_get_payload_size(tGATT_TCB& tcb, uint16_t cid) { EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid(tcb.peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cid); return 0; } @@ -1252,8 +1250,7 @@ void gatt_clcb_invalidate(tGATT_TCB* p_tcb, const tGATT_CLCB* p_clcb) { EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid( p_tcb->peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(p_tcb->peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", p_tcb->peer_bda, cid); return; } cl_cmd_q_p = &channel->cl_cmd_q_; @@ -1383,8 +1380,7 @@ void gatt_sr_reset_cback_cnt(tGATT_TCB& tcb, uint16_t cid) { EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid(tcb.peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cid); return; } channel->server_outstanding_cmd_.cback_cnt[i] = 0; @@ -1418,8 +1414,7 @@ tGATT_SR_CMD* gatt_sr_get_cmd_by_cid(tGATT_TCB& tcb, uint16_t cid) { EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid(tcb.peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cid); return nullptr; } @@ -1440,8 +1435,7 @@ tGATT_READ_MULTI* gatt_sr_get_read_multi(tGATT_TCB& tcb, uint16_t cid) { EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid(tcb.peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cid); return nullptr; } read_multi_p = &channel->server_outstanding_cmd_.multi_req; @@ -1470,8 +1464,7 @@ void gatt_sr_update_cback_cnt(tGATT_TCB& tcb, uint16_t cid, tGATT_IF gatt_if, EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid(tcb.peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cid); return; } sr_cmd_p = &channel->server_outstanding_cmd_; @@ -1531,15 +1524,14 @@ bool gatt_cancel_open(tGATT_IF gatt_if, const RawAddress& bda) { if (!p_reg) { log::error("Unable to find registered app gatt_if={}", gatt_if); } else { - log::info("Removing {} from direct list", - ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::info("Removing {} from direct list", bda); p_reg->direct_connect_request.erase(bda); } return true; } log::warn("Unable to cancel open for unknown connection gatt_if:{} peer:{}", - gatt_if, ADDRESS_TO_LOGGABLE_CSTR(bda)); + gatt_if, bda); return true; } @@ -1554,7 +1546,7 @@ bool gatt_cancel_open(tGATT_IF gatt_if, const RawAddress& bda) { log::debug( "Client reference count is zero disconnecting device gatt_if:{} " "peer:{}", - gatt_if, ADDRESS_TO_LOGGABLE_CSTR(bda)); + gatt_if, bda); gatt_disconnect(p_tcb); } @@ -1569,12 +1561,12 @@ bool gatt_cancel_open(tGATT_IF gatt_if, const RawAddress& bda) { log::info( "Gatt connection manager has no background record but removed " "filter acceptlist gatt_if:{} peer:{}", - gatt_if, ADDRESS_TO_LOGGABLE_CSTR(bda)); + gatt_if, bda); } else { log::info( "Gatt connection manager maintains a background record preserving " "filter acceptlist gatt_if:{} peer:{}", - gatt_if, ADDRESS_TO_LOGGABLE_CSTR(bda)); + gatt_if, bda); } } } @@ -1598,8 +1590,7 @@ bool gatt_cmd_enq(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, bool to_send, EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid( tcb.peer_bda, cmd.cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cmd.cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cmd.cid); return false; } channel->cl_cmd_q_.push_back(cmd); @@ -1618,8 +1609,7 @@ tGATT_CLCB* gatt_cmd_dequeue(tGATT_TCB& tcb, uint16_t cid, uint8_t* p_op_code) { EattChannel* channel = EattExtension::GetInstance()->FindEattChannelByCid(tcb.peer_bda, cid); if (channel == nullptr) { - log::warn("{}, cid 0x{:02x} already disconnected", - ADDRESS_TO_LOGGABLE_CSTR(tcb.peer_bda), cid); + log::warn("{}, cid 0x{:02x} already disconnected", tcb.peer_bda, cid); return nullptr; } @@ -1765,8 +1755,8 @@ static void gatt_le_disconnect_complete_notify_user(const RawAddress& bda, if (IS_FLAG_ENABLED(gatt_reconnect_on_bt_on_fix)) { if (p_reg->direct_connect_request.count(bda) > 0) { log::info( - "Removing device {} from the direct connect list of gatt_if {} ", - ADDRESS_TO_LOGGABLE_CSTR(bda), p_reg->gatt_if); + "Removing device {} from the direct connect list of gatt_if {}", + bda, p_reg->gatt_if); p_reg->direct_connect_request.erase(bda); } } @@ -1783,13 +1773,12 @@ void gatt_cleanup_upon_disc(const RawAddress& bda, tGATT_DISCONN_REASON reason, if (!IS_FLAG_ENABLED(gatt_reconnect_on_bt_on_fix)) { log::error( "Disconnect for unknown connection bd_addr:{} reason:{} transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bda), gatt_disconnection_reason_text(reason), + bda, gatt_disconnection_reason_text(reason), bt_transport_text(transport)); return; } - log::info("Connection timeout bd_addr:{} reason:{} transport:{}", - ADDRESS_TO_LOGGABLE_CSTR(bda), + log::info("Connection timeout bd_addr:{} reason:{} transport:{}", bda, gatt_disconnection_reason_text(reason), bt_transport_text(transport)); diff --git a/system/stack/hid/hidh_conn.cc b/system/stack/hid/hidh_conn.cc index 51f0b3faea..79176df2ef 100644 --- a/system/stack/hid/hidh_conn.cc +++ b/system/stack/hid/hidh_conn.cc @@ -338,7 +338,7 @@ static void hidh_l2cif_connect_cfm(uint16_t l2cap_cid, uint16_t result) { ((l2cap_cid == p_hcon->intr_cid) && (p_hcon->conn_state != HID_CONN_STATE_CONNECTING_INTR) && (p_hcon->conn_state != HID_CONN_STATE_DISCONNECTING))) { - log::warn("HID-Host Rcvd unexpected conn cnf, CID 0x{:x} ", l2cap_cid); + log::warn("HID-Host Rcvd unexpected conn cnf, CID 0x{:x}", l2cap_cid); return; } diff --git a/system/stack/l2cap/l2c_api.cc b/system/stack/l2cap/l2c_api.cc index 563b2ae444..c77d4da59c 100644 --- a/system/stack/l2cap/l2c_api.cc +++ b/system/stack/l2cap/l2c_api.cc @@ -314,7 +314,7 @@ uint16_t L2CA_ConnectReq2(uint16_t psm, const RawAddress& p_bd_addr, * ******************************************************************************/ uint16_t L2CA_ConnectReq(uint16_t psm, const RawAddress& p_bd_addr) { - log::verbose("BDA {} PSM: 0x{:04x}", ADDRESS_TO_LOGGABLE_STR(p_bd_addr), psm); + log::verbose("BDA {} PSM: 0x{:04x}", p_bd_addr, psm); /* Fail if we have not established communications with the controller */ if (!BTM_IsDeviceUp()) { @@ -512,8 +512,7 @@ uint16_t L2CA_ConnectLECocReq(uint16_t psm, const RawAddress& p_bd_addr, get_btm_client_interface().security.BTM_SetSecurityLevel( true, "", 0, sec_level, psm, 0, 0); - log::verbose("BDA: {} PSM: 0x{:04x}", ADDRESS_TO_LOGGABLE_STR(p_bd_addr), - psm); + log::verbose("BDA: {} PSM: 0x{:04x}", p_bd_addr, psm); /* Fail if we have not established communications with the controller */ if (!BTM_IsDeviceUp()) { @@ -666,9 +665,8 @@ uint16_t L2CA_GetPeerLECocCredit(const RawAddress& bd_addr, uint16_t lcid) { bool L2CA_ConnectCreditBasedRsp(const RawAddress& p_bd_addr, uint8_t id, std::vector<uint16_t>& accepted_lcids, uint16_t result, tL2CAP_LE_CFG_INFO* p_cfg) { - log::verbose("BDA: {} num of cids: {} Result: {}", - ADDRESS_TO_LOGGABLE_STR(p_bd_addr), int(accepted_lcids.size()), - result); + log::verbose("BDA: {} num of cids: {} Result: {}", p_bd_addr, + int(accepted_lcids.size()), result); /* First, find the link control block */ tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(p_bd_addr, BT_TRANSPORT_LE); @@ -737,8 +735,7 @@ bool L2CA_ConnectCreditBasedRsp(const RawAddress& p_bd_addr, uint8_t id, std::vector<uint16_t> L2CA_ConnectCreditBasedReq(uint16_t psm, const RawAddress& p_bd_addr, tL2CAP_LE_CFG_INFO* p_cfg) { - log::verbose("BDA: {} PSM: 0x{:04x}", ADDRESS_TO_LOGGABLE_STR(p_bd_addr), - psm); + log::verbose("BDA: {} PSM: 0x{:04x}", p_bd_addr, psm); std::vector<uint16_t> allocated_cids; @@ -850,7 +847,7 @@ bool L2CA_ReconfigCreditBasedConnsReq(const RawAddress& bda, tL2CAP_LE_CFG_INFO* p_cfg) { tL2C_CCB* p_ccb; - log::verbose("L2CA_ReconfigCreditBasedConnsReq() "); + log::verbose("L2CA_ReconfigCreditBasedConnsReq()"); if (lcids.empty()) { log::warn("L2CAP - empty lcids"); @@ -1003,11 +1000,10 @@ bool L2CA_UseLatencyMode(const RawAddress& bd_addr, bool use_latency_mode) { /* Find the link control block for the acl channel */ tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(bd_addr, BT_TRANSPORT_BR_EDR); if (p_lcb == nullptr) { - log::warn("L2CAP - no LCB for L2CA_SetUseLatencyMode, BDA: {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("L2CAP - no LCB for L2CA_SetUseLatencyMode, BDA: {}", bd_addr); return false; } - log::info("BDA: {}, use_latency_mode: {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), + log::info("BDA: {}, use_latency_mode: {}", bd_addr, use_latency_mode ? "true" : "false"); p_lcb->use_latency_mode = use_latency_mode; return true; @@ -1025,8 +1021,7 @@ bool L2CA_UseLatencyMode(const RawAddress& bd_addr, bool use_latency_mode) { * ******************************************************************************/ bool L2CA_SetAclPriority(const RawAddress& bd_addr, tL2CAP_PRIORITY priority) { - log::verbose("BDA: {}, priority: {}", ADDRESS_TO_LOGGABLE_STR(bd_addr), - priority); + log::verbose("BDA: {}, priority: {}", bd_addr, priority); return (l2cu_set_acl_priority(bd_addr, priority, false)); } @@ -1040,8 +1035,7 @@ bool L2CA_SetAclPriority(const RawAddress& bd_addr, tL2CAP_PRIORITY priority) { * ******************************************************************************/ bool L2CA_SetAclLatency(const RawAddress& bd_addr, tL2CAP_LATENCY latency) { - log::info("BDA: {}, latency: {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - std::to_string(latency)); + log::info("BDA: {}, latency: {}", bd_addr, std::to_string(latency)); return l2cu_set_acl_latency(bd_addr, latency); } @@ -1093,13 +1087,12 @@ bool L2CA_GetPeerFeatures(const RawAddress& bd_addr, uint32_t* p_ext_feat, /* We must already have a link to the remote */ p_lcb = l2cu_find_lcb_by_bd_addr(bd_addr, BT_TRANSPORT_BR_EDR); if (p_lcb == NULL) { - log::warn("No BDA: {}", ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::warn("No BDA: {}", bd_addr); return false; } - log::verbose("BDA: {} ExtFea: 0x{:08x} Chnl_Mask[0]: 0x{:02x}", - ADDRESS_TO_LOGGABLE_STR(bd_addr), p_lcb->peer_ext_fea, - p_lcb->peer_chnl_mask[0]); + log::verbose("BDA: {} ExtFea: 0x{:08x} Chnl_Mask[0]: 0x{:02x}", bd_addr, + p_lcb->peer_ext_fea, p_lcb->peer_chnl_mask[0]); *p_ext_feat = p_lcb->peer_ext_fea; @@ -1404,13 +1397,11 @@ bool L2CA_RemoveFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda) { if (((p_lcb) == NULL) || (!p_lcb->p_fixed_ccbs[fixed_cid - L2CAP_FIRST_FIXED_CHNL])) { - log::warn("BDA: {} CID: 0x{:04x} not connected", - ADDRESS_TO_LOGGABLE_STR(rem_bda), fixed_cid); + log::warn("BDA: {} CID: 0x{:04x} not connected", rem_bda, fixed_cid); return (false); } - log::verbose("BDA: {} CID: 0x{:04x}", ADDRESS_TO_LOGGABLE_STR(rem_bda), - fixed_cid); + log::verbose("BDA: {} CID: 0x{:04x}", rem_bda, fixed_cid); /* Release the CCB, starting an inactivity timeout on the LCB if no other CCBs * exist */ @@ -1455,8 +1446,7 @@ bool L2CA_SetLeGattTimeout(const RawAddress& rem_bda, uint16_t idle_tout) { tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(rem_bda, BT_TRANSPORT_LE); if (((p_lcb) == NULL) || (!p_lcb->p_fixed_ccbs[kAttCid - L2CAP_FIRST_FIXED_CHNL])) { - log::warn("BDA: {} CID: 0x{:04x} not connected", - ADDRESS_TO_LOGGABLE_STR(rem_bda), kAttCid); + log::warn("BDA: {} CID: 0x{:04x} not connected", rem_bda, kAttCid); return (false); } @@ -1478,7 +1468,7 @@ bool L2CA_MarkLeLinkAsActive(const RawAddress& rem_bda) { if (p_lcb == NULL) { return false; } - log::info("setting link to {} as active", ADDRESS_TO_LOGGABLE_STR(rem_bda)); + log::info("setting link to {} as active", rem_bda); p_lcb->with_active_local_clients = true; return true; } diff --git a/system/stack/l2cap/l2c_ble.cc b/system/stack/l2cap/l2c_ble.cc index 57012bca41..b14752e479 100644 --- a/system/stack/l2cap/l2c_ble.cc +++ b/system/stack/l2cap/l2c_ble.cc @@ -73,9 +73,7 @@ void L2CA_Consolidate(const RawAddress& identity_addr, const RawAddress& rpa) { return; } - log::info("consolidating l2c_lcb record {} -> {}", - ADDRESS_TO_LOGGABLE_CSTR(rpa), - ADDRESS_TO_LOGGABLE_CSTR(identity_addr)); + log::info("consolidating l2c_lcb record {} -> {}", rpa, identity_addr); p_lcb->remote_bd_addr = identity_addr; } @@ -1127,8 +1125,7 @@ void l2cble_process_data_length_change_event(uint16_t handle, log::debug( "Received data length change event for device:{} tx_data_len:{} => " "{}", - ADDRESS_TO_LOGGABLE_CSTR(p_lcb->remote_bd_addr), p_lcb->tx_data_len, - tx_data_len); + p_lcb->remote_bd_addr, p_lcb->tx_data_len, tx_data_len); BTM_LogHistory(kBtmLogTag, p_lcb->remote_bd_addr, "LE Data length change", base::StringPrintf("tx_octets:%hu => %hu", p_lcb->tx_data_len, tx_data_len)); @@ -1137,13 +1134,13 @@ void l2cble_process_data_length_change_event(uint16_t handle, log::debug( "Received duplicated data length change event for device:{} " "tx_data_len:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_lcb->remote_bd_addr), tx_data_len); + p_lcb->remote_bd_addr, tx_data_len); } } else { log::warn( "Received illegal data length change event for device:{} " "tx_data_len:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_lcb->remote_bd_addr), tx_data_len); + p_lcb->remote_bd_addr, tx_data_len); } /* ignore rx_data len for now */ } @@ -1259,8 +1256,7 @@ void l2cble_sec_comp(const RawAddress* bda, tBT_TRANSPORT transport, uint8_t sec_act; if (!p_lcb) { - log::warn("security complete for unknown device. bda={}", - ADDRESS_TO_LOGGABLE_CSTR(*bda)); + log::warn("security complete for unknown device. bda={}", *bda); return; } diff --git a/system/stack/l2cap/l2c_ble_conn_params.cc b/system/stack/l2cap/l2c_ble_conn_params.cc index 8e04d10eb7..2aec0435ab 100644 --- a/system/stack/l2cap/l2c_ble_conn_params.cc +++ b/system/stack/l2cap/l2c_ble_conn_params.cc @@ -66,19 +66,18 @@ bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda, uint16_t min_int, /* If we do not have one, create one and accept the connection. */ if (!p_lcb || !BTM_IsAclConnectionUp(rem_bda, BT_TRANSPORT_LE)) { - log::warn("- unknown BD_ADDR {}", ADDRESS_TO_LOGGABLE_STR(rem_bda)); + log::warn("- unknown BD_ADDR {}", rem_bda); return (false); } if (p_lcb->transport != BT_TRANSPORT_LE) { - log::warn("- BD_ADDR {} not LE", ADDRESS_TO_LOGGABLE_STR(rem_bda)); + log::warn("- BD_ADDR {} not LE", rem_bda); return (false); } log::verbose( "BD_ADDR={}, min_int={}, max_int={}, min_ce_len={}, max_ce_len={}", - ADDRESS_TO_LOGGABLE_STR(rem_bda), min_int, max_int, min_ce_len, - max_ce_len); + rem_bda, min_int, max_int, min_ce_len, max_ce_len); p_lcb->min_interval = min_int; p_lcb->max_interval = max_int; @@ -105,32 +104,30 @@ void L2CA_LockBleConnParamsForServiceDiscovery(const RawAddress& rem_bda, tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(rem_bda, BT_TRANSPORT_LE); if (!p_lcb) { - log::warn("unknown address {}", ADDRESS_TO_LOGGABLE_CSTR(rem_bda)); + log::warn("unknown address {}", rem_bda); return; } if (p_lcb->transport != BT_TRANSPORT_LE) { - log::warn("{} not LE, link role {}", ADDRESS_TO_LOGGABLE_CSTR(rem_bda), - p_lcb->LinkRole()); + log::warn("{} not LE, link role {}", rem_bda, p_lcb->LinkRole()); return; } if (lock == p_lcb->conn_update_blocked_by_service_discovery) { log::warn("{} service discovery already locked/unlocked conn params: {}", - ADDRESS_TO_LOGGABLE_CSTR(rem_bda), lock); + rem_bda, lock); return; } p_lcb->conn_update_blocked_by_service_discovery = lock; if (p_lcb->conn_update_blocked_by_profile_connection) { - log::info("{} conn params stay locked because of audio setup", - ADDRESS_TO_LOGGABLE_CSTR(rem_bda)); + log::info("{} conn params stay locked because of audio setup", rem_bda); return; } log::info("{} Locking/unlocking conn params for service discovery: {}", - ADDRESS_TO_LOGGABLE_CSTR(rem_bda), lock); + rem_bda, lock); l2c_enable_update_ble_conn_params(p_lcb, !lock); } @@ -144,19 +141,18 @@ void L2CA_LockBleConnParamsForProfileConnection(const RawAddress& rem_bda, tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(rem_bda, BT_TRANSPORT_LE); if (!p_lcb) { - log::warn("unknown address {}", ADDRESS_TO_LOGGABLE_CSTR(rem_bda)); + log::warn("unknown address {}", rem_bda); return; } if (p_lcb->transport != BT_TRANSPORT_LE) { - log::warn("{} not LE, link role {}", ADDRESS_TO_LOGGABLE_CSTR(rem_bda), - p_lcb->LinkRole()); + log::warn("{} not LE, link role {}", rem_bda, p_lcb->LinkRole()); return; } if (lock == p_lcb->conn_update_blocked_by_profile_connection) { - log::info("{} audio setup already locked/unlocked conn params: {}", - ADDRESS_TO_LOGGABLE_CSTR(rem_bda), lock); + log::info("{} audio setup already locked/unlocked conn params: {}", rem_bda, + lock); return; } @@ -164,19 +160,18 @@ void L2CA_LockBleConnParamsForProfileConnection(const RawAddress& rem_bda, if (p_lcb->conn_update_blocked_by_service_discovery) { log::info("{} conn params stay locked because of service discovery", - ADDRESS_TO_LOGGABLE_CSTR(rem_bda)); + rem_bda); return; } - log::info("{} Locking/unlocking conn params for audio setup: {}", - ADDRESS_TO_LOGGABLE_CSTR(rem_bda), lock); + log::info("{} Locking/unlocking conn params for audio setup: {}", rem_bda, + lock); l2c_enable_update_ble_conn_params(p_lcb, !lock); } static bool l2c_enable_update_ble_conn_params(tL2C_LCB* p_lcb, bool enable) { - log::debug("{} enable {} current upd state 0x{:02x}", - ADDRESS_TO_LOGGABLE_CSTR(p_lcb->remote_bd_addr), enable, - p_lcb->conn_update_mask); + log::debug("{} enable {} current upd state 0x{:02x}", p_lcb->remote_bd_addr, + enable, p_lcb->conn_update_mask); if (enable) { p_lcb->conn_update_mask &= ~L2C_BLE_CONN_UPDATE_DISABLE; @@ -206,8 +201,7 @@ static bool l2c_enable_update_ble_conn_params(tL2C_LCB* p_lcb, bool enable) { void l2cble_start_conn_update(tL2C_LCB* p_lcb) { uint16_t min_conn_int, max_conn_int, peripheral_latency, supervision_tout; if (!BTM_IsAclConnectionUp(p_lcb->remote_bd_addr, BT_TRANSPORT_LE)) { - log::error("No known connection ACL for {}", - ADDRESS_TO_LOGGABLE_STR(p_lcb->remote_bd_addr)); + log::error("No known connection ACL for {}", p_lcb->remote_bd_addr); return; } @@ -369,8 +363,7 @@ void l2cble_use_preferred_conn_params(const RawAddress& bda) { ******************************************************************************/ static void l2cble_start_subrate_change(tL2C_LCB* p_lcb) { if (!BTM_IsAclConnectionUp(p_lcb->remote_bd_addr, BT_TRANSPORT_LE)) { - log::error("No known connection ACL for {}", - ADDRESS_TO_LOGGABLE_STR(p_lcb->remote_bd_addr)); + log::error("No known connection ACL for {}", p_lcb->remote_bd_addr); return; } @@ -380,12 +373,12 @@ static void l2cble_start_subrate_change(tL2C_LCB* p_lcb) { p_lcb->subrate_req_mask, p_lcb->conn_update_mask); if (p_lcb->subrate_req_mask & L2C_BLE_SUBRATE_REQ_PENDING) { - log::verbose("returning L2C_BLE_SUBRATE_REQ_PENDING "); + log::verbose("returning L2C_BLE_SUBRATE_REQ_PENDING"); return; } if (p_lcb->subrate_req_mask & L2C_BLE_SUBRATE_REQ_DISABLE) { - log::verbose("returning L2C_BLE_SUBRATE_REQ_DISABLE "); + log::verbose("returning L2C_BLE_SUBRATE_REQ_DISABLE"); return; } @@ -463,20 +456,19 @@ bool L2CA_SubrateRequest(const RawAddress& rem_bda, uint16_t subrate_min, /* If we don't have one, create one and accept the connection. */ if (!p_lcb || !BTM_IsAclConnectionUp(rem_bda, BT_TRANSPORT_LE)) { - log::warn("unknown BD_ADDR {}", ADDRESS_TO_LOGGABLE_STR(rem_bda)); + log::warn("unknown BD_ADDR {}", rem_bda); return (false); } if (p_lcb->transport != BT_TRANSPORT_LE) { - log::warn("BD_ADDR {} not LE", ADDRESS_TO_LOGGABLE_STR(rem_bda)); + log::warn("BD_ADDR {} not LE", rem_bda); return (false); } log::verbose( "BD_ADDR={}, subrate_min={}, subrate_max={}, max_latency={}, " "cont_num={}, timeout={}", - ADDRESS_TO_LOGGABLE_STR(rem_bda), subrate_min, subrate_max, max_latency, - cont_num, timeout); + rem_bda, subrate_min, subrate_max, max_latency, cont_num, timeout); p_lcb->subrate_min = subrate_min; p_lcb->subrate_max = subrate_max; diff --git a/system/stack/l2cap/l2c_link.cc b/system/stack/l2cap/l2c_link.cc index d34cec077b..90450f0d04 100644 --- a/system/stack/l2cap/l2c_link.cc +++ b/system/stack/l2cap/l2c_link.cc @@ -196,7 +196,7 @@ void l2c_link_sec_comp(const RawAddress* p_bda, tL2C_CCB* p_next_ccb; log::debug("btm_status={}, BD_ADDR={}, transport={}", btm_status_text(status), - ADDRESS_TO_LOGGABLE_CSTR(*p_bda), bt_transport_text(transport)); + *p_bda, bt_transport_text(transport)); if (status == BTM_SUCCESS_NO_SECURITY) { status = BTM_SUCCESS; @@ -1155,7 +1155,7 @@ tBTM_STATUS l2cu_ConnectAclForSecurity(const RawAddress& bd_addr) { /* Make sure an L2cap link control block is available */ if (!p_lcb && (p_lcb = l2cu_allocate_lcb(bd_addr, true, BT_TRANSPORT_BR_EDR)) == NULL) { - log::warn("failed allocate LCB for {}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("failed allocate LCB for {}", bd_addr); return BTM_NO_RESOURCES; } diff --git a/system/stack/l2cap/l2c_utils.cc b/system/stack/l2cap/l2c_utils.cc index fbe7ba8c1e..68ffd7a985 100644 --- a/system/stack/l2cap/l2c_utils.cc +++ b/system/stack/l2cap/l2c_utils.cc @@ -129,8 +129,7 @@ void l2cu_update_lcb_4_bonding(const RawAddress& p_bd_addr, bool is_bonding) { tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(p_bd_addr, BT_TRANSPORT_BR_EDR); if (p_lcb) { - log::verbose("BDA: {} is_bonding: {}", ADDRESS_TO_LOGGABLE_STR(p_bd_addr), - is_bonding); + log::verbose("BDA: {} is_bonding: {}", p_bd_addr, is_bonding); if (is_bonding) { p_lcb->SetBonding(); } else { @@ -2687,7 +2686,7 @@ bool l2cu_initialize_fixed_ccb(tL2C_LCB* p_lcb, uint16_t fixed_cid) { } else { log::warn( "Unable to cancel link control block for link connection to device {}", - ADDRESS_TO_LOGGABLE_CSTR(p_lcb->remote_bd_addr)); + p_lcb->remote_bd_addr); } /* Set CID for the connection */ @@ -3061,7 +3060,7 @@ void l2cu_send_peer_credit_based_conn_req(tL2C_CCB* p_ccb) { for (int i = 0; i < p_lcb->pending_ecoc_conn_cnt; i++) { uint16_t cid = p_lcb->pending_ecoc_connection_cids[i]; - log::verbose(" cid: {}", cid); + log::verbose("cid: {}", cid); UINT16_TO_STREAM(p, cid); } diff --git a/system/stack/pan/pan_api.cc b/system/stack/pan/pan_api.cc index 4bc51cfb66..de9807e8ef 100644 --- a/system/stack/pan/pan_api.cc +++ b/system/stack/pan/pan_api.cc @@ -328,7 +328,7 @@ tPAN_RESULT PAN_Connect(const RawAddress& rem_bda, tPAN_ROLE src_role, return PAN_NO_RESOURCES; } - log::verbose("for BD Addr: {}", ADDRESS_TO_LOGGABLE_STR(rem_bda)); + log::verbose("for BD Addr: {}", rem_bda); if (pcb->con_state == PAN_STATE_IDLE) { pan_cb.num_conns++; } else if (pcb->con_state == PAN_STATE_CONNECTED) { diff --git a/system/stack/pan/pan_utils.cc b/system/stack/pan/pan_utils.cc index 0543c76cbe..9b9ec07c5d 100644 --- a/system/stack/pan/pan_utils.cc +++ b/system/stack/pan/pan_utils.cc @@ -285,8 +285,7 @@ void pan_dump_status(void) { for (i = 0, p_pcb = pan_cb.pcb; i < MAX_PAN_CONNS; i++, p_pcb++) { log::verbose("{} state:{}, handle:{}, src{}, BD:{}", i, p_pcb->con_state, - p_pcb->handle, p_pcb->src_uuid, - ADDRESS_TO_LOGGABLE_STR(p_pcb->rem_bda)); + p_pcb->handle, p_pcb->src_uuid, p_pcb->rem_bda); } #endif } diff --git a/system/stack/rfcomm/port_api.cc b/system/stack/rfcomm/port_api.cc index c69634eeaf..7075a45ffe 100644 --- a/system/stack/rfcomm/port_api.cc +++ b/system/stack/rfcomm/port_api.cc @@ -119,8 +119,8 @@ int RFCOMM_CreateConnectionWithSecurity(uint16_t uuid, uint8_t scn, if ((scn == 0) || (scn > RFCOMM_MAX_SCN)) { // Server Channel Number (SCN) should be in range [1, 30] log::error("Invalid SCN, bd_addr={}, scn={}, is_server={}, mtu={}, uuid={}", - ADDRESS_TO_LOGGABLE_STR(bd_addr), static_cast<int>(scn), - is_server, static_cast<int>(mtu), loghex(uuid)); + bd_addr, static_cast<int>(scn), is_server, static_cast<int>(mtu), + loghex(uuid)); return (PORT_INVALID_SCN); } @@ -148,9 +148,9 @@ int RFCOMM_CreateConnectionWithSecurity(uint16_t uuid, uint8_t scn, "p_mcb={}, port={}", static_cast<int>(p_port->state), static_cast<int>(p_port->rfc.state), - (p_port->rfc.p_mcb ? p_port->rfc.p_mcb->state : 0), - ADDRESS_TO_LOGGABLE_STR(bd_addr), scn, is_server, mtu, loghex(uuid), - dlci, fmt::ptr(p_mcb), p_port->handle); + (p_port->rfc.p_mcb ? p_port->rfc.p_mcb->state : 0), bd_addr, scn, + is_server, mtu, loghex(uuid), dlci, fmt::ptr(p_mcb), + p_port->handle); *p_handle = p_port->handle; return (PORT_ALREADY_OPENED); } @@ -163,8 +163,7 @@ int RFCOMM_CreateConnectionWithSecurity(uint16_t uuid, uint8_t scn, log::error( "no resources, bd_addr={}, scn={}, is_server={}, mtu={}, uuid={}, " "dlci={}", - ADDRESS_TO_LOGGABLE_STR(bd_addr), scn, is_server, mtu, loghex(uuid), - dlci); + bd_addr, scn, is_server, mtu, loghex(uuid), dlci); return PORT_NO_RESOURCES; } p_port->sec_mask = sec_mask; @@ -225,7 +224,7 @@ int RFCOMM_CreateConnectionWithSecurity(uint16_t uuid, uint8_t scn, log::info( "bd_addr={}, scn={}, is_server={}, mtu={}, uuid={}, dlci={}, " "signal_state={}, p_port={}", - ADDRESS_TO_LOGGABLE_STR(bd_addr), scn, is_server, mtu, loghex(uuid), dlci, + bd_addr, scn, is_server, mtu, loghex(uuid), dlci, loghex(p_port->default_signal_state), fmt::ptr(p_port)); // If this is not initiator of the connection need to just wait diff --git a/system/stack/rfcomm/port_rfc.cc b/system/stack/rfcomm/port_rfc.cc index c99da81849..27b840a083 100644 --- a/system/stack/rfcomm/port_rfc.cc +++ b/system/stack/rfcomm/port_rfc.cc @@ -279,8 +279,7 @@ void PORT_StartInd(tRFC_MCB* p_mcb) { ******************************************************************************/ void PORT_ParNegInd(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, uint8_t cl, uint8_t k) { - log::verbose("bd_addr={}, dlci={}, mtu={}", - ADDRESS_TO_LOGGABLE_CSTR(p_mcb->bd_addr), dlci, mtu); + log::verbose("bd_addr={}, dlci={}, mtu={}", p_mcb->bd_addr, dlci, mtu); tPORT* p_port = port_find_mcb_dlci_port(p_mcb, dlci); if (!p_port) { /* This can be a first request for this port */ @@ -288,7 +287,7 @@ void PORT_ParNegInd(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, uint8_t cl, if (!p_port) { log::error( "Disconnect RFCOMM, port not found, dlci={}, p_mcb={}, bd_addr={}", - dlci, fmt::ptr(p_mcb), ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr)); + dlci, fmt::ptr(p_mcb), p_mcb->bd_addr); /* If the port cannot be opened, send a DM. Per Errata 1205 */ rfc_send_dm(p_mcb, dlci, false); /* check if this is the last port open, some headsets have @@ -370,7 +369,7 @@ void PORT_ParNegCnf(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu, uint8_t cl, log::verbose("PORT_ParNegCnf dlci:{} mtu:{} cl: {} k: {}", dlci, mtu, cl, k); tPORT* p_port = port_find_mcb_dlci_port(p_mcb, dlci); if (!p_port) { - log::warn("port is null for {}", ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr)); + log::warn("port is null for {}", p_mcb->bd_addr); return; } @@ -418,8 +417,7 @@ void PORT_DlcEstablishInd(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu) { tPORT* p_port = port_find_mcb_dlci_port(p_mcb, dlci); log::verbose("p_mcb:{}, dlci:{} mtu:{}i, p_port:{}, bd_addr:{}", - fmt::ptr(p_mcb), dlci, mtu, fmt::ptr(p_port), - ADDRESS_TO_LOGGABLE_CSTR(p_mcb->bd_addr)); + fmt::ptr(p_mcb), dlci, mtu, fmt::ptr(p_port), p_mcb->bd_addr); if (!p_port) { /* This can be a first request for this port */ @@ -698,8 +696,7 @@ void PORT_LineStatusInd(tRFC_MCB* p_mcb, uint8_t dlci, uint8_t line_status) { * ******************************************************************************/ void PORT_DlcReleaseInd(tRFC_MCB* p_mcb, uint8_t dlci) { - log::verbose("dlci:{}, bd_addr:{}", dlci, - ADDRESS_TO_LOGGABLE_CSTR(p_mcb->bd_addr)); + log::verbose("dlci:{}, bd_addr:{}", dlci, p_mcb->bd_addr); tPORT* p_port = port_find_mcb_dlci_port(p_mcb, dlci); if (!p_port) return; port_rfc_closed(p_port, PORT_CLOSED); @@ -1025,8 +1022,7 @@ void port_rfc_closed(tPORT* p_port, uint8_t res) { "RFCOMM connection closed, index={}, state={}, reason={}[{}], UUID={}, " "bd_addr={}, is_server={}", p_port->handle, p_port->state, PORT_GetResultString(res), res, - loghex(p_port->uuid), ADDRESS_TO_LOGGABLE_STR(p_port->bd_addr), - p_port->is_server); + loghex(p_port->uuid), p_port->bd_addr, p_port->is_server); port_release_port(p_port); } diff --git a/system/stack/rfcomm/port_utils.cc b/system/stack/rfcomm/port_utils.cc index bf86a63a5d..04cab150d5 100644 --- a/system/stack/rfcomm/port_utils.cc +++ b/system/stack/rfcomm/port_utils.cc @@ -89,13 +89,11 @@ tPORT* port_allocate_port(uint8_t dlci, const RawAddress& bd_addr) { rfc_cb.rfc.last_port_index = port_index; log::verbose( "rfc_cb.port.port[{}]:{} chosen, last_port_index:{}, bd_addr={}", - port_index, fmt::ptr(p_port), rfc_cb.rfc.last_port_index, - ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + port_index, fmt::ptr(p_port), rfc_cb.rfc.last_port_index, bd_addr); return p_port; } } - log::warn("running out of free ports for dlci {}, bd_addr {}", dlci, - ADDRESS_TO_LOGGABLE_STR(bd_addr)); + log::warn("running out of free ports for dlci {}, bd_addr {}", dlci, bd_addr); return nullptr; } @@ -152,8 +150,7 @@ void port_select_mtu(tPORT* p_port) { get_btm_client_interface().peer.BTM_GetMaxPacketSize(p_port->bd_addr); if (packet_size == 0) { /* something is very wrong */ - log::warn("bad packet size 0 for{}", - ADDRESS_TO_LOGGABLE_STR(p_port->bd_addr)); + log::warn("bad packet size 0 for{}", p_port->bd_addr); p_port->mtu = RFCOMM_DEFAULT_MTU; } else { /* We try to negotiate MTU that each packet can be split into whole @@ -287,13 +284,12 @@ tRFC_MCB* port_find_mcb(const RawAddress& bd_addr) { for (tRFC_MCB& mcb : rfc_cb.port.rfc_mcb) { if ((mcb.state != RFC_MX_STATE_IDLE) && (mcb.bd_addr == bd_addr)) { /* Multiplexer channel found do not change anything */ - log::verbose("found, bd_addr:{}, rfc_mcb:{}, lcid:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), fmt::ptr(&mcb), - loghex(mcb.lcid)); + log::verbose("found, bd_addr:{}, rfc_mcb:{}, lcid:{}", bd_addr, + fmt::ptr(&mcb), loghex(mcb.lcid)); return &mcb; } } - log::warn("not found, bd_addr:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::warn("not found, bd_addr:{}", bd_addr); return nullptr; } @@ -317,7 +313,7 @@ tPORT* port_find_mcb_dlci_port(tRFC_MCB* p_mcb, uint8_t dlci) { if (dlci > RFCOMM_MAX_DLCI) { log::warn("DLCI {} is too large, bd_addr={}, p_mcb={}", dlci, - ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr), fmt::ptr(p_mcb)); + p_mcb->bd_addr, fmt::ptr(p_mcb)); return nullptr; } @@ -325,7 +321,7 @@ tPORT* port_find_mcb_dlci_port(tRFC_MCB* p_mcb, uint8_t dlci) { if (handle == 0) { log::info( "Cannot find allocated RFCOMM app port for DLCI {} on {}, p_mcb={}", - dlci, ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr), fmt::ptr(p_mcb)); + dlci, p_mcb->bd_addr, fmt::ptr(p_mcb)); return nullptr; } return &rfc_cb.port.port[handle - 1]; diff --git a/system/stack/rfcomm/rfc_l2cap_if.cc b/system/stack/rfcomm/rfc_l2cap_if.cc index a97475c6f2..5f5099d862 100644 --- a/system/stack/rfcomm/rfc_l2cap_if.cc +++ b/system/stack/rfcomm/rfc_l2cap_if.cc @@ -268,8 +268,7 @@ void RFCOMM_BufDataInd(uint16_t lcid, BT_HDR* p_buf) { /* If the frame did not pass validation just ignore it */ if (event == RFC_EVENT_BAD_FRAME) { log::warn("Bad RFCOMM frame from lcid={}, bd_addr={}, p_mcb={}", - loghex(lcid), ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr), - fmt::ptr(p_mcb)); + loghex(lcid), p_mcb->bd_addr, fmt::ptr(p_mcb)); osi_free(p_buf); return; } @@ -295,13 +294,11 @@ void RFCOMM_BufDataInd(uint16_t lcid, BT_HDR* p_buf) { /* If this is a SABME on new port, check if any app is waiting for it */ if (event != RFC_EVENT_SABME) { log::warn("no for none-SABME event, lcid={}, bd_addr={}, p_mcb={}", - loghex(lcid), ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr), - fmt::ptr(p_mcb)); + loghex(lcid), p_mcb->bd_addr, fmt::ptr(p_mcb)); if ((p_mcb->is_initiator && !rfc_cb.rfc.rx_frame.cr) || (!p_mcb->is_initiator && rfc_cb.rfc.rx_frame.cr)) { log::error("Disconnecting RFCOMM, lcid={}, bd_addr={}, p_mcb={}", - loghex(lcid), ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr), - fmt::ptr(p_mcb)); + loghex(lcid), p_mcb->bd_addr, fmt::ptr(p_mcb)); rfc_send_dm(p_mcb, rfc_cb.rfc.rx_frame.dlci, rfc_cb.rfc.rx_frame.pf); } osi_free(p_buf); @@ -313,8 +310,8 @@ void RFCOMM_BufDataInd(uint16_t lcid, BT_HDR* p_buf) { log::error( "Disconnecting RFCOMM, no port for dlci {}, lcid={}, bd_addr={}, " "p_mcb={}", - rfc_cb.rfc.rx_frame.dlci, loghex(lcid), - ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr), fmt::ptr(p_mcb)); + rfc_cb.rfc.rx_frame.dlci, loghex(lcid), p_mcb->bd_addr, + fmt::ptr(p_mcb)); rfc_send_dm(p_mcb, rfc_cb.rfc.rx_frame.dlci, true); osi_free(p_buf); return; diff --git a/system/stack/rfcomm/rfc_mx_fsm.cc b/system/stack/rfcomm/rfc_mx_fsm.cc index 4d853aea67..1582d1da99 100644 --- a/system/stack/rfcomm/rfc_mx_fsm.cc +++ b/system/stack/rfcomm/rfc_mx_fsm.cc @@ -74,8 +74,7 @@ static void rfc_mx_conf_cnf(tRFC_MCB* p_mcb, uint16_t result); void rfc_mx_sm_execute(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_data) { log::assert_that(p_mcb != nullptr, "NULL mcb for event {}", event); - log::info("RFCOMM peer:{} event:{} state:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_mcb->bd_addr), event, + log::info("RFCOMM peer:{} event:{} state:{}", p_mcb->bd_addr, event, rfcomm_mx_state_text(static_cast<tRFC_MX_STATE>(p_mcb->state))); switch (p_mcb->state) { @@ -132,8 +131,7 @@ void rfc_mx_sm_state_idle(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_data) { uint16_t lcid = L2CA_ConnectReq(BT_PSM_RFCOMM, p_mcb->bd_addr); if (lcid == 0) { - log::error("failed to open L2CAP channel for {}", - ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr)); + log::error("failed to open L2CAP channel for {}", p_mcb->bd_addr); rfc_save_lcid_mcb(nullptr, p_mcb->lcid); p_mcb->lcid = 0; PORT_StartCnf(p_mcb, RFCOMM_ERROR); @@ -294,8 +292,7 @@ void rfc_mx_sm_state_configure(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, return; case RFC_MX_EVENT_TIMEOUT: - log::error("L2CAP configuration timeout for {}", - ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr)); + log::error("L2CAP configuration timeout for {}", p_mcb->bd_addr); p_mcb->state = RFC_MX_STATE_IDLE; L2CA_DisconnectReq(p_mcb->lcid); @@ -607,11 +604,10 @@ void rfc_on_l2cap_error(uint16_t lcid, uint16_t result) { p_mcb->lcid = lcid; rfc_mx_sm_execute(p_mcb, RFC_MX_EVENT_CONN_CNF, &result); } else if (result == L2CAP_CFG_FAILED_NO_REASON) { - log::error("failed to configure L2CAP for {}", - ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr)); + log::error("failed to configure L2CAP for {}", p_mcb->bd_addr); if (p_mcb->is_initiator) { log::error("disconnect L2CAP due to config failure for {}", - ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr)); + p_mcb->bd_addr); PORT_StartCnf(p_mcb, result); L2CA_DisconnectReq(p_mcb->lcid); } diff --git a/system/stack/rfcomm/rfc_port_fsm.cc b/system/stack/rfcomm/rfc_port_fsm.cc index bd203cce96..66eaa92249 100644 --- a/system/stack/rfcomm/rfc_port_fsm.cc +++ b/system/stack/rfcomm/rfc_port_fsm.cc @@ -85,9 +85,8 @@ void rfc_port_sm_execute(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data) { // logs for state RFC_STATE_OPENED handled in rfc_port_sm_opened() if (p_port->rfc.state != RFC_STATE_OPENED) { - log::info("bd_addr:{}, index:{}, state:{}, event:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->handle, - p_port->rfc.state, event); + log::info("bd_addr:{}, index:{}, state:{}, event:{}", p_port->bd_addr, + p_port->handle, p_port->rfc.state, event); } switch (p_port->rfc.state) { case RFC_STATE_CLOSED: @@ -462,14 +461,13 @@ void rfc_port_sm_orig_wait_sec_check(tPORT* p_port, tRFC_PORT_EVENT event, void rfc_port_sm_opened(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data) { switch (event) { case RFC_PORT_EVENT_OPEN: - log::error("Port error, bd_addr={}, state={}, event={}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->rfc.state, - event); + log::error("Port error, bd_addr={}, state={}, event={}", p_port->bd_addr, + p_port->rfc.state, event); return; case RFC_PORT_EVENT_CLOSE: - log::info("RFC_PORT_EVENT_CLOSE bd_addr={}, index={}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->handle); + log::info("RFC_PORT_EVENT_CLOSE bd_addr={}, index={}", p_port->bd_addr, + p_port->handle); rfc_port_timer_start(p_port, RFC_DISC_TIMEOUT); rfc_send_disc(p_port->rfc.p_mcb, p_port->dlci); p_port->rfc.expected_rsp = 0; @@ -477,8 +475,8 @@ void rfc_port_sm_opened(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data) { return; case RFC_PORT_EVENT_CLEAR: - log::warn("RFC_PORT_EVENT_CLEAR, bd_addr={}, index={}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->handle); + log::warn("RFC_PORT_EVENT_CLEAR, bd_addr={}, index={}", p_port->bd_addr, + p_port->handle); rfc_port_closed(p_port); return; @@ -488,8 +486,8 @@ void rfc_port_sm_opened(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data) { /* There might be an initial case when we reduced rx_max and credit_rx is * still */ /* bigger. Make sure that we do not send 255 */ - log::verbose("RFC_PORT_EVENT_DATA bd_addr={}, index={}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->handle); + log::verbose("RFC_PORT_EVENT_DATA bd_addr={}, index={}", p_port->bd_addr, + p_port->handle); if ((p_port->rfc.p_mcb->flow == PORT_FC_CREDIT) && (((BT_HDR*)p_data)->len < p_port->peer_mtu) && (!p_port->rx.user_fc) && @@ -505,27 +503,26 @@ void rfc_port_sm_opened(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data) { return; case RFC_PORT_EVENT_UA: - log::verbose("RFC_PORT_EVENT_UA bd_addr={}, index={}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->handle); + log::verbose("RFC_PORT_EVENT_UA bd_addr={}, index={}", p_port->bd_addr, + p_port->handle); return; case RFC_PORT_EVENT_SABME: - log::verbose("RFC_PORT_EVENT_SABME bd_addr={}, index={}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->handle); + log::verbose("RFC_PORT_EVENT_SABME bd_addr={}, index={}", p_port->bd_addr, + p_port->handle); rfc_send_ua(p_port->rfc.p_mcb, p_port->dlci); return; case RFC_PORT_EVENT_DM: - log::info("RFC_EVENT_DM, bd_addr={}, index={}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->handle); + log::info("RFC_EVENT_DM, bd_addr={}, index={}", p_port->bd_addr, + p_port->handle); PORT_DlcReleaseInd(p_port->rfc.p_mcb, p_port->dlci); rfc_port_closed(p_port); return; case RFC_PORT_EVENT_DISC: - log::info("RFC_PORT_EVENT_DISC, bd_addr={}, index={}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->handle, - p_port->rfc.state, event); + log::info("RFC_PORT_EVENT_DISC, bd_addr={}, index={}", p_port->bd_addr, + p_port->handle, p_port->rfc.state, event); p_port->rfc.state = RFC_STATE_CLOSED; rfc_send_ua(p_port->rfc.p_mcb, p_port->dlci); if (!fixed_queue_is_empty(p_port->rx.queue)) { @@ -537,20 +534,19 @@ void rfc_port_sm_opened(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data) { return; case RFC_PORT_EVENT_UIH: - log::verbose("RFC_PORT_EVENT_UIH bd_addr={}, index={}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->handle); + log::verbose("RFC_PORT_EVENT_UIH bd_addr={}, index={}", p_port->bd_addr, + p_port->handle); rfc_port_uplink_data(p_port, (BT_HDR*)p_data); return; case RFC_PORT_EVENT_TIMEOUT: PORT_TimeOutCloseMux(p_port->rfc.p_mcb); - log::error("Port error, bd_addr={}, state={}, event={}", - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->rfc.state, - event); + log::error("Port error, bd_addr={}, state={}, event={}", p_port->bd_addr, + p_port->rfc.state, event); return; default: log::error("Received unexpected event {}, bd_addr={}, state={}", event, - ADDRESS_TO_LOGGABLE_CSTR(p_port->bd_addr), p_port->rfc.state); + p_port->bd_addr, p_port->rfc.state); } log::warn("Port state opened Event ignored {}", event); } @@ -638,8 +634,7 @@ void rfc_port_uplink_data(tPORT* p_port, BT_HDR* p_buf) { ******************************************************************************/ void rfc_process_pn(tRFC_MCB* p_mcb, bool is_command, MX_FRAME* p_frame) { log::verbose("is_initiator={}, is_cmd={}, state={}, bd_addr={}", - p_mcb->is_initiator, is_command, p_mcb->state, - ADDRESS_TO_LOGGABLE_CSTR(p_mcb->bd_addr)); + p_mcb->is_initiator, is_command, p_mcb->state, p_mcb->bd_addr); uint8_t dlci = p_frame->dlci; if (is_command) { @@ -649,7 +644,7 @@ void rfc_process_pn(tRFC_MCB* p_mcb, bool is_command, MX_FRAME* p_frame) { p_frame->u.pn.k); } else { log::warn("MX PN while disconnecting, bd_addr={}, p_mcb={}", - ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr), fmt::ptr(p_mcb)); + p_mcb->bd_addr, fmt::ptr(p_mcb)); rfc_send_dm(p_mcb, dlci, false); } @@ -659,7 +654,7 @@ void rfc_process_pn(tRFC_MCB* p_mcb, bool is_command, MX_FRAME* p_frame) { tPORT* p_port = port_find_mcb_dlci_port(p_mcb, dlci); if ((p_port == nullptr) || !(p_port->rfc.expected_rsp & RFC_RSP_PN)) { log::warn(": Ignore unwanted response, p_mcb={}, bd_addr={}, dlci={}", - fmt::ptr(p_mcb), ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr), dlci); + fmt::ptr(p_mcb), p_mcb->bd_addr, dlci); return; } diff --git a/system/stack/rfcomm/rfc_ts_frames.cc b/system/stack/rfcomm/rfc_ts_frames.cc index 3328fe7631..35a3ea07c2 100644 --- a/system/stack/rfcomm/rfc_ts_frames.cc +++ b/system/stack/rfcomm/rfc_ts_frames.cc @@ -652,7 +652,7 @@ void rfc_process_mx_message(tRFC_MCB* p_mcb, BT_HDR* p_buf) { if (!p_rx_frame->ea || !length) { log::error("Invalid MX frame ea={}, len={}, bd_addr={}", p_rx_frame->ea, - length, ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr)); + length, p_mcb->bd_addr); osi_free(p_buf); return; } @@ -678,18 +678,17 @@ void rfc_process_mx_message(tRFC_MCB* p_mcb, BT_HDR* p_buf) { if (mx_len != length) { log::error("Bad MX frame, p_mcb={}, bd_addr={}", fmt::ptr(p_mcb), - ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr)); + p_mcb->bd_addr); osi_free(p_buf); return; } - log::verbose("type=0x{:02x}, bd_addr={}", p_rx_frame->type, - ADDRESS_TO_LOGGABLE_CSTR(p_mcb->bd_addr)); + log::verbose("type=0x{:02x}, bd_addr={}", p_rx_frame->type, p_mcb->bd_addr); switch (p_rx_frame->type) { case RFCOMM_MX_PN: if (length != RFCOMM_MX_PN_LEN) { log::error("Invalid PN length, p_mcb={}, bd_addr={}", fmt::ptr(p_mcb), - ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr)); + p_mcb->bd_addr); break; } @@ -707,7 +706,7 @@ void rfc_process_mx_message(tRFC_MCB* p_mcb, BT_HDR* p_buf) { (p_rx_frame->u.pn.mtu < RFCOMM_MIN_MTU) || (p_rx_frame->u.pn.mtu > RFCOMM_MAX_MTU)) { log::error("Bad PN frame, p_mcb={}, bd_addr={}", fmt::ptr(p_mcb), - ADDRESS_TO_LOGGABLE_STR(p_mcb->bd_addr)); + p_mcb->bd_addr); break; } diff --git a/system/stack/rfcomm/rfc_utils.cc b/system/stack/rfcomm/rfc_utils.cc index 6bb6385056..6a76b4b1dc 100644 --- a/system/stack/rfcomm/rfc_utils.cc +++ b/system/stack/rfcomm/rfc_utils.cc @@ -134,13 +134,11 @@ tRFC_MCB* rfc_alloc_multiplexer_channel(const RawAddress& bd_addr, bool is_initiator) { int i, j; tRFC_MCB* p_mcb = NULL; - log::verbose("bd_addr:{}, is_initiator:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - is_initiator); + log::verbose("bd_addr:{}, is_initiator:{}", bd_addr, is_initiator); for (i = 0; i < MAX_BD_CONNECTIONS; i++) { log::verbose("rfc_cb.port.rfc_mcb[{}] - state:{}, bd_addr:{}", i, - rfc_cb.port.rfc_mcb[i].state, - ADDRESS_TO_LOGGABLE_CSTR(rfc_cb.port.rfc_mcb[i].bd_addr)); + rfc_cb.port.rfc_mcb[i].state, rfc_cb.port.rfc_mcb[i].bd_addr); if ((rfc_cb.port.rfc_mcb[i].state != RFC_MX_STATE_IDLE) && rfc_cb.port.rfc_mcb[i].bd_addr == bd_addr) { diff --git a/system/stack/sdp/sdp_main.cc b/system/stack/sdp/sdp_main.cc index c8d1fb7d5c..d65b777911 100644 --- a/system/stack/sdp/sdp_main.cc +++ b/system/stack/sdp/sdp_main.cc @@ -330,12 +330,11 @@ tCONN_CB* sdp_conn_originate(const RawAddress& p_bd_addr) { /* Allocate a new CCB. Return if none available. */ p_ccb = sdpu_allocate_ccb(); if (p_ccb == NULL) { - log::warn("no spare CCB for peer {}", ADDRESS_TO_LOGGABLE_CSTR(p_bd_addr)); + log::warn("no spare CCB for peer {}", p_bd_addr); return (NULL); } - log::verbose("SDP - Originate started for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_bd_addr)); + log::verbose("SDP - Originate started for peer {}", p_bd_addr); /* Look for any active sdp connection on the remote device */ cid = sdpu_get_active_ccb_cid(p_bd_addr); @@ -353,14 +352,12 @@ tCONN_CB* sdp_conn_originate(const RawAddress& p_bd_addr) { cid = L2CA_ConnectReq2(BT_PSM_SDP, p_bd_addr, BTM_SEC_NONE); } else { p_ccb->con_state = SDP_STATE_CONN_PEND; - log::warn("SDP already active for peer {}. cid={:#0x}", - ADDRESS_TO_LOGGABLE_CSTR(p_bd_addr), cid); + log::warn("SDP already active for peer {}. cid={:#0x}", p_bd_addr, cid); } /* Check if L2CAP started the connection process */ if (cid == 0) { - log::warn("SDP - Originate failed for peer {}", - ADDRESS_TO_LOGGABLE_CSTR(p_bd_addr)); + log::warn("SDP - Originate failed for peer {}", p_bd_addr); sdpu_release_ccb(*p_ccb); return (NULL); } diff --git a/system/stack/sdp/sdp_server.cc b/system/stack/sdp/sdp_server.cc index f702ad6670..f524bb9b59 100644 --- a/system/stack/sdp/sdp_server.cc +++ b/system/stack/sdp/sdp_server.cc @@ -183,8 +183,7 @@ bool sdp_dynamic_change_hfp_version(const tSDP_ATTRIBUTE* p_attr, p_attr->value_ptr[PROFILE_VERSION_POSITION] = HFP_PROFILE_MINOR_VERSION_7; } log::verbose("SDP Change HFP Version = {} for {}", - p_attr->value_ptr[PROFILE_VERSION_POSITION], - ADDRESS_TO_LOGGABLE_CSTR(remote_address)); + p_attr->value_ptr[PROFILE_VERSION_POSITION], remote_address); return true; } /****************************************************************************** @@ -1129,8 +1128,8 @@ static uint16_t sdp_pbap_pse_dynamic_attributes_len_update( log::verbose( "remote BD Addr : {} is_pbap_102_supported = {} is_pbap_101_allowlisted " "= {} is_pbap_102_allowlisted = {} running_pts = {}", - ADDRESS_TO_LOGGABLE_CSTR(p_ccb->device_address), is_pbap_102_supported, - is_pbap_101_allowlisted, is_pbap_102_allowlisted, running_pts); + p_ccb->device_address, is_pbap_102_supported, is_pbap_101_allowlisted, + is_pbap_102_allowlisted, running_pts); if (is_pbap_101_allowlisted || (!is_pbap_102_supported && !is_pbap_102_allowlisted && !running_pts)) { @@ -1225,8 +1224,8 @@ static const tSDP_RECORD* sdp_upgrade_pse_record(const tSDP_RECORD* p_rec, log::verbose( "remote BD Addr : {} is_pbap_102_supported : {} is_pbap_101_allowlisted " "= {} is_pbap_102_allowlisted = {} running_pts = {}", - ADDRESS_TO_LOGGABLE_CSTR(remote_address), is_pbap_102_supported, - is_pbap_101_allowlisted, is_pbap_102_allowlisted, running_pts); + remote_address, is_pbap_102_supported, is_pbap_101_allowlisted, + is_pbap_102_allowlisted, running_pts); if (is_pbap_101_allowlisted || (!is_pbap_102_supported && !is_pbap_102_allowlisted && !running_pts)) { @@ -1286,11 +1285,9 @@ void update_pce_entry_to_interop_database(RawAddress remote_addr) { if (!interop_match_addr_or_name(INTEROP_ADV_PBAP_VER_1_2, &remote_addr, &btif_storage_get_remote_device_property)) { interop_database_add_addr(INTEROP_ADV_PBAP_VER_1_2, &remote_addr, 3); - log::verbose("device: {} is added into interop list", - ADDRESS_TO_LOGGABLE_CSTR(remote_addr)); + log::verbose("device: {} is added into interop list", remote_addr); } else { - log::warn("device: {} is already found on interop list", - ADDRESS_TO_LOGGABLE_CSTR(remote_addr)); + log::warn("device: {} is already found on interop list", remote_addr); } } diff --git a/system/stack/sdp/sdp_utils.cc b/system/stack/sdp/sdp_utils.cc index 3c7c6c7788..14d485aeb9 100644 --- a/system/stack/sdp/sdp_utils.cc +++ b/system/stack/sdp/sdp_utils.cc @@ -198,8 +198,7 @@ void sdpu_log_attribute_metrics(const RawAddress& bda, p_rec = p_rec->p_next_rec) { uint16_t service_uuid = sdpu_find_most_specific_service_uuid(p_rec); if (service_uuid == 0) { - log::info("skipping record without service uuid {}", - ADDRESS_TO_LOGGABLE_STR(bda)); + log::info("skipping record without service uuid {}", bda); continue; } // Log the existence of a profile role @@ -1482,7 +1481,7 @@ void sdpu_set_avrc_target_version(const tSDP_ATTRIBUTE* p_attr, log::info("SDP AVRCP DB Version {:x}", avrcp_version); if (avrcp_version == 0) { log::info("Not AVRCP version attribute or version not valid for device {}", - ADDRESS_TO_LOGGABLE_CSTR(*bdaddr)); + *bdaddr); return; } @@ -1510,7 +1509,7 @@ void sdpu_set_avrc_target_version(const tSDP_ATTRIBUTE* p_attr, log::info( "device={} is in IOP database. Reply AVRC Target version {:x} instead " "of {:x}.", - ADDRESS_TO_LOGGABLE_CSTR(*bdaddr), iop_version, avrcp_version); + *bdaddr, iop_version, avrcp_version); uint8_t* p_version = p_attr->value_ptr + 6; UINT16_TO_BE_FIELD(p_version, iop_version); return; @@ -1530,8 +1529,7 @@ void sdpu_set_avrc_target_version(const tSDP_ATTRIBUTE* p_attr, bdaddr->ToString(), BTIF_STORAGE_KEY_AVRCP_CONTROLLER_VERSION); if (version_value_size != sizeof(cached_version)) { log::error("cached value len wrong, bdaddr={}. Len is {} but should be {}.", - ADDRESS_TO_LOGGABLE_CSTR(*bdaddr), version_value_size, - sizeof(cached_version)); + *bdaddr, version_value_size, sizeof(cached_version)); return; } @@ -1541,7 +1539,7 @@ void sdpu_set_avrc_target_version(const tSDP_ATTRIBUTE* p_attr, log::info( "no cached AVRC Controller version for {}. Reply default AVRC Target " "version {:x}.DUT AVRC Target version {:x}.", - ADDRESS_TO_LOGGABLE_CSTR(*bdaddr), avrcp_version, dut_avrcp_version); + *bdaddr, avrcp_version, dut_avrcp_version); return; } @@ -1549,7 +1547,7 @@ void sdpu_set_avrc_target_version(const tSDP_ATTRIBUTE* p_attr, log::error( "cached AVRC Controller version {:x} of {} is not valid. Reply default " "AVRC Target version {:x}.", - cached_version, ADDRESS_TO_LOGGABLE_CSTR(*bdaddr), avrcp_version); + cached_version, *bdaddr, avrcp_version); return; } @@ -1564,8 +1562,7 @@ void sdpu_set_avrc_target_version(const tSDP_ATTRIBUTE* p_attr, log::info( "read cached AVRC Controller version {:x} of {}. DUT AVRC Target version " "{:x}.Negotiated AVRCP version to update peer {:x}.", - cached_version, ADDRESS_TO_LOGGABLE_CSTR(*bdaddr), dut_avrcp_version, - negotiated_avrcp_version); + cached_version, *bdaddr, dut_avrcp_version, negotiated_avrcp_version); uint8_t* p_version = p_attr->value_ptr + 6; UINT16_TO_BE_FIELD(p_version, negotiated_avrcp_version); } @@ -1594,8 +1591,7 @@ void sdpu_set_avrc_target_features(const tSDP_ATTRIBUTE* p_attr, } if (avrcp_version == 0) { - log::info("AVRCP version not valid for device {}", - ADDRESS_TO_LOGGABLE_CSTR(*bdaddr)); + log::info("AVRCP version not valid for device {}", *bdaddr); return; } @@ -1612,8 +1608,7 @@ void sdpu_set_avrc_target_features(const tSDP_ATTRIBUTE* p_attr, bdaddr->ToString(), BTIF_STORAGE_KEY_AV_REM_CTRL_FEATURES); if (version_value_size != sizeof(avrcp_peer_features)) { log::error("cached value len wrong, bdaddr={}. Len is {} but should be {}.", - ADDRESS_TO_LOGGABLE_CSTR(*bdaddr), version_value_size, - sizeof(avrcp_peer_features)); + *bdaddr, version_value_size, sizeof(avrcp_peer_features)); return; } diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc index 5ff9fc4804..4328533b7e 100644 --- a/system/stack/smp/smp_act.cc +++ b/system/stack/smp/smp_act.cc @@ -116,7 +116,7 @@ void smp_send_app_cback(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { tBTM_STATUS callback_rc; uint8_t remote_lmp_version = 0; - log::debug("addr:{} event:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda), + log::debug("addr:{} event:{}", p_cb->pairing_bda, smp_evt_to_text(p_cb->cb_evt)); if (p_cb->p_callback && p_cb->cb_evt != 0) { @@ -289,7 +289,7 @@ void smp_send_pair_fail(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { ******************************************************************************/ void smp_send_pair_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(p_cb->pairing_bda); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); /* erase all keys when central sends pairing req*/ if (p_dev_rec) btm_sec_clear_ble_keys(p_dev_rec); @@ -303,7 +303,7 @@ void smp_send_pair_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description actions related to sending pairing response ******************************************************************************/ void smp_send_pair_rsp(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p_cb->local_i_key &= p_cb->peer_i_key; p_cb->local_r_key &= p_cb->peer_r_key; @@ -321,7 +321,7 @@ void smp_send_pair_rsp(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description send confirmation to the peer ******************************************************************************/ void smp_send_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_send_cmd(SMP_OPCODE_CONFIRM, p_cb); } @@ -330,7 +330,7 @@ void smp_send_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description send pairing random to the peer ******************************************************************************/ void smp_send_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_send_cmd(SMP_OPCODE_RAND, p_cb); } @@ -339,7 +339,7 @@ void smp_send_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description send pairing public key command to the peer ******************************************************************************/ void smp_send_pair_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_send_cmd(SMP_OPCODE_PAIR_PUBLIC_KEY, p_cb); } @@ -348,7 +348,7 @@ void smp_send_pair_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description send commitment command to the peer ******************************************************************************/ void smp_send_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_send_cmd(SMP_OPCODE_PAIR_COMMITM, p_cb); } @@ -357,7 +357,7 @@ void smp_send_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description send DHKey Check command to the peer ******************************************************************************/ void smp_send_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_send_cmd(SMP_OPCODE_PAIR_DHKEY_CHECK, p_cb); } @@ -403,7 +403,7 @@ void smp_send_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description send ID information command. ******************************************************************************/ void smp_send_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_ID, false); smp_send_cmd(SMP_OPCODE_IDENTITY_INFO, p_cb); @@ -418,7 +418,7 @@ void smp_send_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { /** send CSRK command. */ void smp_send_csrk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_CSRK, false); if (smp_send_cmd(SMP_OPCODE_SIGN_INFO, p_cb)) { @@ -442,7 +442,7 @@ void smp_send_csrk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description send LTK reply ******************************************************************************/ void smp_send_ltk_reply(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); Octet16 stk; memcpy(stk.data(), p_data->key.p_data, stk.size()); @@ -513,7 +513,7 @@ void smp_proc_sec_req(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { ******************************************************************************/ void smp_proc_sec_grant(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t res = p_data->status; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (res != SMP_SUCCESS) { smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, p_data); } else /*otherwise, start pairing */ @@ -528,7 +528,7 @@ void smp_proc_sec_grant(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description process pairing failure from peer device ******************************************************************************/ void smp_proc_pair_fail(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->rcvd_cmd_len < 2) { log::warn("rcvd_cmd_len {} too short: must be at least 2", @@ -554,7 +554,7 @@ void smp_proc_pair_cmd(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = p_data->p_data; tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(p_cb->pairing_bda); - log::verbose("pairing_bda={}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("pairing_bda={}", p_cb->pairing_bda); /* erase all keys if it is peripheral proc pairing req */ if (p_dev_rec && (p_cb->role == HCI_ROLE_PERIPHERAL)) @@ -652,7 +652,7 @@ void smp_proc_pair_cmd(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { /** process pairing confirm from peer device */ void smp_proc_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("pairing_bda={}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("pairing_bda={}", p_cb->pairing_bda); if (smp_command_has_invalid_parameters(p_cb)) { tSMP_INT_DATA smp_int_data; @@ -679,7 +679,7 @@ void smp_proc_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_proc_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = p_data->p_data; - log::verbose("pairing_bda={}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("pairing_bda={}", p_cb->pairing_bda); if (smp_command_has_invalid_parameters(p_cb)) { tSMP_INT_DATA smp_int_data; @@ -703,7 +703,7 @@ void smp_proc_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_process_pairing_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = p_data->p_data; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (smp_command_has_invalid_parameters(p_cb)) { tSMP_INT_DATA smp_int_data; @@ -746,7 +746,7 @@ void smp_process_pairing_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_process_pairing_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = p_data->p_data; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (smp_command_has_invalid_parameters(p_cb)) { tSMP_INT_DATA smp_int_data; @@ -769,7 +769,7 @@ void smp_process_pairing_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_process_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = p_data->p_data; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (smp_command_has_invalid_parameters(p_cb)) { tSMP_INT_DATA smp_int_data; @@ -792,7 +792,7 @@ void smp_process_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_process_keypress_notification(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = p_data->p_data; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p_cb->status = p_data->status; if (smp_command_has_invalid_parameters(p_cb)) { @@ -819,7 +819,7 @@ void smp_br_process_pairing_command(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = p_data->p_data; tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(p_cb->pairing_bda); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); /* rejecting BR pairing request over non-SC BR link */ if (!p_dev_rec->sec_rec.new_encryption_key_is_p256 && p_cb->role == HCI_ROLE_PERIPHERAL) { @@ -884,7 +884,7 @@ void smp_br_process_pairing_command(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description process security grant in case of pairing over BR/EDR transport. ******************************************************************************/ void smp_br_process_security_grant(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_data->status != SMP_SUCCESS) { smp_br_state_machine_event(p_cb, SMP_BR_AUTH_CMPL_EVT, p_data); } else { @@ -968,7 +968,7 @@ void smp_br_select_next_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_proc_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = p_data->p_data; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (smp_command_has_invalid_parameters(p_cb)) { tSMP_INT_DATA smp_int_data; @@ -986,7 +986,7 @@ void smp_proc_enc_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_proc_central_id(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = p_data->p_data; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->rcvd_cmd_len < 11) { // 1(Code) + 2(EDIV) + 8(Rand) log::error("Invalid command length:{}, should be at least 11", @@ -1018,7 +1018,7 @@ void smp_proc_central_id(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_proc_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = p_data->p_data; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (smp_command_has_invalid_parameters(p_cb)) { tSMP_INT_DATA smp_int_data; @@ -1035,7 +1035,7 @@ void smp_proc_id_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_proc_id_addr(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { const uint8_t* p = p_data->p_data; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (smp_command_has_invalid_parameters(p_cb)) { tSMP_INT_DATA smp_int_data; @@ -1071,7 +1071,7 @@ void smp_proc_id_addr(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { /* process security information from peer device */ void smp_proc_srk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (smp_command_has_invalid_parameters(p_cb)) { tSMP_INT_DATA smp_int_data; @@ -1108,7 +1108,7 @@ void smp_proc_srk_info(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description process compare value ******************************************************************************/ void smp_proc_compare(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (!memcmp(p_cb->rconfirm.data(), p_data->key.p_data, OCTET16_LEN)) { /* compare the max encryption key size, and save the smaller one for the * link */ @@ -1140,7 +1140,7 @@ void smp_proc_compare(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_proc_sl_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t key_type = p_data->key.key_type; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (key_type == SMP_KEY_TYPE_TK) { smp_generate_srand_mrand_confirm(p_cb, NULL); } else if (key_type == SMP_KEY_TYPE_CFM) { @@ -1158,7 +1158,7 @@ void smp_proc_sl_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_start_enc(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { tBTM_STATUS cmd; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_data != NULL) { cmd = btm_ble_start_encrypt(p_cb->pairing_bda, true, (Octet16*)p_data->key.p_data); @@ -1178,7 +1178,7 @@ void smp_start_enc(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description processing for discard security request ******************************************************************************/ void smp_proc_discard(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (!(p_cb->flags & SMP_PAIR_FLAGS_WE_STARTED_DD)) smp_reset_control_value(p_cb); } @@ -1190,7 +1190,7 @@ void smp_proc_discard(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_enc_cmpl(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t enc_enable = p_data->status; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); tSMP_INT_DATA smp_int_data; smp_int_data.status = enc_enable ? SMP_SUCCESS : SMP_ENC_FAIL; smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data); @@ -1202,7 +1202,7 @@ void smp_enc_cmpl(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { ******************************************************************************/ void smp_sirk_verify(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { tBTM_STATUS callback_rc; - log::debug("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::debug("addr:{}", p_cb->pairing_bda); if (p_data->status != SMP_SUCCESS) { log::debug( @@ -1477,7 +1477,7 @@ void smp_decide_association_model(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Description process IO response for a peripheral device. ******************************************************************************/ void smp_process_io_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->flags & SMP_PAIR_FLAGS_WE_STARTED_DD) { /* pairing started by local (peripheral) Security Request */ smp_set_state(SMP_STATE_SEC_REQ_PENDING); @@ -1560,7 +1560,7 @@ void smp_br_process_peripheral_keys_response(tSMP_CB* p_cb, * transport. ******************************************************************************/ void smp_br_send_pair_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p_cb->local_i_key &= p_cb->peer_i_key; p_cb->local_r_key &= p_cb->peer_r_key; @@ -1586,7 +1586,7 @@ void smp_pairing_cmpl(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * callback and remove the connection if needed. ******************************************************************************/ void smp_pair_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p_cb->status = SMP_CONN_TOUT; smp_proc_pairing_cmpl(p_cb); } @@ -1615,7 +1615,7 @@ void smp_idle_terminate(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * - invokes SC phase 1 process. ******************************************************************************/ void smp_both_have_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); /* invokes DHKey computation */ smp_compute_dhkey(p_cb); @@ -1634,7 +1634,7 @@ void smp_both_have_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * model. ******************************************************************************/ void smp_start_secure_connection_phase1(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->selected_association_model == SMP_MODEL_SEC_CONN_JUSTWORKS) { p_cb->sec_level = SMP_SEC_UNAUTHENTICATE; @@ -1679,7 +1679,7 @@ void smp_start_secure_connection_phase1(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Note It is supposed to be called in SC phase1. ******************************************************************************/ void smp_process_local_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); switch (p_cb->selected_association_model) { case SMP_MODEL_SEC_CONN_JUSTWORKS: @@ -1743,8 +1743,7 @@ void smp_process_local_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * Note It is supposed to be called in SC phase1. ******************************************************************************/ void smp_process_peer_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}, selected_association_model:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda), + log::verbose("addr:{}, selected_association_model:{}", p_cb->pairing_bda, p_cb->selected_association_model); // PTS Testing failure modes @@ -1848,7 +1847,7 @@ void smp_process_peer_nonce(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * received from the peer DHKey check value. ******************************************************************************/ void smp_match_dhkey_checks(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (memcmp(p_data->key.p_data, p_cb->remote_dhkey_check.data(), OCTET16_LEN)) { @@ -1884,7 +1883,7 @@ void smp_match_dhkey_checks(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { ******************************************************************************/ void smp_move_to_secure_connections_phase2(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_sm_event(p_cb, SMP_SC_PHASE1_CMPLT_EVT, NULL); } @@ -1899,7 +1898,7 @@ void smp_move_to_secure_connections_phase2(tSMP_CB* p_cb, ******************************************************************************/ void smp_phase_2_dhkey_checks_are_present(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->flags & SMP_PAIR_FLAG_HAVE_PEER_DHK_CHK) smp_sm_event(p_cb, SMP_SC_2_DHCK_CHKS_PRES_EVT, NULL); @@ -1914,7 +1913,7 @@ void smp_phase_2_dhkey_checks_are_present(tSMP_CB* p_cb, * ******************************************************************************/ void smp_wait_for_both_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if ((p_cb->flags & SMP_PAIR_FLAG_HAVE_PEER_PUBL_KEY) && (p_cb->flags & SMP_PAIR_FLAG_HAVE_LOCAL_PUBL_KEY)) { @@ -1934,7 +1933,7 @@ void smp_wait_for_both_public_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { void smp_start_passkey_verification(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t* p = NULL; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = p_cb->local_random.data(); UINT32_TO_STREAM(p, p_data->passkey); @@ -1951,7 +1950,7 @@ void smp_start_passkey_verification(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { ******************************************************************************/ void smp_process_secure_connection_oob_data(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); tSMP_SC_OOB_DATA* p_sc_oob_data = &p_cb->sc_oob_data; if (p_sc_oob_data->loc_oob_data.present) { @@ -1997,7 +1996,7 @@ void smp_process_secure_connection_oob_data(tSMP_CB* p_cb, * (to be saved in sc_oob_data.loc_oob_data.randomizer). ******************************************************************************/ void smp_set_local_oob_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); memcpy(p_cb->sc_oob_data.loc_oob_data.private_key_used, p_cb->private_key, BT_OCTET32_LEN); @@ -2012,7 +2011,7 @@ void smp_set_local_oob_keys(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { * for safekeeping. ******************************************************************************/ void smp_set_local_oob_random_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("{}", p_cb->pairing_bda); p_cb->sc_oob_data.loc_oob_data.randomizer = p_cb->rand; p_cb->sc_oob_data.loc_oob_data.commitment = @@ -2054,8 +2053,7 @@ void smp_link_encrypted(const RawAddress& bda, uint8_t encr_enable) { tSMP_CB* p_cb = &smp_cb; if (smp_cb.pairing_bda == bda) { - log::debug("SMP encryption enable:{} device:{}", encr_enable, - ADDRESS_TO_LOGGABLE_CSTR(bda)); + log::debug("SMP encryption enable:{} device:{}", encr_enable, bda); /* encryption completed with STK, remember the key size now, could be * overwritten when key exchange happens */ @@ -2073,7 +2071,7 @@ void smp_link_encrypted(const RawAddress& bda, uint8_t encr_enable) { } else { log::warn( "SMP state machine busy so skipping encryption enable:{} device:{}", - encr_enable, ADDRESS_TO_LOGGABLE_CSTR(bda)); + encr_enable, bda); } } @@ -2093,7 +2091,7 @@ void smp_cancel_start_encryption_attempt() { * ******************************************************************************/ bool smp_proc_ltk_request(const RawAddress& bda) { - log::verbose("addr:{},state={}", ADDRESS_TO_LOGGABLE_CSTR(bda), smp_cb.state); + log::verbose("addr:{},state={}", bda, smp_cb.state); bool match = false; if (bda == smp_cb.pairing_bda) { @@ -2128,7 +2126,7 @@ bool smp_proc_ltk_request(const RawAddress& bda) { void smp_process_secure_connection_long_term_key(void) { tSMP_CB* p_cb = &smp_cb; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_save_secure_connections_long_term_key(p_cb); smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_ENC, false); @@ -2147,7 +2145,7 @@ void smp_process_secure_connection_long_term_key(void) { * ******************************************************************************/ void smp_set_derive_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p_cb->derive_lk = true; smp_update_key_mask(p_cb, SMP_SEC_KEY_TYPE_LK, false); smp_key_distribution(p_cb, NULL); @@ -2166,7 +2164,7 @@ void smp_derive_link_key_from_long_term_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { tSMP_STATUS status = SMP_PAIR_FAIL_UNKNOWN; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (!smp_calculate_link_key_from_long_term_key(p_cb)) { log::error("calc link key failed"); tSMP_INT_DATA smp_int_data; @@ -2190,7 +2188,7 @@ void smp_derive_link_key_from_long_term_key(tSMP_CB* p_cb, void smp_br_process_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { tSMP_STATUS status = SMP_PAIR_FAIL_UNKNOWN; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (!smp_calculate_long_term_key_from_link_key(p_cb)) { log::error("calc LTK failed"); tSMP_INT_DATA smp_int_data; @@ -2220,7 +2218,7 @@ void smp_br_process_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { ******************************************************************************/ static void smp_key_distribution_by_transport(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->smp_over_br) { smp_br_select_next_key(p_cb, NULL); } else { @@ -2234,7 +2232,7 @@ static void smp_key_distribution_by_transport(tSMP_CB* p_cb, * callback and remove the connection if needed. ******************************************************************************/ void smp_br_pairing_complete(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->total_tx_unacked == 0) { /* process the pairing complete */ diff --git a/system/stack/smp/smp_api.cc b/system/stack/smp/smp_api.cc index f442207910..83d2f6e147 100644 --- a/system/stack/smp/smp_api.cc +++ b/system/stack/smp/smp_api.cc @@ -86,7 +86,7 @@ tSMP_STATUS SMP_Pair(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type) { tSMP_CB* p_cb = &smp_cb; log::verbose("state={} br_state={} flag=0x{:x}, bd_addr={}", p_cb->state, - p_cb->br_state, p_cb->flags, ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + p_cb->br_state, p_cb->flags, bd_addr); if (p_cb->state != SMP_STATE_IDLE || p_cb->flags & SMP_PAIR_FLAGS_WE_STARTED_DD || p_cb->smp_over_br) { @@ -134,7 +134,7 @@ tSMP_STATUS SMP_BR_PairWith(const RawAddress& bd_addr) { tSMP_CB* p_cb = &smp_cb; log::verbose("state={} br_state={} flag=0x{:x}, bd_addr={}", p_cb->state, - p_cb->br_state, p_cb->flags, ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + p_cb->br_state, p_cb->flags, bd_addr); if (p_cb->state != SMP_STATE_IDLE || p_cb->smp_over_br || p_cb->flags & SMP_PAIR_FLAGS_WE_STARTED_DD) { @@ -200,7 +200,7 @@ bool SMP_PairCancel(const RawAddress& bd_addr) { * ******************************************************************************/ void SMP_SecurityGrant(const RawAddress& bd_addr, tSMP_STATUS res) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("addr:{}", bd_addr); // If just showing consent dialog, send response if (smp_cb.cb_evt == SMP_CONSENT_REQ_EVT) { @@ -328,7 +328,7 @@ void SMP_PasskeyReply(const RawAddress& bd_addr, uint8_t res, void SMP_ConfirmReply(const RawAddress& bd_addr, uint8_t res) { tSMP_CB* p_cb = &smp_cb; - log::verbose("addr:{}, Result:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr), res); + log::verbose("addr:{}, Result:{}", bd_addr, res); /* If timeout already expired or has been canceled, ignore the reply */ if (p_cb->cb_evt != SMP_NC_REQ_EVT) { @@ -510,9 +510,8 @@ void SMP_SirkConfirmDeviceReply(const RawAddress& bd_addr, uint8_t res) { } if (bd_addr != p_cb->pairing_bda) { - log::warn("Wrong confirmation BD Addr: {} vs expected {}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::warn("Wrong confirmation BD Addr: {} vs expected {}", bd_addr, + p_cb->pairing_bda); return; } diff --git a/system/stack/smp/smp_br_main.cc b/system/stack/smp/smp_br_main.cc index 3832590b36..387ebef09a 100644 --- a/system/stack/smp/smp_br_main.cc +++ b/system/stack/smp/smp_br_main.cc @@ -309,7 +309,7 @@ void smp_br_state_machine_event(tSMP_CB* p_cb, tSMP_BR_EVENT event, tSMP_BR_SM_TBL state_table; uint8_t action, entry; - log::debug("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::debug("addr:{}", p_cb->pairing_bda); if (curr_state >= SMP_BR_STATE_MAX) { log::error("Invalid br_state: {}", curr_state); return; diff --git a/system/stack/smp/smp_keys.cc b/system/stack/smp/smp_keys.cc index 7457b0eb1d..000d777352 100644 --- a/system/stack/smp/smp_keys.cc +++ b/system/stack/smp/smp_keys.cc @@ -103,7 +103,7 @@ void smp_proc_passkey(tSMP_CB* p_cb, uint64_t rand) { uint8_t* tt = p_cb->tk.data(); uint32_t passkey = static_cast<uint32_t>(rand & SMP_PASSKEY_MASK); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); /* truncate by maximum value */ while (passkey > BTM_MAX_PASSKEY_VAL) passkey >>= 1; @@ -144,7 +144,7 @@ void smp_proc_passkey(tSMP_CB* p_cb, uint64_t rand) { * ******************************************************************************/ void smp_generate_passkey(tSMP_CB* p_cb, UNUSED_ATTR tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); /* generate MRand or SRand */ send_ble_rand(BindOnce(&smp_proc_passkey, p_cb)); } @@ -163,7 +163,7 @@ void smp_generate_passkey(tSMP_CB* p_cb, UNUSED_ATTR tSMP_INT_DATA* p_data) { void smp_generate_stk(tSMP_CB* p_cb, UNUSED_ATTR tSMP_INT_DATA* p_data) { Octet16 output; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->sc_mode_required_by_peer) { log::verbose("FOR LE SC LTK IS USED INSTEAD OF STK"); @@ -201,7 +201,7 @@ void smp_compute_csrk(uint16_t div, tSMP_CB* p_cb) { void smp_generate_csrk(tSMP_CB* p_cb, UNUSED_ATTR tSMP_INT_DATA* p_data) { bool div_status; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); div_status = btm_get_local_div(p_cb->pairing_bda, &p_cb->div); if (div_status) { @@ -224,7 +224,7 @@ void smp_generate_csrk(tSMP_CB* p_cb, UNUSED_ATTR tSMP_INT_DATA* p_data) { void smp_concatenate_local(tSMP_CB* p_cb, uint8_t** p_data, uint8_t op_code) { uint8_t* p = *p_data; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); UINT8_TO_STREAM(p, op_code); UINT8_TO_STREAM(p, p_cb->local_io_capability); UINT8_TO_STREAM(p, p_cb->loc_oob_flag); @@ -243,7 +243,7 @@ void smp_concatenate_local(tSMP_CB* p_cb, uint8_t** p_data, uint8_t op_code) { void smp_concatenate_peer(tSMP_CB* p_cb, uint8_t** p_data, uint8_t op_code) { uint8_t* p = *p_data; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); UINT8_TO_STREAM(p, op_code); UINT8_TO_STREAM(p, p_cb->peer_io_caps); UINT8_TO_STREAM(p, p_cb->peer_oob_flag); @@ -262,8 +262,7 @@ void smp_concatenate_peer(tSMP_CB* p_cb, uint8_t** p_data, uint8_t op_code) { */ Octet16 smp_gen_p1_4_confirm(tSMP_CB* p_cb, tBLE_ADDR_TYPE remote_bd_addr_type) { - log::verbose("pairing_addr:{}, rmt_addr_type:{}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda), + log::verbose("pairing_addr:{}, rmt_addr_type:{}", p_cb->pairing_bda, AddressTypeText(remote_bd_addr_type)); Octet16 p1; uint8_t* p = p1.data(); @@ -298,7 +297,7 @@ Octet16 smp_gen_p1_4_confirm(tSMP_CB* p_cb, * p2 = ra || ia || padding */ Octet16 smp_gen_p2_4_confirm(tSMP_CB* p_cb, const RawAddress& remote_bda) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); Octet16 p2{0}; uint8_t* p = p2.data(); /* 32-bit Padding */ @@ -329,7 +328,7 @@ Octet16 smp_gen_p2_4_confirm(tSMP_CB* p_cb, const RawAddress& remote_bda) { ******************************************************************************/ tSMP_STATUS smp_calculate_comfirm(tSMP_CB* p_cb, const Octet16& rand, Octet16* output) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); RawAddress remote_bda; tBLE_ADDR_TYPE remote_bd_addr_type = BLE_ADDR_PUBLIC; /* get remote connection specific bluetooth address */ @@ -372,7 +371,7 @@ tSMP_STATUS smp_calculate_comfirm(tSMP_CB* p_cb, const Octet16& rand, * ******************************************************************************/ static void smp_generate_confirm(tSMP_CB* p_cb) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_debug_print_nbyte_little_endian(p_cb->rand.data(), "local_rand", 16); Octet16 output; tSMP_STATUS status = smp_calculate_comfirm(p_cb, p_cb->rand, &output); @@ -406,7 +405,7 @@ static void smp_generate_confirm(tSMP_CB* p_cb) { ******************************************************************************/ void smp_generate_srand_mrand_confirm(tSMP_CB* p_cb, UNUSED_ATTR tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); /* generate MRand or SRand */ send_ble_rand(BindOnce( [](tSMP_CB* p_cb, uint64_t rand) { @@ -436,7 +435,7 @@ void smp_generate_srand_mrand_confirm(tSMP_CB* p_cb, * ******************************************************************************/ void smp_generate_compare(tSMP_CB* p_cb, UNUSED_ATTR tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_debug_print_nbyte_little_endian(p_cb->rrand, "peer rand", 16); Octet16 output; tSMP_STATUS status = smp_calculate_comfirm(p_cb, p_cb->rrand, &output); @@ -461,7 +460,7 @@ void smp_generate_compare(tSMP_CB* p_cb, UNUSED_ATTR tSMP_INT_DATA* p_data) { static void smp_process_stk(tSMP_CB* p_cb, Octet16* p) { tSMP_KEY key; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_mask_enc_key(p_cb->loc_enc_size, p); key.key_type = SMP_KEY_TYPE_STK; @@ -478,7 +477,7 @@ static void smp_process_ediv(tSMP_CB* p_cb, Octet16& p) { uint8_t* pp = p.data(); uint16_t y; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); STREAM_TO_UINT16(y, pp); /* EDIV = Y xor DIV */ @@ -496,7 +495,7 @@ static void smp_process_ediv(tSMP_CB* p_cb, Octet16& p) { * This function is to proceed generate Y = E(DHK, Rand) */ static void smp_generate_y(tSMP_CB* p_cb, uint64_t rand) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); const Octet16& dhk = BTM_GetDeviceDHK(); @@ -513,7 +512,7 @@ static void smp_generate_y(tSMP_CB* p_cb, uint64_t rand) { static void smp_generate_ltk_cont(uint16_t div, tSMP_CB* p_cb) { p_cb->div = div; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); const Octet16& er = BTM_GetDeviceEncRoot(); /* LTK = d1(ER, DIV, 0)= e(ER, DIV)*/ @@ -545,7 +544,7 @@ static void smp_generate_ltk_cont(uint16_t div, tSMP_CB* p_cb) { * ******************************************************************************/ void smp_generate_ltk(tSMP_CB* p_cb, UNUSED_ATTR tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (smp_get_br_state() == SMP_BR_STATE_BOND_PENDING) { smp_br_process_link_key(p_cb, NULL); @@ -574,7 +573,7 @@ void smp_generate_ltk(tSMP_CB* p_cb, UNUSED_ATTR tSMP_INT_DATA* p_data) { /* The function calculates legacy STK */ Octet16 smp_calculate_legacy_short_term_key(tSMP_CB* p_cb) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); Octet16 text{}; if (p_cb->role == HCI_ROLE_CENTRAL) { @@ -602,7 +601,7 @@ Octet16 smp_calculate_legacy_short_term_key(tSMP_CB* p_cb) { * ******************************************************************************/ void smp_create_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); // Only use the stored OOB data if we are in an oob association model if (p_cb->selected_association_model == SMP_MODEL_SEC_CONN_OOB) { @@ -724,7 +723,7 @@ void smp_process_private_key(tSMP_CB* p_cb) { Point public_key; BT_OCTET32 private_key; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); memcpy(private_key, p_cb->private_key, BT_OCTET32_LEN); ECC_PointMult(&public_key, &(curve_p256.G), (uint32_t*)private_key); @@ -757,7 +756,7 @@ void smp_compute_dhkey(tSMP_CB* p_cb) { Point peer_publ_key, new_publ_key; BT_OCTET32 private_key; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); memcpy(private_key, p_cb->private_key, BT_OCTET32_LEN); memcpy(peer_publ_key.x, p_cb->peer_publ_key.x, BT_OCTET32_LEN); @@ -783,7 +782,7 @@ void smp_compute_dhkey(tSMP_CB* p_cb) { void smp_calculate_local_commitment(tSMP_CB* p_cb) { uint8_t random_input; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); switch (p_cb->selected_association_model) { case SMP_MODEL_SEC_CONN_JUSTWORKS: @@ -820,7 +819,7 @@ void smp_calculate_local_commitment(tSMP_CB* p_cb) { Octet16 smp_calculate_peer_commitment(tSMP_CB* p_cb) { uint8_t ri; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); Octet16 output{0}; switch (p_cb->selected_association_model) { case SMP_MODEL_SEC_CONN_JUSTWORKS: @@ -863,7 +862,7 @@ Octet16 smp_calculate_peer_commitment(tSMP_CB* p_cb) { ******************************************************************************/ void smp_calculate_numeric_comparison_display_number(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->role == HCI_ROLE_CENTRAL) { p_cb->number_to_display = crypto_toolbox::g2( @@ -906,7 +905,7 @@ void smp_calculate_numeric_comparison_display_number(tSMP_CB* p_cb, void smp_calculate_local_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t iocap[3], a[7], b[7]; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_calculate_f5_mackey_and_long_term_key(p_cb); @@ -931,7 +930,7 @@ void smp_calculate_peer_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { uint8_t iocap[3], a[7], b[7]; tSMP_KEY key; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); smp_collect_peer_io_capabilities(iocap, p_cb); @@ -961,7 +960,7 @@ bool smp_calculate_link_key_from_long_term_key(tSMP_CB* p_cb) { RawAddress bda_for_lk; tBLE_ADDR_TYPE conn_addr_type; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->id_addr_rcvd && p_cb->id_addr_type == BLE_ADDR_PUBLIC) { log::verbose( @@ -1020,7 +1019,7 @@ bool smp_calculate_link_key_from_long_term_key(tSMP_CB* p_cb) { bool smp_calculate_long_term_key_from_link_key(tSMP_CB* p_cb) { tBTM_SEC_DEV_REC* p_dev_rec; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p_dev_rec = btm_find_dev(p_cb->pairing_bda); if (p_dev_rec == NULL) { diff --git a/system/stack/smp/smp_l2c.cc b/system/stack/smp/smp_l2c.cc index 829577a3cc..2a41ee6a52 100644 --- a/system/stack/smp/smp_l2c.cc +++ b/system/stack/smp/smp_l2c.cc @@ -99,9 +99,8 @@ static void smp_connect_callback(UNUSED_ATTR uint16_t channel, tSMP_CB* p_cb = &smp_cb; tSMP_INT_DATA int_data; - log::debug("bd_addr:{} transport:{}, connected:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), bt_transport_text(transport), - connected); + log::debug("bd_addr:{} transport:{}, connected:{}", bd_addr, + bt_transport_text(transport), connected); if (bd_addr.IsEmpty()) { log::warn("empty address"); @@ -271,9 +270,8 @@ static void smp_br_connect_callback(uint16_t channel, const RawAddress& bd_addr, return; } - log::info("BDA:{} pairing_bda:{}, connected:{}", - ADDRESS_TO_LOGGABLE_CSTR(bd_addr), - ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda), connected); + log::info("BDA:{} pairing_bda:{}, connected:{}", bd_addr, p_cb->pairing_bda, + connected); if (bd_addr != p_cb->pairing_bda) return; diff --git a/system/stack/smp/smp_main.cc b/system/stack/smp/smp_main.cc index ba41019d55..c4522650d7 100644 --- a/system/stack/smp/smp_main.cc +++ b/system/stack/smp/smp_main.cc @@ -999,7 +999,7 @@ bool smp_sm_event(tSMP_CB* p_cb, tSMP_EVENT event, tSMP_INT_DATA* p_data) { tSMP_SM_TBL state_table; uint8_t action, entry, i; - log::debug("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::debug("addr:{}", p_cb->pairing_bda); if (p_cb->role >= 2) { log::error("Invalid role:{}", p_cb->role); return false; diff --git a/system/stack/smp/smp_utils.cc b/system/stack/smp/smp_utils.cc index a551c201f6..b6f31cf286 100644 --- a/system/stack/smp/smp_utils.cc +++ b/system/stack/smp/smp_utils.cc @@ -369,8 +369,7 @@ bool smp_send_msg_to_L2CAP(const RawAddress& rem_bda, BT_HDR* p_toL2CAP) { fixed_cid = L2CAP_SMP_BR_CID; } - log::verbose("rem_bda:{}, over_bredr:{}", ADDRESS_TO_LOGGABLE_CSTR(rem_bda), - smp_cb.smp_over_br); + log::verbose("rem_bda:{}, over_bredr:{}", rem_bda, smp_cb.smp_over_br); smp_log_metrics(rem_bda, true /* outgoing */, p_toL2CAP->data + p_toL2CAP->offset, p_toL2CAP->len, @@ -428,7 +427,7 @@ bool smp_send_cmd(uint8_t cmd_code, tSMP_CB* p_cb) { log::debug("Sending SMP command:{}[0x{:x}] pairing_bda={}", smp_opcode_text(static_cast<tSMP_OPCODE>(cmd_code)), cmd_code, - ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + p_cb->pairing_bda); if (cmd_code <= (SMP_OPCODE_MAX + 1 /* for SMP_OPCODE_PAIR_COMMITM */) && smp_cmd_build_act[cmd_code] != NULL) { @@ -543,7 +542,7 @@ static BT_HDR* smp_build_confirm_cmd(UNUSED_ATTR uint8_t cmd_code, BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_CONFIRM_CMD_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; @@ -568,7 +567,7 @@ static BT_HDR* smp_build_rand_cmd(UNUSED_ATTR uint8_t cmd_code, tSMP_CB* p_cb) { BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_RAND_CMD_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_RAND); @@ -593,7 +592,7 @@ static BT_HDR* smp_build_encrypt_info_cmd(UNUSED_ATTR uint8_t cmd_code, BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_ENC_INFO_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_ENCRYPT_INFO); @@ -618,7 +617,7 @@ static BT_HDR* smp_build_central_id_cmd(UNUSED_ATTR uint8_t cmd_code, BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_CENTRAL_ID_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_CENTRAL_ID); @@ -644,7 +643,7 @@ static BT_HDR* smp_build_identity_info_cmd(UNUSED_ATTR uint8_t cmd_code, BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_ID_INFO_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; @@ -672,7 +671,7 @@ static BT_HDR* smp_build_id_addr_cmd(UNUSED_ATTR uint8_t cmd_code, BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_ID_ADDR_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_ID_ADDR); @@ -699,7 +698,7 @@ static BT_HDR* smp_build_signing_info_cmd(UNUSED_ATTR uint8_t cmd_code, BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_SIGN_INFO_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_SIGN_INFO); @@ -724,7 +723,7 @@ static BT_HDR* smp_build_pairing_fail(UNUSED_ATTR uint8_t cmd_code, BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_PAIR_FAIL_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_PAIRING_FAILED); @@ -748,7 +747,7 @@ static BT_HDR* smp_build_security_request(UNUSED_ATTR uint8_t cmd_code, uint8_t* p; BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + 2 + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_SEC_REQ); @@ -778,7 +777,7 @@ static BT_HDR* smp_build_pair_public_key_cmd(UNUSED_ATTR uint8_t cmd_code, BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_PAIR_PUBL_KEY_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); memcpy(p_publ_key, p_cb->loc_publ_key.x, BT_OCTET32_LEN); memcpy(p_publ_key + BT_OCTET32_LEN, p_cb->loc_publ_key.y, BT_OCTET32_LEN); @@ -806,7 +805,7 @@ static BT_HDR* smp_build_pairing_commitment_cmd(UNUSED_ATTR uint8_t cmd_code, BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_PAIR_COMMITM_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_CONFIRM); @@ -831,7 +830,7 @@ static BT_HDR* smp_build_pair_dhkey_check_cmd(UNUSED_ATTR uint8_t cmd_code, BT_HDR* p_buf = (BT_HDR*)osi_malloc( sizeof(BT_HDR) + SMP_PAIR_DHKEY_CHECK_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_PAIR_DHKEY_CHECK); @@ -856,7 +855,7 @@ static BT_HDR* smp_build_pairing_keypress_notification_cmd( BT_HDR* p_buf = (BT_HDR*)osi_malloc( sizeof(BT_HDR) + SMP_PAIR_KEYPR_NOTIF_SIZE + L2CAP_MIN_OFFSET); - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_PAIR_KEYPR_NOTIF); @@ -967,7 +966,7 @@ void tSMP_CB::reset() { * ******************************************************************************/ void smp_remove_fixed_channel(tSMP_CB* p_cb) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->smp_over_br) L2CA_RemoveFixedChnl(L2CAP_SMP_BR_CID, p_cb->pairing_bda); @@ -1032,14 +1031,14 @@ void smp_proc_pairing_cmpl(tSMP_CB* p_cb) { log::debug( "Pairing process has completed successfully remote:{} " "sec_level:0x{:0x}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda), evt_data.cmplt.sec_level); + p_cb->pairing_bda, evt_data.cmplt.sec_level); BTM_LogHistory(kBtmLogTag, pairing_bda, "Pairing success"); } else { log::warn( "Pairing process has failed to remote:{} smp_reason:{} " "sec_level:0x{:0x}", - ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda), - smp_status_text(evt_data.cmplt.reason), evt_data.cmplt.sec_level); + p_cb->pairing_bda, smp_status_text(evt_data.cmplt.reason), + evt_data.cmplt.sec_level); BTM_LogHistory( kBtmLogTag, pairing_bda, "Pairing failed", base::StringPrintf("reason:%s", @@ -1281,7 +1280,7 @@ void smp_reject_unexpected_pairing_command(const RawAddress& bd_addr) { BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR) + SMP_PAIR_FAIL_SIZE + L2CAP_MIN_OFFSET); - log::verbose("bd_addr:{}", ADDRESS_TO_LOGGABLE_CSTR(bd_addr)); + log::verbose("bd_addr:{}", bd_addr); p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET; UINT8_TO_STREAM(p, SMP_OPCODE_PAIRING_FAILED); @@ -1354,7 +1353,7 @@ tSMP_ASSO_MODEL smp_select_association_model(tSMP_CB* p_cb) { tSMP_ASSO_MODEL smp_select_legacy_association_model(tSMP_CB* p_cb) { tSMP_ASSO_MODEL model = SMP_MODEL_OUT_OF_RANGE; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); /* if OOB data is present on both devices, then use OOB association model */ if (p_cb->peer_oob_flag == SMP_OOB_PRESENT && p_cb->loc_oob_flag == SMP_OOB_PRESENT) @@ -1391,7 +1390,7 @@ tSMP_ASSO_MODEL smp_select_legacy_association_model(tSMP_CB* p_cb) { tSMP_ASSO_MODEL smp_select_association_model_secure_connections(tSMP_CB* p_cb) { tSMP_ASSO_MODEL model = SMP_MODEL_OUT_OF_RANGE; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); /* if OOB data is present on at least one device, then use OOB association * model */ if (p_cb->peer_oob_flag == SMP_OOB_PRESENT || @@ -1451,7 +1450,7 @@ uint8_t smp_calculate_random_input(uint8_t* random, uint8_t round) { * ******************************************************************************/ void smp_collect_local_io_capabilities(uint8_t* iocap, tSMP_CB* p_cb) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); iocap[0] = p_cb->local_io_capability; iocap[1] = p_cb->loc_oob_flag; @@ -1468,7 +1467,7 @@ void smp_collect_local_io_capabilities(uint8_t* iocap, tSMP_CB* p_cb) { * ******************************************************************************/ void smp_collect_peer_io_capabilities(uint8_t* iocap, tSMP_CB* p_cb) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); iocap[0] = p_cb->peer_io_caps; iocap[1] = p_cb->peer_oob_flag; @@ -1490,7 +1489,7 @@ void smp_collect_local_ble_address(uint8_t* le_addr, tSMP_CB* p_cb) { RawAddress bda; uint8_t* p = le_addr; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); BTM_ReadConnectionAddr(p_cb->pairing_bda, bda, &addr_type, true); BDADDR_TO_STREAM(p, bda); @@ -1512,7 +1511,7 @@ void smp_collect_peer_ble_address(uint8_t* le_addr, tSMP_CB* p_cb) { RawAddress bda; uint8_t* p = le_addr; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (!BTM_ReadRemoteConnectionAddr(p_cb->pairing_bda, bda, &addr_type, true)) { log::error("can not collect peer le addr information for unknown device"); @@ -1535,7 +1534,7 @@ void smp_collect_peer_ble_address(uint8_t* le_addr, tSMP_CB* p_cb) { * ******************************************************************************/ bool smp_check_commitment(tSMP_CB* p_cb) { - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); Octet16 expected = smp_calculate_peer_commitment(p_cb); print128(expected, "calculated peer commitment"); @@ -1594,7 +1593,7 @@ void smp_calculate_f5_mackey_and_long_term_key(tSMP_CB* p_cb) { Octet16 na; Octet16 nb; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->role == HCI_ROLE_CENTRAL) { smp_collect_local_ble_address(a, p_cb); @@ -1624,7 +1623,7 @@ void smp_calculate_f5_mackey_and_long_term_key(tSMP_CB* p_cb) { bool smp_request_oob_data(tSMP_CB* p_cb) { tSMP_OOB_DATA_TYPE req_oob_type = SMP_OOB_INVALID_TYPE; - log::verbose("addr:{}", ADDRESS_TO_LOGGABLE_CSTR(p_cb->pairing_bda)); + log::verbose("addr:{}", p_cb->pairing_bda); if (p_cb->peer_oob_flag == SMP_OOB_PRESENT && p_cb->loc_oob_flag == SMP_OOB_PRESENT) { diff --git a/system/stack/srvc/srvc_dis.cc b/system/stack/srvc/srvc_dis.cc index 0701e4dadf..dc3a3461c2 100644 --- a/system/stack/srvc/srvc_dis.cc +++ b/system/stack/srvc/srvc_dis.cc @@ -454,8 +454,7 @@ bool DIS_ReadDISInfo(const RawAddress& peer_bda, tDIS_READ_CBACK* p_cback, dis_cb.request_mask = mask; - log::verbose("BDA: {} cl_read_uuid: 0x{:04x}", - ADDRESS_TO_LOGGABLE_STR(peer_bda), + log::verbose("BDA: {} cl_read_uuid: 0x{:04x}", peer_bda, dis_attr_uuid[dis_cb.dis_read_uuid_idx]); if (!GATT_GetConnIdIfConnected(srvc_eng_cb.gatt_if, peer_bda, &conn_id, diff --git a/system/stack/srvc/srvc_eng.cc b/system/stack/srvc/srvc_eng.cc index 2e86e762cb..7786a7c52c 100644 --- a/system/stack/srvc/srvc_eng.cc +++ b/system/stack/srvc/srvc_eng.cc @@ -316,8 +316,7 @@ static void srvc_eng_connect_cback(UNUSED_ATTR tGATT_IF gatt_if, const RawAddress& bda, uint16_t conn_id, bool connected, tGATT_DISCONN_REASON reason, UNUSED_ATTR tBT_TRANSPORT transport) { - log::verbose("from {} connected:{} conn_id={}", ADDRESS_TO_LOGGABLE_STR(bda), - connected, conn_id); + log::verbose("from {} connected:{} conn_id={}", bda, connected, conn_id); if (connected) { if (srvc_eng_clcb_alloc(conn_id, bda) == NULL) { diff --git a/system/stack/test/btm/stack_btm_sec_test.cc b/system/stack/test/btm/stack_btm_sec_test.cc index def04fd3c3..d0bb18f861 100644 --- a/system/stack/test/btm/stack_btm_sec_test.cc +++ b/system/stack/test/btm/stack_btm_sec_test.cc @@ -303,7 +303,7 @@ TEST_F(StackBtmSecWithInitFreeTest, btm_sec_rmt_name_request_complete) { struct tm tm; localtime_r(&then, &tm); auto s2 = common::StringFormatTime(kTimeFormat, tm); - log::debug(" {}.{} {}", s2, + log::debug("{}.{} {}", s2, static_cast<unsigned int>(record.timestamp % 1000), record.entry); } diff --git a/system/types/ble_address_with_type.h b/system/types/ble_address_with_type.h index 5c0f5318c7..eacd01adc4 100644 --- a/system/types/ble_address_with_type.h +++ b/system/types/ble_address_with_type.h @@ -187,4 +187,38 @@ struct tAclLinkSpec { } }; +#if __has_include(<bluetooth/log.h>) +#include <bluetooth/log.h> + +namespace bluetooth::os { +bool should_log_be_redacted(); +} // namespace bluetooth::os + +namespace fmt { +template <> +struct formatter<tBLE_BD_ADDR> : formatter<std::string> { + template <class Context> + typename Context::iterator format(const tBLE_BD_ADDR& address, + Context& ctx) const { + std::string repr = bluetooth::os::should_log_be_redacted() + ? address.ToRedactedStringForLogging() + : address.ToStringForLogging(); + return fmt::formatter<std::string>::format(repr, ctx); + } +}; +template <> +struct formatter<tAclLinkSpec> : formatter<std::string> { + template <class Context> + typename Context::iterator format(const tAclLinkSpec& address, + Context& ctx) const { + std::string repr = bluetooth::os::should_log_be_redacted() + ? address.ToRedactedStringForLogging() + : address.ToStringForLogging(); + return fmt::formatter<std::string>::format(repr, ctx); + } +}; +} // namespace fmt + +#endif // __has_include(<bluetooth/log.h> + #endif diff --git a/system/types/raw_address.h b/system/types/raw_address.h index 3a9b9c18c4..d60da54f29 100644 --- a/system/types/raw_address.h +++ b/system/types/raw_address.h @@ -107,3 +107,26 @@ inline void STREAM_TO_BDADDR(RawAddress& a, const uint8_t*& p) { uint8_t* pbda = (uint8_t*)(a.address) + BD_ADDR_LEN - 1; for (int ijk = 0; ijk < BD_ADDR_LEN; ijk++) *pbda-- = *(p)++; } + +#if __has_include(<bluetooth/log.h>) +#include <bluetooth/log.h> + +namespace bluetooth::os { +bool should_log_be_redacted(); +} // namespace bluetooth::os + +namespace fmt { +template <> +struct formatter<RawAddress> : formatter<std::string> { + template <class Context> + typename Context::iterator format(const RawAddress& address, + Context& ctx) const { + std::string repr = bluetooth::os::should_log_be_redacted() + ? address.ToRedactedStringForLogging() + : address.ToStringForLogging(); + return fmt::formatter<std::string>::format(repr, ctx); + } +}; +} // namespace fmt + +#endif // __has_include(<bluetooth/log.h>) |