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

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

Restore LE CoC l2cap conn rsp 

L2cap connection response not generated as server
Plus default config options were not being set

Re: 7872adaf

Bug: 170396407
Test: Wireshark shows conn rsp being emitted w/default vals
Test: act -tc BleCocTest
Tag: #refactor
Change-Id: I0f696c2e0bac996ae2b9521fdb282577b9e8528a
parent b2f9af0f

system/stack/l2cap/l2c_ble.cc

+5 −0
Original line number Diff line number Diff line
@@ -628,6 +628,11 @@ void l2cble_process_sig_cmd(tL2C_LCB* p_lcb, uint8_t* p, uint16_t pkt_len) { 
      p_ccb->p_rcb = p_rcb;

      p_ccb->remote_cid = rcid;



      p_ccb->local_conn_cfg.mtu = L2CAP_SDU_LENGTH_LE_MAX;

      p_ccb->local_conn_cfg.mps =

          controller_get_interface()->get_acl_data_size_ble();

      p_ccb->local_conn_cfg.credits = L2CAP_LE_CREDIT_DEFAULT,



      p_ccb->peer_conn_cfg.mtu = mtu;

      p_ccb->peer_conn_cfg.mps = mps;

      p_ccb->peer_conn_cfg.credits = initial_credit;

system/stack/l2cap/l2c_csm.cc

+1 −1
Original line number Diff line number Diff line
@@ -453,8 +453,8 @@ static void l2c_csm_term_w4_sec_comp(tL2C_CCB* p_ccb, uint16_t event, 
        alarm_set_on_mloop(p_ccb->l2c_ccb_timer, L2CAP_CHNL_CONNECT_TIMEOUT_MS,

                           l2c_ccb_timer_timeout, p_ccb);



        if (p_ccb->p_lcb->transport != BT_TRANSPORT_LE) {

        l2c_csm_send_connect_rsp(p_ccb);

        if (p_ccb->p_lcb->transport != BT_TRANSPORT_LE) {

          l2c_csm_send_config_req(p_ccb);

        } else {

          L2CAP_TRACE_API("L2CAP - Calling Connect_Ind_Cb(), CID: 0x%04x",