ScStw/esp-nimble-cpp
2
0
Fork 0
mirror of https://github.com/h2zero/esp-nimble-cpp.git synced 2024-10-22 16:09:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

Delete peer keys on key missing and retry.

Browse source 
On BLE_ERR_PINKEY_MISSING, delete the peer keys from the store and
retry the connection.
This commit is contained in:
Guo-Rong 2020-08-20 09:57:20 -06:00 committed by h2zero
parent 4c751657ab
commit 88562bb310
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/NimBLEClient.cpp
View file

@ -238,6 +238,10 @@ bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttibutes) {
*/ */
bool NimBLEClient::secureConnection() { bool NimBLEClient::secureConnection() {
ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(), 0, nullptr}; ble_task_data_t taskData = {this, xTaskGetCurrentTaskHandle(), 0, nullptr};
int retryCount = 1;
do {
m_pTaskData = &taskData; m_pTaskData = &taskData;
int rc = NimBLEDevice::startSecurity(m_conn_id); int rc = NimBLEDevice::startSecurity(m_conn_id);
@ -247,6 +251,7 @@ bool NimBLEClient::secureConnection() {
} }
ulTaskNotifyTake(pdTRUE, portMAX_DELAY); ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
} while (taskData.rc == BLE_HS_HCI_ERR(BLE_ERR_PINKEY_MISSING) && retryCount--);
if(taskData.rc != 0){ if(taskData.rc != 0){
return false; return false;
@ -822,12 +827,15 @@ uint16_t NimBLEClient::getMTU() {
return 0; return 0;
} }
if(event->enc_change.status == 0) { if(event->enc_change.status == 0 || event->enc_change.status == BLE_HS_HCI_ERR(BLE_ERR_PINKEY_MISSING)) {
struct ble_gap_conn_desc desc; struct ble_gap_conn_desc desc;
rc = ble_gap_conn_find(event->conn_update.conn_handle, &desc); rc = ble_gap_conn_find(event->enc_change.conn_handle, &desc);
assert(rc == 0); assert(rc == 0);
if(NimBLEDevice::m_securityCallbacks != nullptr) { if (event->enc_change.status == BLE_HS_HCI_ERR(BLE_ERR_PINKEY_MISSING)) {
// Key is missing, try deleting.
ble_store_util_delete_peer(&desc.peer_id_addr);
} else if(NimBLEDevice::m_securityCallbacks != nullptr) {
NimBLEDevice::m_securityCallbacks->onAuthenticationComplete(&desc); NimBLEDevice::m_securityCallbacks->onAuthenticationComplete(&desc);
} else { } else {
client->m_pClientCallbacks->onAuthenticationComplete(&desc); client->m_pClientCallbacks->onAuthenticationComplete(&desc);