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

Commit 71096082 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Gerrit Code Review
Browse files

Merge "l2c: move connection parameter management to separate file" into main

parents d20b54dd c96f33b1

system/stack/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ cc_library_static { 
        "hcic/hcicmds.cc",

        "l2cap/l2c_api.cc",

        "l2cap/l2c_ble.cc",

        "l2cap/l2c_ble_conn_params.cc",

        "l2cap/l2c_csm.cc",

        "l2cap/l2c_fcr.cc",

        "l2cap/l2c_link.cc",
@@ -1890,6 +1891,7 @@ cc_test { 
        ":TestMockStackSmp",

        "l2cap/l2c_api.cc",

        "l2cap/l2c_ble.cc",

        "l2cap/l2c_ble_conn_params.cc",

        "l2cap/l2c_csm.cc",

        "l2cap/l2c_fcr.cc",

        "l2cap/l2c_link.cc",

system/stack/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ source_set("stack") { 
    "hid/hidh_conn.cc",

    "l2cap/l2c_api.cc",

    "l2cap/l2c_ble.cc",

    "l2cap/l2c_ble_conn_params.cc",

    "l2cap/l2c_csm.cc",

    "l2cap/l2c_fcr.cc",

    "l2cap/l2c_link.cc",

system/stack/l2cap/l2c_ble.cc

+1 −480
Original line number Diff line number Diff line
@@ -67,105 +67,7 @@ extern tBTM_CB btm_cb; 


using base::StringPrintf;



static void l2cble_start_conn_update(tL2C_LCB* p_lcb);

static void l2cble_start_subrate_change(tL2C_LCB* p_lcb);



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

 *

 *  Function        L2CA_UpdateBleConnParams

 *

 *  Description     Update BLE connection parameters.

 *

 *  Parameters:     BD Address of remote

 *

 *  Return value:   true if update started

 *

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

bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda, uint16_t min_int,

                              uint16_t max_int, uint16_t latency,

                              uint16_t timeout, uint16_t min_ce_len,

                              uint16_t max_ce_len) {

  tL2C_LCB* p_lcb;



  /* See if we have a link control block for the remote device */

  p_lcb = l2cu_find_lcb_by_bd_addr(rem_bda, BT_TRANSPORT_LE);



  /* If we do not have one, create one and accept the connection. */

  if (!p_lcb || !BTM_IsAclConnectionUp(rem_bda, BT_TRANSPORT_LE)) {

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

    return (false);

  }



  if (p_lcb->transport != BT_TRANSPORT_LE) {

    LOG(WARNING) << __func__ << " - BD_ADDR " << rem_bda << " not LE";

    return (false);

  }



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

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

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



  p_lcb->min_interval = min_int;

  p_lcb->max_interval = max_int;

  p_lcb->latency = latency;

  p_lcb->timeout = timeout;

  p_lcb->conn_update_mask |= L2C_BLE_NEW_CONN_PARAM;

  p_lcb->min_ce_len = min_ce_len;

  p_lcb->max_ce_len = max_ce_len;



  l2cble_start_conn_update(p_lcb);



  return (true);

}



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

 *

 *  Function        L2CA_EnableUpdateBleConnParams

 *

 *  Description     Enable or disable update based on the request from the peer

 *

 *  Parameters:     BD Address of remote

 *

 *  Return value:   true if update started

 *

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

bool L2CA_EnableUpdateBleConnParams(const RawAddress& rem_bda, bool enable) {

  if (stack_config_get_interface()->get_pts_conn_updates_disabled())

    return false;



  tL2C_LCB* p_lcb;



  /* See if we have a link control block for the remote device */

  p_lcb = l2cu_find_lcb_by_bd_addr(rem_bda, BT_TRANSPORT_LE);



  if (!p_lcb) {

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

    return false;

  }



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

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

                          p_lcb->conn_update_mask);



  if (p_lcb->transport != BT_TRANSPORT_LE) {

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

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

                 << p_lcb->LinkRole();

    return false;

  }



  if (enable) {

    p_lcb->conn_update_mask &= ~L2C_BLE_CONN_UPDATE_DISABLE;

    p_lcb->subrate_req_mask &= ~L2C_BLE_SUBRATE_REQ_DISABLE;

  } else {

    p_lcb->conn_update_mask |= L2C_BLE_CONN_UPDATE_DISABLE;

    p_lcb->subrate_req_mask |= L2C_BLE_SUBRATE_REQ_DISABLE;

  }



  l2cble_start_conn_update(p_lcb);



  return (true);

}

void l2cble_start_conn_update(tL2C_LCB* p_lcb);



void L2CA_Consolidate(const RawAddress& identity_addr, const RawAddress& rpa) {

  tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(rpa, BT_TRANSPORT_LE);
@@ -295,130 +197,6 @@ bool l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda, 
  return true;

}



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

 *

 *  Function        l2cble_start_conn_update

 *

 *  Description     Start the BLE connection parameter update process based on

 *                  status.

 *

 *  Parameters:     lcb : l2cap link control block

 *

 *  Return value:   none

 *

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

static 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 " << p_lcb->remote_bd_addr;

    return;

  }



  // TODO(armansito): The return value of this call wasn't being used but the

  // logic of this function might be depending on its side effects. We should

  // verify if this call is needed at all and remove it otherwise.

  btm_find_or_alloc_dev(p_lcb->remote_bd_addr);



  if ((p_lcb->conn_update_mask & L2C_BLE_UPDATE_PENDING) ||

      (p_lcb->subrate_req_mask & L2C_BLE_SUBRATE_REQ_PENDING)) {

    return;

  }



  if (p_lcb->conn_update_mask & L2C_BLE_CONN_UPDATE_DISABLE) {

    /* application requests to disable parameters update.

       If parameters are already updated, lets set them

       up to what has been requested during connection establishement */

    if (p_lcb->conn_update_mask & L2C_BLE_NOT_DEFAULT_PARAM &&

        /* current connection interval is greater than default min */

        p_lcb->min_interval > BTM_BLE_CONN_INT_MIN) {

      /* use 7.5 ms as fast connection parameter, 0 peripheral latency */

      min_conn_int = max_conn_int = BTM_BLE_CONN_INT_MIN;



      L2CA_AdjustConnectionIntervals(&min_conn_int, &max_conn_int,

                                     BTM_BLE_CONN_INT_MIN);



      peripheral_latency = BTM_BLE_CONN_PERIPHERAL_LATENCY_DEF;

      supervision_tout = BTM_BLE_CONN_TIMEOUT_DEF;



      /* if both side 4.1, or we are central device, send HCI command */

      if (p_lcb->IsLinkRoleCentral() ||

          (controller_get_interface()

               ->SupportsBleConnectionParametersRequest() &&

           acl_peer_supports_ble_connection_parameters_request(

               p_lcb->remote_bd_addr))) {

        btsnd_hcic_ble_upd_ll_conn_params(p_lcb->Handle(), min_conn_int,

                                          max_conn_int, peripheral_latency,

                                          supervision_tout, 0, 0);

        p_lcb->conn_update_mask |= L2C_BLE_UPDATE_PENDING;

      } else {

        l2cu_send_peer_ble_par_req(p_lcb, min_conn_int, max_conn_int,

                                   peripheral_latency, supervision_tout);

      }

      p_lcb->conn_update_mask &= ~L2C_BLE_NOT_DEFAULT_PARAM;

      p_lcb->conn_update_mask |= L2C_BLE_NEW_CONN_PARAM;

    }

  } else {

    /* application allows to do update, if we were delaying one do it now */

    if (p_lcb->conn_update_mask & L2C_BLE_NEW_CONN_PARAM) {

      /* if both side 4.1, or we are central device, send HCI command */

      if (p_lcb->IsLinkRoleCentral() ||

          (controller_get_interface()

               ->SupportsBleConnectionParametersRequest() &&

           acl_peer_supports_ble_connection_parameters_request(

               p_lcb->remote_bd_addr))) {

        btsnd_hcic_ble_upd_ll_conn_params(p_lcb->Handle(), p_lcb->min_interval,

                                          p_lcb->max_interval, p_lcb->latency,

                                          p_lcb->timeout, p_lcb->min_ce_len,

                                          p_lcb->max_ce_len);

        p_lcb->conn_update_mask |= L2C_BLE_UPDATE_PENDING;

      } else {

        l2cu_send_peer_ble_par_req(p_lcb, p_lcb->min_interval,

                                   p_lcb->max_interval, p_lcb->latency,

                                   p_lcb->timeout);

      }

      p_lcb->conn_update_mask &= ~L2C_BLE_NEW_CONN_PARAM;

      p_lcb->conn_update_mask |= L2C_BLE_NOT_DEFAULT_PARAM;

    }

  }

}



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

 *

 * Function         l2cble_process_conn_update_evt

 *

 * Description      This function enables the connection update request from

 *                  remote after a successful connection update response is

 *                  received.

 *

 * Returns          void

 *

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

