espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-07 09:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

NimBLE: Fixed going for reattempt connection code

Browse Source
This commit is contained in:
[email protected]
2024-02-14 18:25:06 +05:30
committed by Abhinav Kudnar
parent 4ae124d1cd
commit 75bcefb761
1 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_hs_hci_evt.c
+37 -35
View File
@@ -225,49 +225,51 @@ ble_hs_hci_evt_disconn_complete(uint8_t event_code, const void *data,
ble_hs_unlock(); ble_hs_unlock();
#if CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT #if CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT
int rc, i, idx; if (ev->reason == BLE_ERR_CONN_ESTABLISHMENT) {
int rc, i, idx;
idx = ble_gap_find_reattempt_conn_idx(conn); idx = ble_gap_find_reattempt_conn_idx(conn);
if (idx == MYNEWT_VAL(BLE_MAX_CONNECTIONS)) { if (idx == MYNEWT_VAL(BLE_MAX_CONNECTIONS)) {
/* This means, no matching addr exists in databse. So create a new one */ /* This means, no matching addr exists in databse. So create a new one */
for (i = 0; i < MYNEWT_VAL(BLE_MAX_CONNECTIONS); i++) { for (i = 0; i < MYNEWT_VAL(BLE_MAX_CONNECTIONS); i++) {
if (reattempt_conn[i].count == 0) { if (reattempt_conn[i].count == 0) {
idx = i; idx = i;
break; break;
} }
} }
} }
if (idx == MYNEWT_VAL(BLE_MAX_CONNECTIONS)) { if (idx == MYNEWT_VAL(BLE_MAX_CONNECTIONS)) {
BLE_HS_LOG(DEBUG, "No space left in array "); BLE_HS_LOG(DEBUG, "No space left in array ");
goto done; goto done;
} }
if (ev->reason == BLE_ERR_CONN_ESTABLISHMENT && (conn != NULL)) { if (conn != NULL) {
BLE_HS_LOG(DEBUG, "Reattempt connection; reason = 0x%x, status = %d," BLE_HS_LOG(DEBUG, "Reattempt connection; reason = 0x%x, status = %d,"
"reattempt count = %d ", ev->reason, ev->status, "reattempt count = %d ", ev->reason, ev->status,
reattempt_conn[idx].count); reattempt_conn[idx].count);
if (conn->bhc_flags & BLE_HS_CONN_F_MASTER) { if (conn->bhc_flags & BLE_HS_CONN_F_MASTER) {
if (reattempt_conn[idx].count < MAX_REATTEMPT_ALLOWED) { if (reattempt_conn[idx].count < MAX_REATTEMPT_ALLOWED) {
reattempt_conn[idx].count += 1; reattempt_conn[idx].count += 1;
memcpy(&reattempt_conn[idx].peer_addr, &conn->bhc_peer_addr, BLE_DEV_ADDR_LEN); memcpy(&reattempt_conn[idx].peer_addr, &conn->bhc_peer_addr, BLE_DEV_ADDR_LEN);
rc = ble_gap_master_connect_reattempt(ev->conn_handle); rc = ble_gap_master_connect_reattempt(ev->conn_handle);
if (rc != 0) { if (rc != 0) {
BLE_HS_LOG(DEBUG, "Master reconnect attempt failed; rc = %d", rc); BLE_HS_LOG(DEBUG, "Master reconnect attempt failed; rc = %d", rc);
}
} else {
memset(&reattempt_conn[idx].peer_addr, 0x0, BLE_DEV_ADDR_LEN);
reattempt_conn[idx].count = 0;
} }
} else {
memset(&reattempt_conn[idx].peer_addr, 0x0, BLE_DEV_ADDR_LEN);
reattempt_conn[idx].count = 0;
} }
} else {
/* Disconnect completed with some other reason than
* BLE_ERR_CONN_ESTABLISHMENT, reset the corresponding reattempt count
* */
memset(&reattempt_conn[idx].peer_addr, 0x0, BLE_DEV_ADDR_LEN);
reattempt_conn[idx].count = 0;
} }
} else {
/* Disconnect completed with some other reason than
* BLE_ERR_CONN_ESTABLISHMENT, reset the corresponding reattempt count
* */
memset(&reattempt_conn[idx].peer_addr, 0x0, BLE_DEV_ADDR_LEN);
reattempt_conn[idx].count = 0;
} }
done: done: