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

Commit 9f58669e authored by Chris Manton's avatar Chris Manton
Browse files

stack::sdp Use conventional `bd_addr` name 

Bug: 338276298
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: I38c1f6818fa1f3dc71f88fb84dd75be6007ab836
parent 91470c0d

system/stack/sdp/sdp_api.cc

+6 −6
Original line number Diff line number Diff line
@@ -135,13 +135,13 @@ bool SDP_CancelServiceSearch(const tSDP_DISCOVERY_DB* p_db) { 
 * Returns          true if discovery started, false if failed.

 *

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

bool SDP_ServiceSearchRequest(const RawAddress& p_bd_addr,

bool SDP_ServiceSearchRequest(const RawAddress& bd_addr,

                              tSDP_DISCOVERY_DB* p_db,

                              tSDP_DISC_CMPL_CB* p_cb) {

  tCONN_CB* p_ccb;



  /* Specific BD address */

  p_ccb = sdp_conn_originate(p_bd_addr);

  p_ccb = sdp_conn_originate(bd_addr);



  if (!p_ccb) return (false);
@@ -166,13 +166,13 @@ bool SDP_ServiceSearchRequest(const RawAddress& p_bd_addr, 
 * Returns          true if discovery started, false if failed.

 *

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

bool SDP_ServiceSearchAttributeRequest(const RawAddress& p_bd_addr,

bool SDP_ServiceSearchAttributeRequest(const RawAddress& bd_addr,

                                       tSDP_DISCOVERY_DB* p_db,

                                       tSDP_DISC_CMPL_CB* p_cb) {

  tCONN_CB* p_ccb;



  /* Specific BD address */

  p_ccb = sdp_conn_originate(p_bd_addr);

  p_ccb = sdp_conn_originate(bd_addr);



  if (!p_ccb) return (false);
@@ -198,14 +198,14 @@ bool SDP_ServiceSearchAttributeRequest(const RawAddress& p_bd_addr, 
 * Returns          true if discovery started, false if failed.

 *

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

bool SDP_ServiceSearchAttributeRequest2(const RawAddress& p_bd_addr,

bool SDP_ServiceSearchAttributeRequest2(const RawAddress& bd_addr,

                                        tSDP_DISCOVERY_DB* p_db,

                                        tSDP_DISC_CMPL_CB2* p_cb2,

                                        const void* user_data) {

  tCONN_CB* p_ccb;



  /* Specific BD address */

  p_ccb = sdp_conn_originate(p_bd_addr);

  p_ccb = sdp_conn_originate(bd_addr);



  if (!p_ccb) return (false);

system/stack/sdp/sdp_discovery.cc

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static void process_service_search_attr_rsp(tCONN_CB* p_ccb, uint8_t* p_reply, 
                                            uint8_t* p_reply_end);

static uint8_t* save_attr_seq(tCONN_CB* p_ccb, uint8_t* p, uint8_t* p_msg_end);

static tSDP_DISC_REC* add_record(tSDP_DISCOVERY_DB* p_db,

                                 const RawAddress& p_bda);

                                 const RawAddress& bd_addr);

static uint8_t* add_attr(uint8_t* p, uint8_t* p_end, tSDP_DISCOVERY_DB* p_db,

                         tSDP_DISC_REC* p_rec, uint16_t attr_id,

                         tSDP_DISC_ATTR* p_parent_attr, uint8_t nest_level);
@@ -783,7 +783,7 @@ static uint8_t* save_attr_seq(tCONN_CB* p_ccb, uint8_t* p, uint8_t* p_msg_end) { 
 * Returns          pointer to next byte in data stream

 *

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

tSDP_DISC_REC* add_record(tSDP_DISCOVERY_DB* p_db, const RawAddress& p_bda) {

tSDP_DISC_REC* add_record(tSDP_DISCOVERY_DB* p_db, const RawAddress& bd_addr) {

  tSDP_DISC_REC* p_rec;



  /* See if there is enough space in the database */
@@ -796,7 +796,7 @@ tSDP_DISC_REC* add_record(tSDP_DISCOVERY_DB* p_db, const RawAddress& p_bda) { 
  p_rec->p_first_attr = NULL;

  p_rec->p_next_rec = NULL;



  p_rec->remote_bd_addr = p_bda;

  p_rec->remote_bd_addr = bd_addr;



  /* Add the record to the end of chain */

  if (!p_db->p_first_rec)

system/stack/sdp/sdp_main.cc

+8 −8
Original line number Diff line number Diff line
@@ -323,41 +323,41 @@ static void sdp_data_ind(uint16_t l2cap_cid, BT_HDR* p_msg) { 
 * Returns          void

 *

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

tCONN_CB* sdp_conn_originate(const RawAddress& p_bd_addr) {

tCONN_CB* sdp_conn_originate(const RawAddress& bd_addr) {

  tCONN_CB* p_ccb;

  uint16_t cid;



  /* Allocate a new CCB. Return if none available. */

  p_ccb = sdpu_allocate_ccb();

  if (p_ccb == NULL) {

    log::warn("no spare CCB for peer {}", p_bd_addr);

    log::warn("no spare CCB for peer {}", bd_addr);

    return (NULL);

  }



  log::verbose("SDP - Originate started for peer {}", p_bd_addr);

  log::verbose("SDP - Originate started for peer {}", bd_addr);



  /* Look for any active sdp connection on the remote device */

  cid = sdpu_get_active_ccb_cid(p_bd_addr);

  cid = sdpu_get_active_ccb_cid(bd_addr);



  /* We are the originator of this connection */

  p_ccb->con_flags |= SDP_FLAGS_IS_ORIG;



  /* Save the BD Address */

  p_ccb->device_address = p_bd_addr;

  p_ccb->device_address = bd_addr;



  /* Transition to the next appropriate state, waiting for connection confirm */

  if (!bluetooth::common::init_flags::sdp_serialization_is_enabled() ||

      cid == 0) {

    p_ccb->con_state = SDP_STATE_CONN_SETUP;

    cid = L2CA_ConnectReq2(BT_PSM_SDP, p_bd_addr, BTM_SEC_NONE);

    cid = L2CA_ConnectReq2(BT_PSM_SDP, bd_addr, BTM_SEC_NONE);

  } else {

    p_ccb->con_state = SDP_STATE_CONN_PEND;

    log::warn("SDP already active for peer {}. cid={:#0x}", p_bd_addr, cid);

    log::warn("SDP already active for peer {}. cid={:#0x}", bd_addr, cid);

  }



  /* Check if L2CAP started the connection process */

  if (cid == 0) {

    log::warn("SDP - Originate failed for peer {}", p_bd_addr);

    log::warn("SDP - Originate failed for peer {}", bd_addr);

    sdpu_release_ccb(*p_ccb);

    return (NULL);

  }

system/stack/sdp/sdp_utils.cc

+2 −2
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ void sdpu_release_ccb(tCONN_CB& ccb) { 
 * Returns          returns cid if any active sdp connection, else 0.

 *

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

uint16_t sdpu_get_active_ccb_cid(const RawAddress& remote_bd_addr) {

uint16_t sdpu_get_active_ccb_cid(const RawAddress& bd_addr) {

  uint16_t xx;

  tCONN_CB* p_ccb;
@@ -470,7 +470,7 @@ uint16_t sdpu_get_active_ccb_cid(const RawAddress& remote_bd_addr) { 
        (p_ccb->con_state == SDP_STATE_CFG_SETUP) ||

        (p_ccb->con_state == SDP_STATE_CONNECTED)) {

      if (p_ccb->con_flags & SDP_FLAGS_IS_ORIG &&

          p_ccb->device_address == remote_bd_addr) {

          p_ccb->device_address == bd_addr) {

        return p_ccb->connection_id;

      }

    }

system/stack/sdp/sdpint.h

+2 −2
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ void sdp_disconnect(tCONN_CB* p_ccb, tSDP_REASON reason); 


void sdp_conn_timer_timeout(void* data);



tCONN_CB* sdp_conn_originate(const RawAddress& p_bd_addr);

tCONN_CB* sdp_conn_originate(const RawAddress& bd_addr);



/* Functions provided by sdp_utils.cc

 */
@@ -297,7 +297,7 @@ void sdpu_set_avrc_target_version(const tSDP_ATTRIBUTE* p_attr, 
void sdpu_set_avrc_target_features(const tSDP_ATTRIBUTE* p_attr,

                                   const RawAddress* bdaddr,

                                   uint16_t profile_version);

uint16_t sdpu_get_active_ccb_cid(const RawAddress& remote_bd_addr);

uint16_t sdpu_get_active_ccb_cid(const RawAddress& bd_addr);

bool sdpu_process_pend_ccb_same_cid(tCONN_CB& ccb);

bool sdpu_process_pend_ccb_new_cid(tCONN_CB& ccb);

void sdpu_clear_pend_ccb(tCONN_CB& ccb);