void l2cble_process_conn_update_evt(uint16_t handle, uint8_t status,

                                    uint16_t interval, uint16_t latency,

                                    uint16_t timeout) {

  LOG_VERBOSE("%s", __func__);



  /* See if we have a link control block for the remote device */

  tL2C_LCB* p_lcb = l2cu_find_lcb_by_handle(handle);

  if (!p_lcb) {

    LOG_WARN("%s: Invalid handle: %d", __func__, handle);

    return;

  }



  p_lcb->conn_update_mask &= ~L2C_BLE_UPDATE_PENDING;



  if (status != HCI_SUCCESS) {

    LOG_WARN("%s: Error status: %d", __func__, status);

  }



  l2cble_start_conn_update(p_lcb);



  l2cble_start_subrate_change(p_lcb);



  LOG_VERBOSE("%s: conn_update_mask=%d , subrate_req_mask=%d", __func__,

              p_lcb->conn_update_mask, p_lcb->subrate_req_mask);

}



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

 *

 * Function         l2cble_handle_connect_rsp_neg
@@ -1300,42 +1078,6 @@ void l2c_ble_link_adjust_allocation(void) { 
  }

}



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

 *

 * Function         l2cble_process_rc_param_request_evt

 *

 * Description      process LE Remote Connection Parameter Request Event.

 *

 * Returns          void

 *

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

