From 334856fa1b1797f68bd89adc8299b96bc129fac4 Mon Sep 17 00:00:00 2001 From: "matthias.ringwald@gmail.com" Date: Fri, 27 Feb 2015 19:14:15 +0000 Subject: [PATCH] move code to start timer on pairing request --- ble/sm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ble/sm.c b/ble/sm.c index d3aa9ca6e..4b5f20698 100644 --- a/ble/sm.c +++ b/ble/sm.c @@ -816,9 +816,6 @@ void sm_initiator_setup2(sm_connection_t * sm_conn){ // identical to responder - // start SM timeout - sm_timeout_start(sm_conn); - // decide on STK generation method sm_setup_tk(); 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 sm_setup_key_distribution(setup->sm_m_preq.responder_key_distribution); - // start SM timeout - sm_timeout_start(sm_conn); - // decide on STK generation method sm_setup_tk(); 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) { case SM_RESPONDER_PH1_PAIRING_REQUEST_RECEIVED: sm_responder_setup(sm_connection); + sm_timeout_start(sm_connection); break; case SM_RESPONDER_RECEIVED_LTK: // re-establish previously used LTK using Rand and EDIV @@ -1062,6 +1057,7 @@ static void sm_run(void){ break; case SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST: sm_initiator_setup(sm_connection); + sm_timeout_start(sm_connection); break; default: done = 0;