mirror of
https://github.com/bluekitchen/btstack.git
synced 2025-04-01 04:20:33 +00:00
sm: send re-encryption complete on pairing complete if re-encryption started was sent earlier
This commit is contained in:
parent
0ccf6c9c72
commit
f61072f5b4
10
src/ble/sm.c
10
src/ble/sm.c
@ -620,6 +620,11 @@ static void sm_reencryption_complete(sm_connection_t * sm_conn, uint8_t status){
|
||||
}
|
||||
|
||||
static void sm_pairing_complete(sm_connection_t * sm_conn, uint8_t status, uint8_t reason){
|
||||
|
||||
if (setup->sm_reencryption_active){
|
||||
sm_reencryption_complete(sm_conn, status);
|
||||
}
|
||||
|
||||
uint8_t event[13];
|
||||
sm_setup_event_base(event, sizeof(event), SM_EVENT_PAIRING_COMPLETE, sm_conn->sm_handle, setup->sm_peer_addr_type, setup->sm_peer_address);
|
||||
event[11] = status;
|
||||
@ -643,11 +648,6 @@ static void sm_timeout_handler(btstack_timer_source_t * timer){
|
||||
log_info("SM timeout");
|
||||
sm_connection_t * sm_conn = (sm_connection_t*) btstack_run_loop_get_timer_context(timer);
|
||||
sm_conn->sm_engine_state = SM_GENERAL_TIMEOUT;
|
||||
|
||||
if (setup->sm_reencryption_active){
|
||||
sm_reencryption_complete(sm_conn, ERROR_CODE_CONNECTION_TIMEOUT);
|
||||
}
|
||||
|
||||
sm_pairing_complete(sm_conn, ERROR_CODE_CONNECTION_TIMEOUT, 0);
|
||||
sm_done_for_handle(sm_conn->sm_handle);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user