void l2cble_process_rc_param_request_evt(uint16_t handle, uint16_t int_min,

                                         uint16_t int_max, uint16_t latency,

                                         uint16_t timeout) {

  tL2C_LCB* p_lcb = l2cu_find_lcb_by_handle(handle);



  if (p_lcb != NULL) {

    p_lcb->min_interval = int_min;

    p_lcb->max_interval = int_max;

    p_lcb->latency = latency;

    p_lcb->timeout = timeout;



    /* if update is enabled, always accept connection parameter update */

    if ((p_lcb->conn_update_mask & L2C_BLE_CONN_UPDATE_DISABLE) == 0) {

      btsnd_hcic_ble_rc_param_req_reply(handle, int_min, int_max, latency,

                                        timeout, 0, 0);

    } else {

      LOG_VERBOSE("L2CAP - LE - update currently disabled");

      p_lcb->conn_update_mask |= L2C_BLE_NEW_CONN_PARAM;

      btsnd_hcic_ble_rc_param_req_neg_reply(handle,

                                            HCI_ERR_UNACCEPT_CONN_INTERVAL);

    }



  } else {

    LOG_WARN("No link to update connection parameter");

  }

}



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

 *

 * Function         l2cble_update_data_length
@@ -1696,224 +1438,3 @@ void L2CA_AdjustConnectionIntervals(uint16_t* min_interval, 
    *max_interval = phone_min_interval;

  }

}
 


