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

Commit 29c8ed05 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Re-log stack/l2cap/l2c_api::L2CA_ConnectFixedChnl am: b426c90d 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1458587

Change-Id: I517e4df316e1fcb7d08bdf7d37ea5e9b8349ccb0
parents 9813a838 b426c90d

system/stack/l2cap/l2c_api.cc

+15 −11
Original line number Diff line number Diff line
@@ -1160,21 +1160,20 @@ bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda) { 
  tL2C_LCB* p_lcb;

  tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;



  VLOG(1) << __func__ << " BDA: " << rem_bda

          << StringPrintf("CID: 0x%04x ", fixed_cid);

  LOG_DEBUG(" fixed_cid:0x%04x", fixed_cid);



  // Check CID is valid and registered

  if ((fixed_cid < L2CAP_FIRST_FIXED_CHNL) ||

      (fixed_cid > L2CAP_LAST_FIXED_CHNL) ||

      (l2cb.fixed_reg[fixed_cid - L2CAP_FIRST_FIXED_CHNL].pL2CA_FixedData_Cb ==

       NULL)) {

    L2CAP_TRACE_ERROR("%s() Invalid CID: 0x%04x", __func__, fixed_cid);

    LOG_ERROR("Invalid fixed_cid:0x%04x", fixed_cid);

    return (false);

  }



  // Fail if BT is not yet up

  if (!BTM_IsDeviceUp()) {

    L2CAP_TRACE_WARNING("%s(0x%04x) - BTU not ready", __func__, fixed_cid);

    LOG_WARN("Bt controller is not ready fixed_cid:0x%04x", fixed_cid);

    return (false);

  }
@@ -1196,20 +1195,22 @@ bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda) { 


    // Check for supported channel

    if (!(peer_channel_mask & (1 << fixed_cid))) {

      VLOG(2) << __func__ << " BDA " << rem_bda

              << StringPrintf(" CID:0x%04x not supported", fixed_cid);

      LOG_INFO("Peer device does not support fixed_cid:0x%04x", fixed_cid);

      return false;

    }



    // Get a CCB and link the lcb to it

    if (!l2cu_initialize_fixed_ccb(p_lcb, fixed_cid)) {

      L2CAP_TRACE_WARNING("%s(0x%04x) - LCB but no CCB", __func__, fixed_cid);

      LOG_WARN("Unable to allocate fixed channel resource fixed_cid:0x%04x",

               fixed_cid);

      return false;

    }



    // racing with disconnecting, queue the connection request

    if (p_lcb->link_state == LST_DISCONNECTING) {

      L2CAP_TRACE_DEBUG("$s() - link disconnecting: RETRY LATER", __func__);

      LOG_DEBUG(

          "Link is disconnecting so deferring connection fixed_cid:0x%04x",

          fixed_cid);

      /* Save ccb so it can be started after disconnect is finished */

      p_lcb->p_pending_ccb =

          p_lcb->p_fixed_ccbs[fixed_cid - L2CAP_FIRST_FIXED_CHNL];
@@ -1224,14 +1225,16 @@ bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda) { 
  // No link. Get an LCB and start link establishment

  p_lcb = l2cu_allocate_lcb(rem_bda, false, transport);

  if (p_lcb == NULL) {

    L2CAP_TRACE_WARNING("%s(0x%04x) - no LCB", __func__, fixed_cid);

    LOG_WARN("Unable to allocate link resource for connection fixed_cid:0x%04x",

             fixed_cid);

    return false;

  }



  // Get a CCB and link the lcb to it

  if (!l2cu_initialize_fixed_ccb(p_lcb, fixed_cid)) {

    p_lcb->SetDisconnectReason(L2CAP_CONN_NO_RESOURCES);

    L2CAP_TRACE_WARNING("%s(0x%04x) - no CCB", __func__, fixed_cid);

    LOG_WARN("Unable to allocate fixed channel resource fixed_cid:0x%04x",

             fixed_cid);

    l2cu_release_lcb(p_lcb);

    return false;

  }
@@ -1239,7 +1242,8 @@ bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda) { 
  if (transport == BT_TRANSPORT_LE) {

    bool ret = l2cu_create_conn_le(p_lcb, initiating_phys);

    if (!ret) {

      L2CAP_TRACE_WARNING("%s() - create connection failed", __func__);

      LOG_WARN("Unable to create fixed channel le connection fixed_cid:0x%04x",

               fixed_cid);

      l2cu_release_lcb(p_lcb);

      return false;

    }