mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-25 00:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

move code to start timer on pairing request

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2015-02-27 19:14:15 +00:00
parent abace5deec
commit 334856fa1b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ble/sm.c
View File

@ -816,9 +816,6 @@ void sm_initiator_setup2(sm_connection_t * sm_conn){
// identical to responder // identical to responder
// start SM timeout
sm_timeout_start(sm_conn);
// decide on STK generation method // decide on STK generation method
sm_setup_tk(); sm_setup_tk();
log_info("SMP: generation method %u", setup->sm_stk_generation_method); log_info("SMP: generation method %u", setup->sm_stk_generation_method);
@ -863,9 +860,6 @@ static void sm_responder_setup(sm_connection_t * sm_conn){
// setup key distribution // setup key distribution
sm_setup_key_distribution(setup->sm_m_preq.responder_key_distribution); sm_setup_key_distribution(setup->sm_m_preq.responder_key_distribution);
// start SM timeout
sm_timeout_start(sm_conn);
// decide on STK generation method // decide on STK generation method
sm_setup_tk(); sm_setup_tk();
log_info("SMP: generation method %u", setup->sm_stk_generation_method); log_info("SMP: generation method %u", setup->sm_stk_generation_method);
@ -1046,6 +1040,7 @@ static void sm_run(void){
switch (sm_connection->sm_engine_state) { switch (sm_connection->sm_engine_state) {
case SM_RESPONDER_PH1_PAIRING_REQUEST_RECEIVED: case SM_RESPONDER_PH1_PAIRING_REQUEST_RECEIVED:
sm_responder_setup(sm_connection); sm_responder_setup(sm_connection);
sm_timeout_start(sm_connection);
break; break;
case SM_RESPONDER_RECEIVED_LTK: case SM_RESPONDER_RECEIVED_LTK:
// re-establish previously used LTK using Rand and EDIV // re-establish previously used LTK using Rand and EDIV
@ -1062,6 +1057,7 @@ static void sm_run(void){
break; break;
case SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST: case SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST:
sm_initiator_setup(sm_connection); sm_initiator_setup(sm_connection);
sm_timeout_start(sm_connection);
break; break;
default: default:
done = 0; done = 0;