From 84c0c5c71bbcb9cd72ecf3a1f16d5b971ddc747a Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Mon, 14 Sep 2020 13:19:24 +0200 Subject: [PATCH] sm: initialize callback of sm_run_timer only in sm_init() --- src/ble/sm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ble/sm.c b/src/ble/sm.c index a5de8b58f..1b5134fb2 100644 --- a/src/ble/sm.c +++ b/src/ble/sm.c @@ -461,7 +461,9 @@ static inline void sm_pairing_packet_set_responder_key_distribution(sm_pairing_p static int sm_is_null(uint8_t * data, int size){ int i; for (i=0; i < size ; i++){ - if (data[i]) return 0; + if (data[i] != 0) { + return 0; + } } return 1; } @@ -481,8 +483,7 @@ static void sm_run_timer_handler(btstack_timer_source_t * ts){ } static void sm_trigger_run(void){ static btstack_timer_source_t sm_run_timer; - btstack_run_loop_remove_timer(&sm_run_timer); - btstack_run_loop_set_timer_handler(&sm_run_timer, &sm_run_timer_handler); + (void)btstack_run_loop_remove_timer(&sm_run_timer); btstack_run_loop_set_timer(&sm_run_timer, 0); btstack_run_loop_add_timer(&sm_run_timer); } @@ -4114,6 +4115,8 @@ void sm_init(void){ test_use_fixed_local_csrk = false; + btstack_run_loop_set_timer_handler(&sm_run_timer, &sm_run_timer_handler); + // register for HCI Events from HCI hci_event_callback_registration.callback = &sm_event_packet_handler; hci_add_event_handler(&hci_event_callback_registration);