void l2cble_use_preferred_conn_params(const RawAddress& bda) {

  tL2C_LCB* p_lcb = l2cu_find_lcb_by_bd_addr(bda, BT_TRANSPORT_LE);

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda);



  /* If there are any preferred connection parameters, set them now */

  if ((p_lcb != NULL) && (p_dev_rec != NULL) &&

      (p_dev_rec->conn_params.min_conn_int >= BTM_BLE_CONN_INT_MIN) &&

      (p_dev_rec->conn_params.min_conn_int <= BTM_BLE_CONN_INT_MAX) &&

      (p_dev_rec->conn_params.max_conn_int >= BTM_BLE_CONN_INT_MIN) &&

      (p_dev_rec->conn_params.max_conn_int <= BTM_BLE_CONN_INT_MAX) &&

      (p_dev_rec->conn_params.peripheral_latency <= BTM_BLE_CONN_LATENCY_MAX) &&

      (p_dev_rec->conn_params.supervision_tout >= BTM_BLE_CONN_SUP_TOUT_MIN) &&

      (p_dev_rec->conn_params.supervision_tout <= BTM_BLE_CONN_SUP_TOUT_MAX) &&

      ((p_lcb->min_interval < p_dev_rec->conn_params.min_conn_int &&

        p_dev_rec->conn_params.min_conn_int != BTM_BLE_CONN_PARAM_UNDEF) ||

       (p_lcb->min_interval > p_dev_rec->conn_params.max_conn_int) ||

       (p_lcb->latency > p_dev_rec->conn_params.peripheral_latency) ||

       (p_lcb->timeout > p_dev_rec->conn_params.supervision_tout))) {

    LOG_VERBOSE(

        "%s: HANDLE=%d min_conn_int=%d max_conn_int=%d peripheral_latency=%d "

        "supervision_tout=%d",

        __func__, p_lcb->Handle(), p_dev_rec->conn_params.min_conn_int,

        p_dev_rec->conn_params.max_conn_int,

        p_dev_rec->conn_params.peripheral_latency,

        p_dev_rec->conn_params.supervision_tout);



    p_lcb->min_interval = p_dev_rec->conn_params.min_conn_int;

    p_lcb->max_interval = p_dev_rec->conn_params.max_conn_int;

    p_lcb->timeout = p_dev_rec->conn_params.supervision_tout;

    p_lcb->latency = p_dev_rec->conn_params.peripheral_latency;



    btsnd_hcic_ble_upd_ll_conn_params(

        p_lcb->Handle(), p_dev_rec->conn_params.min_conn_int,

        p_dev_rec->conn_params.max_conn_int,

        p_dev_rec->conn_params.peripheral_latency,

        p_dev_rec->conn_params.supervision_tout, 0, 0);

  }

}



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

 *

 *  Function        l2cble_start_subrate_change

 *

 *  Description     Start the BLE subrate change process based on

 *                  status.

 *

 *  Parameters:     lcb : l2cap link control block

 *

 *  Return value:   none

 *

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

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);

    return;

  }



  btm_find_or_alloc_dev(p_lcb->remote_bd_addr);



  LOG_VERBOSE("%s: subrate_req_mask=%d conn_update_mask=%d", __func__,

              p_lcb->subrate_req_mask, p_lcb->conn_update_mask);



  if (p_lcb->subrate_req_mask & L2C_BLE_SUBRATE_REQ_PENDING) {

    LOG_VERBOSE("%s: returning L2C_BLE_SUBRATE_REQ_PENDING ", __func__);

    return;

  }



  if (p_lcb->subrate_req_mask & L2C_BLE_SUBRATE_REQ_DISABLE) {

    LOG_VERBOSE("%s: returning L2C_BLE_SUBRATE_REQ_DISABLE ", __func__);

    return;

  }



  /* application allows to do update, if we were delaying one do it now */

  if (!(p_lcb->subrate_req_mask & L2C_BLE_NEW_SUBRATE_PARAM) ||

      (p_lcb->conn_update_mask & L2C_BLE_UPDATE_PENDING) ||

      (p_lcb->conn_update_mask & L2C_BLE_NEW_CONN_PARAM)) {

    LOG_VERBOSE("%s: returning L2C_BLE_NEW_SUBRATE_PARAM", __func__);

    return;

  }



  if (!controller_get_interface()->SupportsBleConnectionSubrating() ||

      !acl_peer_supports_ble_connection_subrating(p_lcb->remote_bd_addr) ||

      !acl_peer_supports_ble_connection_subrating_host(p_lcb->remote_bd_addr)) {

    LOG_VERBOSE(

        "%s: returning L2C_BLE_NEW_SUBRATE_PARAM local_host_sup=%d, "

        "local_conn_subrarte_sup=%d, peer_subrate_sup=%d, peer_host_sup=%d",

        __func__,

        controller_get_interface()->SupportsBleConnectionSubratingHost(),

        controller_get_interface()->SupportsBleConnectionSubrating(),

        acl_peer_supports_ble_connection_subrating(p_lcb->remote_bd_addr),

        acl_peer_supports_ble_connection_subrating_host(p_lcb->remote_bd_addr));

    return;

  }



  LOG_VERBOSE("%s: Sending HCI cmd for subrate req", __func__);

  bluetooth::shim::ACL_LeSubrateRequest(

      p_lcb->Handle(), p_lcb->subrate_min, p_lcb->subrate_max,

      p_lcb->max_latency, p_lcb->cont_num, p_lcb->supervision_tout);



  p_lcb->subrate_req_mask |= L2C_BLE_SUBRATE_REQ_PENDING;

  p_lcb->subrate_req_mask &= ~L2C_BLE_NEW_SUBRATE_PARAM;

  p_lcb->conn_update_mask |= L2C_BLE_NOT_DEFAULT_PARAM;

}



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

 *

 *  Function        L2CA_SetDefaultSubrate

 *

 *  Description     BLE Set Default Subrate

 *

 *  Parameters:     Subrate parameters

 *

 *  Return value:   void

 *

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

