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

Commit d9702c15 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "Remove dependency on btm_cb in smp" into main

parents cc4953a7 f9bae499

system/btif/src/stack_manager.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -317,7 +317,7 @@ static void event_start_up_stack(bluetooth::core::CoreInterface* interface, 
  l2c_init();

  l2c_init();

  sdp_init();

  sdp_init();

  gatt_init();

  gatt_init();

  SMP_Init();

  SMP_Init(get_btm_client_interface().security.BTM_GetSecurityMode());

  get_btm_client_interface().lifecycle.btm_ble_init();

  get_btm_client_interface().lifecycle.btm_ble_init();





  RFCOMM_Init();

  RFCOMM_Init();

system/stack/btm/btm_client_interface.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,7 @@ struct btm_client_interface_t btm_client_interface = { 
            .BTM_SecIsSecurityPending = BTM_SecIsSecurityPending,

            .BTM_SecIsSecurityPending = BTM_SecIsSecurityPending,

            .BTM_IsLinkKeyKnown = BTM_IsLinkKeyKnown,

            .BTM_IsLinkKeyKnown = BTM_IsLinkKeyKnown,

            .BTM_BleSirkConfirmDeviceReply = BTM_BleSirkConfirmDeviceReply,

            .BTM_BleSirkConfirmDeviceReply = BTM_BleSirkConfirmDeviceReply,

            .BTM_GetSecurityMode = BTM_GetSecurityMode,

        },

        },





    .ble =

    .ble =

system/stack/btm/btm_sec.cc

+12 −0
Original line number Original line Diff line number Diff line
@@ -1494,6 +1494,18 @@ tBT_DEVICE_TYPE BTM_GetPeerDeviceTypeFromFeatures(const RawAddress& bd_addr) { 
  return BT_DEVICE_TYPE_BREDR;

  return BT_DEVICE_TYPE_BREDR;

}

}





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

 *

 * Function         BTM_GetInitialSecurityMode

 *

 * Description      This function is called to retrieve the configured

 *                  security mode.

 *

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

uint8_t BTM_GetSecurityMode() {

  return btm_cb.security_mode;

}



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

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

 *              I N T E R N A L     F U N C T I O N S

 *              I N T E R N A L     F U N C T I O N S

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

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

system/stack/btm/btm_sec.h

+10 −0
Original line number Original line Diff line number Diff line
@@ -380,6 +380,16 @@ bool BTM_BothEndsSupportSecureConnections(const RawAddress& bd_addr); 
 ******************************************************************************/

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

bool BTM_PeerSupportsSecureConnections(const RawAddress& bd_addr);

bool BTM_PeerSupportsSecureConnections(const RawAddress& bd_addr);





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

 *

 * Function         BTM_GetInitialSecurityMode

 *

 * Description      This function is called to retrieve the configured

 *                  security mode.

 *

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

uint8_t BTM_GetSecurityMode();



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

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

 *

 *

 * Function         btm_sec_l2cap_access_req

 * Function         btm_sec_l2cap_access_req

system/stack/fuzzers/smp_fuzzer.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -185,7 +185,7 @@ void Fuzz(const uint8_t* data, size_t size) { 




  btm_cb = tBTM_CB();

  btm_cb = tBTM_CB();





  SMP_Init();

  SMP_Init(BTM_SEC_MODE_SP);

  SMP_Register(smp_callback);

  SMP_Register(smp_callback);

  SMP_SetTraceLevel(BT_TRACE_LEVEL_DEBUG);

  SMP_SetTraceLevel(BT_TRACE_LEVEL_DEBUG);

  SMP_ClearLocScOobData();

  SMP_ClearLocScOobData();