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

Commit f00a39e5 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Get rid of BD_ADDR 

Test: compilation test
Change-Id: I8493485873a81f897fbaef1504076ef18274a8a5
parent 0325299f

system/bta/include/bta_dm_ci.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
 * Returns          void

 *

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

extern void bta_dm_ci_io_req(BD_ADDR bd_addr, tBTA_IO_CAP io_cap,

extern void bta_dm_ci_io_req(const bt_bdaddr_t& bd_addr, tBTA_IO_CAP io_cap,

                             tBTA_OOB_DATA oob_data, tBTA_AUTH_REQ auth_req);



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

system/hci/src/hci_packet_parser.cc

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void parse_read_bd_addr_response(BT_HDR* response, 
  uint8_t* stream = read_command_complete_header(

      response, HCI_READ_BD_ADDR, sizeof(bt_bdaddr_t) /* bytes after */);

  CHECK(stream != NULL);

  STREAM_TO_BDADDR(address_ptr->address, stream);

  STREAM_TO_BDADDR(*address_ptr, stream);



  buffer_allocator->free(response);

}

system/stack/bnep/bnep_api.cc

+3 −2
Original line number Diff line number Diff line
@@ -611,8 +611,9 @@ tBNEP_RESULT BNEP_SetMulticastFilters(uint16_t handle, uint16_t num_filters, 


  /* Fill the multicast filter values in connnection block */

  for (xx = 0; xx < num_filters; xx++) {

    memcpy(p_bcb->sent_mcast_filter_start[xx], p_start_array, BD_ADDR_LEN);

    memcpy(p_bcb->sent_mcast_filter_end[xx], p_end_array, BD_ADDR_LEN);

    memcpy(p_bcb->sent_mcast_filter_start[xx].address, p_start_array,

           BD_ADDR_LEN);

    memcpy(p_bcb->sent_mcast_filter_end[xx].address, p_end_array, BD_ADDR_LEN);



    p_start_array += BD_ADDR_LEN;

    p_end_array += BD_ADDR_LEN;

system/stack/bnep/bnep_int.h

+4 −4
Original line number Diff line number Diff line
@@ -135,16 +135,16 @@ typedef struct { 
  uint16_t sent_prot_filter_end[BNEP_MAX_PROT_FILTERS];



  uint16_t sent_mcast_filters;

  BD_ADDR sent_mcast_filter_start[BNEP_MAX_MULTI_FILTERS];

  BD_ADDR sent_mcast_filter_end[BNEP_MAX_MULTI_FILTERS];

  bt_bdaddr_t sent_mcast_filter_start[BNEP_MAX_MULTI_FILTERS];

  bt_bdaddr_t sent_mcast_filter_end[BNEP_MAX_MULTI_FILTERS];



  uint16_t rcvd_num_filters;

  uint16_t rcvd_prot_filter_start[BNEP_MAX_PROT_FILTERS];

  uint16_t rcvd_prot_filter_end[BNEP_MAX_PROT_FILTERS];



  uint16_t rcvd_mcast_filters;

  BD_ADDR rcvd_mcast_filter_start[BNEP_MAX_MULTI_FILTERS];

  BD_ADDR rcvd_mcast_filter_end[BNEP_MAX_MULTI_FILTERS];

  bt_bdaddr_t rcvd_mcast_filter_start[BNEP_MAX_MULTI_FILTERS];

  bt_bdaddr_t rcvd_mcast_filter_end[BNEP_MAX_MULTI_FILTERS];



  uint16_t bad_pkts_rcvd;

  uint8_t re_transmits;

system/stack/bnep/bnep_utils.cc

+12 −12
Original line number Diff line number Diff line
@@ -302,9 +302,9 @@ void bnepu_send_peer_our_multi_filters(tBNEP_CONN* p_bcb) { 


  UINT16_TO_BE_STREAM(p, (2 * BD_ADDR_LEN * p_bcb->sent_mcast_filters));

  for (xx = 0; xx < p_bcb->sent_mcast_filters; xx++) {

    memcpy(p, p_bcb->sent_mcast_filter_start[xx], BD_ADDR_LEN);

    memcpy(p, p_bcb->sent_mcast_filter_start[xx].address, BD_ADDR_LEN);

    p += BD_ADDR_LEN;

    memcpy(p, p_bcb->sent_mcast_filter_end[xx], BD_ADDR_LEN);

    memcpy(p, p_bcb->sent_mcast_filter_end[xx].address, BD_ADDR_LEN);

    p += BD_ADDR_LEN;

  }
@@ -1022,17 +1022,17 @@ void bnepu_process_peer_multicast_filter_set(tBNEP_CONN* p_bcb, 


  p_bcb->rcvd_mcast_filters = num_filters;

  for (xx = 0; xx < num_filters; xx++) {

    memcpy(p_bcb->rcvd_mcast_filter_start[xx], p_filters, BD_ADDR_LEN);

    memcpy(p_bcb->rcvd_mcast_filter_end[xx], p_filters + BD_ADDR_LEN,

    memcpy(p_bcb->rcvd_mcast_filter_start[xx].address, p_filters, BD_ADDR_LEN);

    memcpy(p_bcb->rcvd_mcast_filter_end[xx].address, p_filters + BD_ADDR_LEN,

           BD_ADDR_LEN);

    p_filters += (BD_ADDR_LEN * 2);



    /* Check if any of the ranges have all zeros as both starting and ending

     * addresses */

    if ((memcmp(null_bda, p_bcb->rcvd_mcast_filter_start[xx], BD_ADDR_LEN) ==

         0) &&

        (memcmp(null_bda, p_bcb->rcvd_mcast_filter_end[xx], BD_ADDR_LEN) ==

         0)) {

    if ((memcmp(null_bda, p_bcb->rcvd_mcast_filter_start[xx].address,

                BD_ADDR_LEN) == 0) &&

        (memcmp(null_bda, p_bcb->rcvd_mcast_filter_end[xx].address,

                BD_ADDR_LEN) == 0)) {

      p_bcb->rcvd_mcast_filters = 0xFFFF;

      break;

    }
@@ -1235,10 +1235,10 @@ tBNEP_RESULT bnep_is_packet_allowed(tBNEP_CONN* p_bcb, 
    if (p_bcb->rcvd_mcast_filters != 0xFFFF) {

      /* Check if the address is mentioned in the filter range */

      for (i = 0; i < p_bcb->rcvd_mcast_filters; i++) {

        if ((memcmp(p_bcb->rcvd_mcast_filter_start[i], p_dest_addr.address,

                    BD_ADDR_LEN) <= 0) &&

            (memcmp(p_bcb->rcvd_mcast_filter_end[i], p_dest_addr.address,

                    BD_ADDR_LEN) >= 0))

        if ((memcmp(p_bcb->rcvd_mcast_filter_start[i].address,

                    p_dest_addr.address, BD_ADDR_LEN) <= 0) &&

            (memcmp(p_bcb->rcvd_mcast_filter_end[i].address,

                    p_dest_addr.address, BD_ADDR_LEN) >= 0))

          break;

      }

    }