void L2CA_SetDefaultSubrate(uint16_t subrate_min, uint16_t subrate_max,

                            uint16_t max_latency, uint16_t cont_num,

                            uint16_t timeout) {

  VLOG(1) << __func__ << " subrate_min=" << subrate_min

          << ", subrate_max=" << subrate_max << ", max_latency=" << max_latency

          << ", cont_num=" << cont_num << ", timeout=" << timeout;



  bluetooth::shim::ACL_LeSetDefaultSubrate(subrate_min, subrate_max,

                                           max_latency, cont_num, timeout);

}



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

 *

 *  Function        L2CA_SubrateRequest

 *

 *  Description     BLE Subrate request.

 *

 *  Parameters:     Subrate parameters

 *

 *  Return value:   true if update started

 *

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

bool L2CA_SubrateRequest(const RawAddress& rem_bda, uint16_t subrate_min,

                         uint16_t subrate_max, uint16_t max_latency,

                         uint16_t cont_num, uint16_t timeout) {

  tL2C_LCB* p_lcb;



  /* See if we have a link control block for the remote device */

  p_lcb = l2cu_find_lcb_by_bd_addr(rem_bda, BT_TRANSPORT_LE);



  /* If we don't have one, create one and accept the connection. */

  if (!p_lcb || !BTM_IsAclConnectionUp(rem_bda, BT_TRANSPORT_LE)) {

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

                 << ADDRESS_TO_LOGGABLE_STR(rem_bda);

    return (false);

  }



  if (p_lcb->transport != BT_TRANSPORT_LE) {

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

                 << ADDRESS_TO_LOGGABLE_STR(rem_bda) << " not LE";

    return (false);

  }



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

          << ", subrate_min=" << subrate_min << ", subrate_max=" << subrate_max

          << ", max_latency=" << max_latency << ", cont_num=" << cont_num

          << ", timeout=" << timeout;



  p_lcb->subrate_min = subrate_min;

  p_lcb->subrate_max = subrate_max;

  p_lcb->max_latency = max_latency;

  p_lcb->cont_num = cont_num;

  p_lcb->subrate_req_mask |= L2C_BLE_NEW_SUBRATE_PARAM;

  p_lcb->supervision_tout = timeout;



  l2cble_start_subrate_change(p_lcb);



  return (true);

}



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

 *

 * Function         l2cble_process_subrate_change_evt

 *

 * Description      This function enables LE subrating

 *                  after a successful subrate change process is

 *                  done.

 *

 * Parameters:      LE connection handle

 *                  status

 *                  subrate factor

 *                  peripheral latency

 *                  continuation number

 *                  supervision timeout

 *

 * Returns          void

 *

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

void l2cble_process_subrate_change_evt(uint16_t handle, uint8_t status,

                                       uint16_t subrate_factor,

                                       uint16_t peripheral_latency,

                                       uint16_t cont_num, uint16_t timeout) {

  LOG_VERBOSE("%s", __func__);



  /* See if we have a link control block for the remote device */

  tL2C_LCB* p_lcb = l2cu_find_lcb_by_handle(handle);

  if (!p_lcb) {

    LOG_WARN("%s: Invalid handle: %d", __func__, handle);

    return;

  }



  p_lcb->subrate_req_mask &= ~L2C_BLE_SUBRATE_REQ_PENDING;



  if (status != HCI_SUCCESS) {

    LOG_WARN("%s: Error status: %d", __func__, status);

  }



  l2cble_start_conn_update(p_lcb);



  l2cble_start_subrate_change(p_lcb);



  LOG_VERBOSE("%s: conn_update_mask=%d , subrate_req_mask=%d", __func__,

              p_lcb->conn_update_mask, p_lcb->subrate_req_mask);

}

system/stack/l2cap/l2c_ble_conn_params.cc

0 → 100644
+533 −0

File added.

Preview size limit exceeded, changes collapsed.