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): Issue connect cancel in case of outstanding master connection

Browse Source
This commit is contained in:
Rahul Tank
2026-03-12 14:58:40 +05:30
parent 27db5fca0e
commit 7075927f97
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_gap.c
+26 -2
View File
@@ -1189,6 +1189,8 @@ ble_gap_master_reset_state(void)
#endif
#if NIMBLE_BLE_CONNECT
static int ble_gap_conn_cancel_no_lock(void);
static bool
ble_gap_addr_type_equivalent(uint8_t a, uint8_t b)
{
@@ -1209,6 +1211,28 @@ ble_gap_addr_type_equivalent(uint8_t a, uint8_t b)
return false;
}
static bool
ble_gap_master_cancel_pending_conn(void)
{
int rc;
if (ble_gap_master.op != BLE_GAP_OP_M_CONN) {
return false;
}
if (ble_gap_master.conn.cancel) {
return true;
}
rc = ble_gap_conn_cancel_no_lock();
if (rc == 0 || rc == BLE_HS_EALREADY) {
return true;
}
BLE_HS_LOG(INFO, "simul-conn: connect cancel failed; rc=%d\n", rc);
return false;
}
static bool
ble_gap_master_conn_matches_slave_complete(const struct ble_gap_conn_complete *evt)
{
@@ -1225,7 +1249,7 @@ ble_gap_master_conn_matches_slave_complete(const struct ble_gap_conn_complete *e
evt_addr.type) &&
memcmp(ble_gap_master.conn.peer_addr.val, evt_addr.val,
BLE_DEV_ADDR_LEN) == 0) {
return true;
return ble_gap_master_cancel_pending_conn();
}
#if MYNEWT_VAL(BLE_HOST_BASED_PRIVACY)
@@ -1236,7 +1260,7 @@ ble_gap_master_conn_matches_slave_complete(const struct ble_gap_conn_complete *e
&master_addr.type, NULL);
if (ble_gap_addr_type_equivalent(master_addr.type, evt_addr.type) &&
memcmp(master_addr.val, evt_addr.val, BLE_DEV_ADDR_LEN) == 0) {
return true;
return ble_gap_master_cancel_pending_conn();
}
}
#endif