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

Commit f81b73cd authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Simplify avdt_sec_check_complete_term 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iabddefde41cc2f63b306efe0cd4eb7e59116141b
parent e6c5a278

system/stack/avdt/avdt_l2c.cc

+11 −19
Original line number Original line Diff line number Diff line
@@ -65,18 +65,15 @@ const tL2CAP_APPL_INFO avdt_l2c_appl = { 
 ******************************************************************************/

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

static void avdt_sec_check_complete_term(const RawAddress* bd_addr,

static void avdt_sec_check_complete_term(const RawAddress* bd_addr,

                                         tBT_TRANSPORT transport,

                                         tBT_TRANSPORT transport,

                                         UNUSED_ATTR void* p_ref_data,

                                         void* p_ref_data) {

                                         uint8_t res) {

  AvdtpCcb* p_ccb = NULL;

  AvdtpCcb* p_ccb = NULL;

  AvdtpTransportChannel* p_tbl;

  AvdtpTransportChannel* p_tbl;





  AVDT_TRACE_DEBUG("avdt_sec_check_complete_term res: %d", res);

  p_ccb = avdt_ccb_by_bd(*bd_addr);

  p_ccb = avdt_ccb_by_bd(*bd_addr);





  p_tbl = avdt_ad_tc_tbl_by_st(AVDT_CHAN_SIG, p_ccb, AVDT_AD_ST_SEC_ACP);

  p_tbl = avdt_ad_tc_tbl_by_st(AVDT_CHAN_SIG, p_ccb, AVDT_AD_ST_SEC_ACP);

  if (p_tbl == NULL) return;

  if (p_tbl == NULL) return;





  if (res == BTM_SUCCESS) {

  /* Send response to the L2CAP layer. */

  /* Send response to the L2CAP layer. */

  L2CA_ConnectRsp(*bd_addr, p_tbl->id, p_tbl->lcid, L2CAP_CONN_OK,

  L2CA_ConnectRsp(*bd_addr, p_tbl->id, p_tbl->lcid, L2CAP_CONN_OK,

                  L2CAP_CONN_OK);

                  L2CAP_CONN_OK);
@@ -88,11 +85,6 @@ static void avdt_sec_check_complete_term(const RawAddress* bd_addr, 




  /* transition to configuration state */

  /* transition to configuration state */

  p_tbl->state = AVDT_AD_ST_CFG;

  p_tbl->state = AVDT_AD_ST_CFG;

  } else {

    L2CA_ConnectRsp(*bd_addr, p_tbl->id, p_tbl->lcid, L2CAP_CONN_SECURITY_BLOCK,

                    L2CAP_CONN_OK);

    avdt_ad_tc_close_ind(p_tbl);

  }

}

}





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

/*******************************************************************************
@@ -174,7 +166,7 @@ void avdt_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, 
      }

      }

      /* Assume security check is complete */

      /* Assume security check is complete */

      avdt_sec_check_complete_term(&p_ccb->peer_addr, BT_TRANSPORT_BR_EDR,

      avdt_sec_check_complete_term(&p_ccb->peer_addr, BT_TRANSPORT_BR_EDR,

                                   nullptr, BTM_SUCCESS);

                                   nullptr);

      return;

      return;

    }

    }

  } else {

  } else {