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

Commit 85f0ffb7 authored by Chris Manton's avatar Chris Manton
Browse files

Stat-ify stack::smp::smp_key_distribution_by_transport 

Bug: 224999611
Test: net_test_stack_btm

Change-Id: I4810f519f53d07c925ea750750d1a6e55a46501a
parent f771f5b6

system/stack/smp/smp_act.cc

+5 −1
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ namespace { 
constexpr char kBtmLogTag[] = "SMP";

}



static void smp_key_distribution_by_transport(tSMP_CB* p_cb,

                                              tSMP_INT_DATA* p_data);



#define SMP_KEY_DIST_TYPE_MAX 4



const tSMP_ACT smp_distribute_act[] = {
@@ -2245,7 +2248,8 @@ void smp_br_process_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
 * Description  depending on the transport used at the moment calls either

 *              smp_key_distribution(...) or smp_br_key_distribution(...).

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

void smp_key_distribution_by_transport(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {

static void smp_key_distribution_by_transport(tSMP_CB* p_cb,

                                              tSMP_INT_DATA* p_data) {

  SMP_TRACE_DEBUG("%s", __func__);

  if (p_cb->smp_over_br) {

    smp_br_select_next_key(p_cb, NULL);

system/stack/smp/smp_int.h

+0 −1
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ void smp_br_send_pair_response(tSMP_CB* p_cb, tSMP_INT_DATA* p_data); 
void smp_br_check_authorization_request(tSMP_CB* p_cb, tSMP_INT_DATA* p_data);

void smp_br_select_next_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data);

void smp_br_process_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data);

void smp_key_distribution_by_transport(tSMP_CB* p_cb, tSMP_INT_DATA* p_data);

void smp_br_pairing_complete(tSMP_CB* p_cb, tSMP_INT_DATA* p_data);



/* smp_l2c */

system/test/mock/mock_stack_smp_act.cc

+0 −5
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ struct smp_set_derive_link_key smp_set_derive_link_key; 
struct smp_derive_link_key_from_long_term_key

    smp_derive_link_key_from_long_term_key;

struct smp_br_process_link_key smp_br_process_link_key;

struct smp_key_distribution_by_transport smp_key_distribution_by_transport;

struct smp_br_pairing_complete smp_br_pairing_complete;



}  // namespace stack_smp_act
@@ -417,10 +416,6 @@ void smp_br_process_link_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  inc_func_call_count(__func__);

  test::mock::stack_smp_act::smp_br_process_link_key(p_cb, p_data);

}

void smp_key_distribution_by_transport(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {

  inc_func_call_count(__func__);

  test::mock::stack_smp_act::smp_key_distribution_by_transport(p_cb, p_data);

}

void smp_br_pairing_complete(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {

  inc_func_call_count(__func__);

  test::mock::stack_smp_act::smp_br_pairing_complete(p_cb, p_data);

system/test/mock/mock_stack_smp_act.h

+0 −10
Original line number Diff line number Diff line
@@ -679,16 +679,6 @@ struct smp_br_process_link_key { 
  void operator()(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { body(p_cb, p_data); };

};

extern struct smp_br_process_link_key smp_br_process_link_key;

// Name: smp_key_distribution_by_transport

// Params: tSMP_CB* p_cb, tSMP_INT_DATA* p_data

// Returns: void

struct smp_key_distribution_by_transport {

  std::function<void(tSMP_CB* p_cb, tSMP_INT_DATA* p_data)> body{

      [](tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {}};

  void operator()(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { body(p_cb, p_data); };

};

extern struct smp_key_distribution_by_transport

    smp_key_distribution_by_transport;

// Name: smp_br_pairing_complete

// Params: tSMP_CB* p_cb, tSMP_INT_DATA* p_data

// Returns: void