Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

master missing BLE_AUTH_CMPL_EVT after restart

Browse source
This commit is contained in:
wangcheng 2020-04-29 17:38:47 +08:00
parent b30e8d1019
commit 1e72a8c850
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/bt/bluedroid/stack/smp/smp_act.c
View file

@ -1945,8 +1945,7 @@ void smp_link_encrypted(BD_ADDR bda, UINT8 encr_enable)
smp_sm_event(&smp_cb, SMP_ENCRYPTED_EVT, &encr_enable); smp_sm_event(&smp_cb, SMP_ENCRYPTED_EVT, &encr_enable);
} }
else if(p_dev_rec && !p_dev_rec->enc_init_by_we){ else if(p_dev_rec && !p_dev_rec->role_master && !p_dev_rec->enc_init_by_we ){
/* /*
if enc_init_by_we is false, it means that client initiates encryption before slave calls esp_ble_set_encryption() if enc_init_by_we is false, it means that client initiates encryption before slave calls esp_ble_set_encryption()
we need initiate pairing_bda and p_cb->role then encryption, for example iPhones we need initiate pairing_bda and p_cb->role then encryption, for example iPhones
@ -1956,6 +1955,12 @@ void smp_link_encrypted(BD_ADDR bda, UINT8 encr_enable)
p_cb->role = HCI_ROLE_SLAVE; p_cb->role = HCI_ROLE_SLAVE;
p_dev_rec->enc_init_by_we = FALSE; p_dev_rec->enc_init_by_we = FALSE;
smp_sm_event(&smp_cb, SMP_ENCRYPTED_EVT, &encr_enable); smp_sm_event(&smp_cb, SMP_ENCRYPTED_EVT, &encr_enable);
}else if(p_dev_rec && p_dev_rec->role_master && p_dev_rec->enc_init_by_we){
memcpy(&smp_cb.pairing_bda[0], bda, BD_ADDR_LEN);
p_cb->state = SMP_STATE_ENCRYPTION_PENDING;
p_cb->role = HCI_ROLE_MASTER;
p_dev_rec->enc_init_by_we = FALSE;
smp_sm_event(&smp_cb, SMP_ENCRYPTED_EVT, &encr_enable);
} }
} }