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

call sm_init_setup from sm_run()

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2015-02-26 15:07:24 +00:00
parent 6731b28f11
commit 3143670f4d
1 changed files with 7 additions and 2 deletions

9
ble/sm.c

@ -765,6 +765,11 @@ static void sm_run(void){
// TODO: iterate over all hci_connections instead of handling the single connection // TODO: iterate over all hci_connections instead of handling the single connection
sm_connection_t * connection = &single_connection; sm_connection_t * connection = &single_connection;
// TODO: step only possible if setup not locked to yet
if (connection->sm_engine_state == SM_GENERAL_CONNECTED){
sm_init_setup(sm_conn);
}
// assert that we can send at least commands // assert that we can send at least commands
if (!hci_can_send_command_packet_now()) return; if (!hci_can_send_command_packet_now()) return;
@ -1494,8 +1499,7 @@ static void sm_event_packet_handler (uint8_t packet_type, uint16_t channel, uint
sm_conn->sm_connection_authorization_state = AUTHORIZATION_UNKNOWN; sm_conn->sm_connection_authorization_state = AUTHORIZATION_UNKNOWN;
// just connected -> sm_run() // just connected -> sm_run()
// sm_conn->sm_engine_state = SM_GENERAL_CONNECTED; sm_conn->sm_engine_state = SM_GENERAL_CONNECTED;
sm_init_setup(sm_conn);
break; break;
case HCI_SUBEVENT_LE_LONG_TERM_KEY_REQUEST: case HCI_SUBEVENT_LE_LONG_TERM_KEY_REQUEST:
@ -1580,6 +1584,7 @@ static void sm_event_packet_handler (uint8_t packet_type, uint16_t channel, uint
sm_run(); sm_run();
} }
static inline int sm_calc_actual_encryption_key_size(int other){ static inline int sm_calc_actual_encryption_key_size(int other){
if (other < sm_min_encryption_key_size) return 0; if (other < sm_min_encryption_key_size) return 0;
if (other < sm_max_encryption_key_size) return other; if (other < sm_max_encryption_key_size) return other;