espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-06-05 21:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nimble): Handle corner case scenarios for ble_adv_reattempt.retry

Browse Source
This commit is contained in:
Rahul Tank
2026-04-18 15:03:50 +05:30
parent d0e4eb98b1
commit 9013d28440
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_gap.c
+13 -11
View File
@@ -1554,6 +1554,9 @@ int ble_gap_slave_adv_reattempt(void)
return rc; return rc;
} }
/* Mark retry context before invoking start; cleared in ble_gap_adv_start(). */
ble_adv_reattempt.retry = 1;
rc = ble_gap_adv_start(ble_adv_reattempt.own_addr_type, rc = ble_gap_adv_start(ble_adv_reattempt.own_addr_type,
(ble_adv_reattempt.direct_addr_present == 1 ? &ble_adv_reattempt.direct_addr: NULL), (ble_adv_reattempt.direct_addr_present == 1 ? &ble_adv_reattempt.direct_addr: NULL),
ble_adv_reattempt.duration_ms, &ble_adv_reattempt.adv_params, ble_adv_reattempt.duration_ms, &ble_adv_reattempt.adv_params,
@@ -1561,8 +1564,6 @@ int ble_gap_slave_adv_reattempt(void)
if (rc != 0) { if (rc != 0) {
return rc; return rc;
} }
ble_adv_reattempt.retry = 1 ;
break; break;
case 1: case 1:
@@ -1573,6 +1574,9 @@ int ble_gap_slave_adv_reattempt(void)
rc = ble_gap_ext_adv_start(ble_adv_reattempt.instance, ble_adv_reattempt.duration, rc = ble_gap_ext_adv_start(ble_adv_reattempt.instance, ble_adv_reattempt.duration,
ble_adv_reattempt.max_events); ble_adv_reattempt.max_events);
ble_adv_reattempt.retry = 0;
if (rc != 0) { if (rc != 0) {
return rc; return rc;
} }
@@ -4330,6 +4334,9 @@ ble_gap_adv_start(uint8_t own_addr_type, const ble_addr_t *direct_addr,
STATS_INC(ble_gap_stats, adv_start); STATS_INC(ble_gap_stats, adv_start);
if (!ble_hs_is_enabled()) { if (!ble_hs_is_enabled()) {
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
ble_adv_reattempt.retry = 0;
#endif
return BLE_HS_EDISABLED; return BLE_HS_EDISABLED;
} }
@@ -4433,15 +4440,10 @@ ble_gap_adv_start(uint8_t own_addr_type, const ble_addr_t *direct_addr,
} }
rc = 0; rc = 0;
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
if (ble_adv_reattempt.retry) {
ble_adv_reattempt.retry = 0;
}
#endif
done: done:
#if MYNEWT_VAL(BLE_ENABLE_CONN_REATTEMPT) && NIMBLE_BLE_CONNECT
ble_adv_reattempt.retry = 0;
#endif
ble_hs_unlock(); ble_hs_unlock();
if (rc != 0) { if (rc != 0) {
@@ -11216,4 +11218,4 @@ ble_gap_utp_send(uint8_t len, const uint8_t *data)
return ble_hs_hci_cmd_tx(BLE_HCI_OP(BLE_HCI_OGF_LE, return ble_hs_hci_cmd_tx(BLE_HCI_OP(BLE_HCI_OGF_LE,
BLE_HCI_OCF_LE_UTP_SEND), cmd, sizeof(*cmd) + len, NULL, 0); BLE_HCI_OCF_LE_UTP_SEND), cmd, sizeof(*cmd) + len, NULL, 0);
} }
#endif #endif