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

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

legacy: Const-ify stack/sdp Api 

Bug: 187830698
Tag: #refactor
Test: gd/cert/run

Change-Id: I9932fc8cb293d4ebacaefc024de16da71ea9796f
parent c933f347

system/stack/include/sdp_api.h

+18 −14
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ typedef struct t_sdp_di_get_record { 
 ******************************************************************************/

bool SDP_InitDiscoveryDb(tSDP_DISCOVERY_DB* p_db, uint32_t len,

                         uint16_t num_uuid, const bluetooth::Uuid* p_uuid_list,

                         uint16_t num_attr, uint16_t* p_attr_list);

                         uint16_t num_attr, const uint16_t* p_attr_list);



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

 *
@@ -225,7 +225,7 @@ bool SDP_InitDiscoveryDb(tSDP_DISCOVERY_DB* p_db, uint32_t len, 
 *                  not found.

 *

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

bool SDP_CancelServiceSearch(tSDP_DISCOVERY_DB* p_db);

bool SDP_CancelServiceSearch(const tSDP_DISCOVERY_DB* p_db);



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

 *
@@ -287,7 +287,8 @@ bool SDP_ServiceSearchAttributeRequest2(const RawAddress& p_bd_addr, 
 * Returns          Pointer to matching attribute entry, or NULL

 *

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

tSDP_DISC_ATTR* SDP_FindAttributeInRec(tSDP_DISC_REC* p_rec, uint16_t attr_id);

tSDP_DISC_ATTR* SDP_FindAttributeInRec(const tSDP_DISC_REC* p_rec,

                                       uint16_t attr_id);



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

 *
@@ -301,7 +302,7 @@ tSDP_DISC_ATTR* SDP_FindAttributeInRec(tSDP_DISC_REC* p_rec, uint16_t attr_id); 
 * Returns          Pointer to record containing service class, or NULL

 *

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

tSDP_DISC_REC* SDP_FindServiceInDb(tSDP_DISCOVERY_DB* p_db,

tSDP_DISC_REC* SDP_FindServiceInDb(const tSDP_DISCOVERY_DB* p_db,

                                   uint16_t service_uuid,

                                   tSDP_DISC_REC* p_start_rec);
@@ -321,7 +322,7 @@ tSDP_DISC_REC* SDP_FindServiceInDb(tSDP_DISCOVERY_DB* p_db, 
 * Returns          Pointer to record containing service class, or NULL

 *

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

tSDP_DISC_REC* SDP_FindServiceUUIDInDb(tSDP_DISCOVERY_DB* p_db,

tSDP_DISC_REC* SDP_FindServiceUUIDInDb(const tSDP_DISCOVERY_DB* p_db,

                                       const bluetooth::Uuid& uuid,

                                       tSDP_DISC_REC* p_start_rec);
@@ -338,7 +339,7 @@ tSDP_DISC_REC* SDP_FindServiceUUIDInDb(tSDP_DISCOVERY_DB* p_db, 
 * Returns          true if found, otherwise false.

 *

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

bool SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC* p_rec,

bool SDP_FindServiceUUIDInRec_128bit(const tSDP_DISC_REC* p_rec,

                                     bluetooth::Uuid* p_uuid);



/*******************************************************************************
@@ -353,7 +354,7 @@ bool SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC* p_rec, 
 * Returns          Pointer to record containing service class, or NULL

 *

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

tSDP_DISC_REC* SDP_FindServiceInDb_128bit(tSDP_DISCOVERY_DB* p_db,

tSDP_DISC_REC* SDP_FindServiceInDb_128bit(const tSDP_DISCOVERY_DB* p_db,

                                          tSDP_DISC_REC* p_start_rec);



/*******************************************************************************
@@ -367,7 +368,8 @@ tSDP_DISC_REC* SDP_FindServiceInDb_128bit(tSDP_DISCOVERY_DB* p_db, 
 *                  If found, the passed protocol list element is filled in.

 *

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

bool SDP_FindProtocolListElemInRec(tSDP_DISC_REC* p_rec, uint16_t layer_uuid,

bool SDP_FindProtocolListElemInRec(const tSDP_DISC_REC* p_rec,

                                   uint16_t layer_uuid,

                                   tSDP_PROTOCOL_ELEM* p_elem);



/*******************************************************************************
@@ -384,8 +386,8 @@ bool SDP_FindProtocolListElemInRec(tSDP_DISC_REC* p_rec, uint16_t layer_uuid, 
 *                  passed in are filled in.

 *

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

bool SDP_FindProfileVersionInRec(tSDP_DISC_REC* p_rec, uint16_t profile_uuid,

                                 uint16_t* p_version);

bool SDP_FindProfileVersionInRec(const tSDP_DISC_REC* p_rec,

                                 uint16_t profile_uuid, uint16_t* p_version);



/* API into SDP for local service database updates */
@@ -565,7 +567,8 @@ bool SDP_DeleteAttribute(uint32_t handle, uint16_t attr_id); 
 * Returns          Returns SDP_SUCCESS if record added successfully, else error

 *

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

uint16_t SDP_SetLocalDiRecord(tSDP_DI_RECORD* device_info, uint32_t* p_handle);

uint16_t SDP_SetLocalDiRecord(const tSDP_DI_RECORD* device_info,

                              uint32_t* p_handle);



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

 *
@@ -589,7 +592,7 @@ tSDP_STATUS SDP_DiDiscover(const RawAddress& remote_device, 
 * Returns          number of DI records found

 *

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

uint8_t SDP_GetNumDiRecords(tSDP_DISCOVERY_DB* p_db);

uint8_t SDP_GetNumDiRecords(const tSDP_DISCOVERY_DB* p_db);



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

 *
@@ -603,7 +606,7 @@ uint8_t SDP_GetNumDiRecords(tSDP_DISCOVERY_DB* p_db); 
 ******************************************************************************/

uint16_t SDP_GetDiRecord(uint8_t getRecordIndex,

                         tSDP_DI_GET_RECORD* device_info,

                         tSDP_DISCOVERY_DB* p_db);

                         const tSDP_DISCOVERY_DB* p_db);



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

 *
@@ -629,6 +632,7 @@ uint8_t SDP_SetTraceLevel(uint8_t new_level); 
 * Returns          true if found, otherwise false.

 *

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

bool SDP_FindServiceUUIDInRec(tSDP_DISC_REC* p_rec, bluetooth::Uuid* p_uuid);

bool SDP_FindServiceUUIDInRec(const tSDP_DISC_REC* p_rec,

                              bluetooth::Uuid* p_uuid);



#endif /* SDP_API_H */

system/stack/sdp/sdp_api.cc

+20 −17
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ using bluetooth::Uuid; 
 ******************************************************************************/

bool SDP_InitDiscoveryDb(tSDP_DISCOVERY_DB* p_db, uint32_t len,

                         uint16_t num_uuid, const Uuid* p_uuid_list,

                         uint16_t num_attr, uint16_t* p_attr_list) {

                         uint16_t num_attr, const uint16_t* p_attr_list) {

  uint16_t xx;



  /* verify the parameters */
@@ -109,7 +109,7 @@ bool SDP_InitDiscoveryDb(tSDP_DISCOVERY_DB* p_db, uint32_t len, 
 *                  not found.

 *

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

bool SDP_CancelServiceSearch(tSDP_DISCOVERY_DB* p_db) {

bool SDP_CancelServiceSearch(const tSDP_DISCOVERY_DB* p_db) {

  tCONN_CB* p_ccb = sdpu_find_ccb_by_db(p_db);

  if (!p_ccb) return (false);
@@ -221,7 +221,8 @@ bool SDP_ServiceSearchAttributeRequest2(const RawAddress& p_bd_addr, 
 * Returns          Pointer to matching attribute entry, or NULL

 *

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

tSDP_DISC_ATTR* SDP_FindAttributeInRec(tSDP_DISC_REC* p_rec, uint16_t attr_id) {

tSDP_DISC_ATTR* SDP_FindAttributeInRec(const tSDP_DISC_REC* p_rec,

                                       uint16_t attr_id) {

  tSDP_DISC_ATTR* p_attr;



  p_attr = p_rec->p_first_attr;
@@ -248,7 +249,7 @@ tSDP_DISC_ATTR* SDP_FindAttributeInRec(tSDP_DISC_REC* p_rec, uint16_t attr_id) { 
 * Returns          true if found, otherwise false.

 *

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

bool SDP_FindServiceUUIDInRec(tSDP_DISC_REC* p_rec, Uuid* p_uuid) {

bool SDP_FindServiceUUIDInRec(const tSDP_DISC_REC* p_rec, Uuid* p_uuid) {

  tSDP_DISC_ATTR *p_attr, *p_sattr, *p_extra_sattr;



  p_attr = p_rec->p_first_attr;
@@ -321,7 +322,7 @@ bool SDP_FindServiceUUIDInRec(tSDP_DISC_REC* p_rec, Uuid* p_uuid) { 
 * Returns          true if found, otherwise false.

 *

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

bool SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC* p_rec, Uuid* p_uuid) {

bool SDP_FindServiceUUIDInRec_128bit(const tSDP_DISC_REC* p_rec, Uuid* p_uuid) {

  tSDP_DISC_ATTR* p_attr = p_rec->p_first_attr;

  while (p_attr) {

    if ((p_attr->attr_id == ATTR_ID_SERVICE_CLASS_ID_LIST) &&
@@ -364,7 +365,7 @@ bool SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC* p_rec, Uuid* p_uuid) { 
 * Returns          Pointer to record containing service class, or NULL

 *

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

tSDP_DISC_REC* SDP_FindServiceInDb(tSDP_DISCOVERY_DB* p_db,

tSDP_DISC_REC* SDP_FindServiceInDb(const tSDP_DISCOVERY_DB* p_db,

                                   uint16_t service_uuid,

                                   tSDP_DISC_REC* p_start_rec) {

  tSDP_DISC_REC* p_rec;
@@ -467,7 +468,7 @@ tSDP_DISC_REC* SDP_FindServiceInDb(tSDP_DISCOVERY_DB* p_db, 
 * Returns          Pointer to record containing service class, or NULL

 *

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

tSDP_DISC_REC* SDP_FindServiceInDb_128bit(tSDP_DISCOVERY_DB* p_db,

tSDP_DISC_REC* SDP_FindServiceInDb_128bit(const tSDP_DISCOVERY_DB* p_db,

                                          tSDP_DISC_REC* p_start_rec) {

  tSDP_DISC_REC* p_rec;

  tSDP_DISC_ATTR *p_attr, *p_sattr;
@@ -525,7 +526,7 @@ tSDP_DISC_REC* SDP_FindServiceInDb_128bit(tSDP_DISCOVERY_DB* p_db, 
 * Returns          Pointer to record containing service class, or NULL

 *

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

tSDP_DISC_REC* SDP_FindServiceUUIDInDb(tSDP_DISCOVERY_DB* p_db,

tSDP_DISC_REC* SDP_FindServiceUUIDInDb(const tSDP_DISCOVERY_DB* p_db,

                                       const Uuid& uuid,

                                       tSDP_DISC_REC* p_start_rec) {

  tSDP_DISC_REC* p_rec;
@@ -577,7 +578,8 @@ tSDP_DISC_REC* SDP_FindServiceUUIDInDb(tSDP_DISCOVERY_DB* p_db, 
 *                  If found, the passed protocol list element is filled in.

 *

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

static bool sdp_fill_proto_elem(tSDP_DISC_ATTR* p_attr, uint16_t layer_uuid,

static bool sdp_fill_proto_elem(const tSDP_DISC_ATTR* p_attr,

                                uint16_t layer_uuid,

                                tSDP_PROTOCOL_ELEM* p_elem) {

  tSDP_DISC_ATTR* p_sattr;
@@ -633,7 +635,8 @@ static bool sdp_fill_proto_elem(tSDP_DISC_ATTR* p_attr, uint16_t layer_uuid, 
 *                  If found, the passed protocol list element is filled in.

 *

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

bool SDP_FindProtocolListElemInRec(tSDP_DISC_REC* p_rec, uint16_t layer_uuid,

bool SDP_FindProtocolListElemInRec(const tSDP_DISC_REC* p_rec,

                                   uint16_t layer_uuid,

                                   tSDP_PROTOCOL_ELEM* p_elem) {

  tSDP_DISC_ATTR* p_attr;
@@ -664,8 +667,8 @@ bool SDP_FindProtocolListElemInRec(tSDP_DISC_REC* p_rec, uint16_t layer_uuid, 
 *                  passed in are filled in.

 *

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

bool SDP_FindProfileVersionInRec(tSDP_DISC_REC* p_rec, uint16_t profile_uuid,

                                 uint16_t* p_version) {

bool SDP_FindProfileVersionInRec(const tSDP_DISC_REC* p_rec,

                                 uint16_t profile_uuid, uint16_t* p_version) {

  tSDP_DISC_ATTR *p_attr, *p_sattr;



  p_attr = p_rec->p_first_attr;
@@ -756,7 +759,7 @@ tSDP_STATUS SDP_DiDiscover(const RawAddress& remote_device, 
 * Returns          number of DI records found

 *

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

uint8_t SDP_GetNumDiRecords(tSDP_DISCOVERY_DB* p_db) {

uint8_t SDP_GetNumDiRecords(const tSDP_DISCOVERY_DB* p_db) {

  uint8_t num_records = 0;

  tSDP_DISC_REC* p_curr_record = NULL;
@@ -779,7 +782,7 @@ uint8_t SDP_GetNumDiRecords(tSDP_DISCOVERY_DB* p_db) { 
 * Returns          none

 *

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

static void SDP_AttrStringCopy(char* dst, tSDP_DISC_ATTR* p_attr,

static void SDP_AttrStringCopy(char* dst, const tSDP_DISC_ATTR* p_attr,

                               uint16_t dst_size) {

  if (dst == NULL) return;

  if (p_attr) {
@@ -787,7 +790,7 @@ static void SDP_AttrStringCopy(char* dst, tSDP_DISC_ATTR* p_attr, 
    if (len > dst_size - 1) {

      len = dst_size - 1;

    }

    memcpy(dst, (char*)p_attr->attr_value.v.array, len);

    memcpy(dst, (const void*)p_attr->attr_value.v.array, len);

    dst[len] = '\0';

  } else {

    dst[0] = '\0';
@@ -806,7 +809,7 @@ static void SDP_AttrStringCopy(char* dst, tSDP_DISC_ATTR* p_attr, 
 ******************************************************************************/

uint16_t SDP_GetDiRecord(uint8_t get_record_index,

                         tSDP_DI_GET_RECORD* p_device_info,

                         tSDP_DISCOVERY_DB* p_db) {

                         const tSDP_DISCOVERY_DB* p_db) {

  uint16_t result = SDP_NO_DI_RECORD_FOUND;

  uint8_t curr_record_index = 1;
@@ -903,7 +906,7 @@ uint16_t SDP_GetDiRecord(uint8_t get_record_index, 
 * Returns          Returns SDP_SUCCESS if record added successfully, else error

 *

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

uint16_t SDP_SetLocalDiRecord(tSDP_DI_RECORD* p_device_info,

uint16_t SDP_SetLocalDiRecord(const tSDP_DI_RECORD* p_device_info,

                              uint32_t* p_handle) {

  uint16_t result = SDP_SUCCESS;

  uint32_t handle;

system/stack/sdp/sdp_utils.cc

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ tCONN_CB* sdpu_find_ccb_by_cid(uint16_t cid) { 
 * Returns          the CCB address, or NULL if not found.

 *

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

tCONN_CB* sdpu_find_ccb_by_db(tSDP_DISCOVERY_DB* p_db) {

tCONN_CB* sdpu_find_ccb_by_db(const tSDP_DISCOVERY_DB* p_db) {

  uint16_t xx;

  tCONN_CB* p_ccb;

system/stack/sdp/sdpint.h

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ extern tCONN_CB* sdp_conn_originate(const RawAddress& p_bd_addr); 
extern void sdpu_log_attribute_metrics(const RawAddress& bda,

                                       tSDP_DISCOVERY_DB* p_db);

extern tCONN_CB* sdpu_find_ccb_by_cid(uint16_t cid);

extern tCONN_CB* sdpu_find_ccb_by_db(tSDP_DISCOVERY_DB* p_db);

extern tCONN_CB* sdpu_find_ccb_by_db(const tSDP_DISCOVERY_DB* p_db);

extern tCONN_CB* sdpu_allocate_ccb(void);

extern void sdpu_release_ccb(tCONN_CB* p_ccb);

system/test/mock/mock_stack_sdp_api.cc

+17 −14
Original line number Diff line number Diff line
@@ -69,27 +69,29 @@ struct SDP_SetTraceLevel SDP_SetTraceLevel; 
}  // namespace test



// Mocked functions, if any

bool SDP_CancelServiceSearch(tSDP_DISCOVERY_DB* p_db) {

bool SDP_CancelServiceSearch(const tSDP_DISCOVERY_DB* p_db) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_CancelServiceSearch(p_db);

}

bool SDP_FindProfileVersionInRec(tSDP_DISC_REC* p_rec, uint16_t profile_uuid,

                                 uint16_t* p_version) {

bool SDP_FindProfileVersionInRec(const tSDP_DISC_REC* p_rec,

                                 uint16_t profile_uuid, uint16_t* p_version) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_FindProfileVersionInRec(

      p_rec, profile_uuid, p_version);

}

bool SDP_FindProtocolListElemInRec(tSDP_DISC_REC* p_rec, uint16_t layer_uuid,

bool SDP_FindProtocolListElemInRec(const tSDP_DISC_REC* p_rec,

                                   uint16_t layer_uuid,

                                   tSDP_PROTOCOL_ELEM* p_elem) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_FindProtocolListElemInRec(

      p_rec, layer_uuid, p_elem);

}

bool SDP_FindServiceUUIDInRec(tSDP_DISC_REC* p_rec, bluetooth::Uuid* p_uuid) {

bool SDP_FindServiceUUIDInRec(const tSDP_DISC_REC* p_rec,

                              bluetooth::Uuid* p_uuid) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_FindServiceUUIDInRec(p_rec, p_uuid);

}

bool SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC* p_rec,

bool SDP_FindServiceUUIDInRec_128bit(const tSDP_DISC_REC* p_rec,

                                     bluetooth::Uuid* p_uuid) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_FindServiceUUIDInRec_128bit(p_rec,
@@ -97,7 +99,7 @@ bool SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC* p_rec, 
}

bool SDP_InitDiscoveryDb(tSDP_DISCOVERY_DB* p_db, uint32_t len,

                         uint16_t num_uuid, const bluetooth::Uuid* p_uuid_list,

                         uint16_t num_attr, uint16_t* p_attr_list) {

                         uint16_t num_attr, const uint16_t* p_attr_list) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_InitDiscoveryDb(

      p_db, len, num_uuid, p_uuid_list, num_attr, p_attr_list);
@@ -124,24 +126,25 @@ bool SDP_ServiceSearchRequest(const RawAddress& p_bd_addr, 
  return test::mock::stack_sdp_api::SDP_ServiceSearchRequest(p_bd_addr, p_db,

                                                             p_cb);

}

tSDP_DISC_ATTR* SDP_FindAttributeInRec(tSDP_DISC_REC* p_rec, uint16_t attr_id) {

tSDP_DISC_ATTR* SDP_FindAttributeInRec(const tSDP_DISC_REC* p_rec,

                                       uint16_t attr_id) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_FindAttributeInRec(p_rec, attr_id);

}

tSDP_DISC_REC* SDP_FindServiceInDb(tSDP_DISCOVERY_DB* p_db,

tSDP_DISC_REC* SDP_FindServiceInDb(const tSDP_DISCOVERY_DB* p_db,

                                   uint16_t service_uuid,

                                   tSDP_DISC_REC* p_start_rec) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_FindServiceInDb(p_db, service_uuid,

                                                        p_start_rec);

}

tSDP_DISC_REC* SDP_FindServiceInDb_128bit(tSDP_DISCOVERY_DB* p_db,

tSDP_DISC_REC* SDP_FindServiceInDb_128bit(const tSDP_DISCOVERY_DB* p_db,

                                          tSDP_DISC_REC* p_start_rec) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_FindServiceInDb_128bit(p_db,

                                                               p_start_rec);

}

tSDP_DISC_REC* SDP_FindServiceUUIDInDb(tSDP_DISCOVERY_DB* p_db,

tSDP_DISC_REC* SDP_FindServiceUUIDInDb(const tSDP_DISCOVERY_DB* p_db,

                                       const bluetooth::Uuid& uuid,

                                       tSDP_DISC_REC* p_start_rec) {

  mock_function_count_map[__func__]++;
@@ -157,18 +160,18 @@ tSDP_STATUS SDP_DiDiscover(const RawAddress& remote_device, 
}

uint16_t SDP_GetDiRecord(uint8_t get_record_index,

                         tSDP_DI_GET_RECORD* p_device_info,

                         tSDP_DISCOVERY_DB* p_db) {

                         const tSDP_DISCOVERY_DB* p_db) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_GetDiRecord(get_record_index,

                                                    p_device_info, p_db);

}

uint16_t SDP_SetLocalDiRecord(tSDP_DI_RECORD* p_device_info,

uint16_t SDP_SetLocalDiRecord(const tSDP_DI_RECORD* p_device_info,

                              uint32_t* p_handle) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_SetLocalDiRecord(p_device_info,

                                                         p_handle);

}

uint8_t SDP_GetNumDiRecords(tSDP_DISCOVERY_DB* p_db) {

uint8_t SDP_GetNumDiRecords(const tSDP_DISCOVERY_DB* p_db) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_sdp_api::SDP_GetNumDiRecords(p_db);

}