mirror/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-28 09:54:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

[esp32_ble_client] Complete disconnection on failed OPEN_EVT in DISCONNECTING state

Browse Source 
When a connection fails to establish, the ESP-IDF stack sends
DISCONNECT_EVT followed by OPEN_EVT with a failure status (e.g. 133).
No CLOSE_EVT follows since no GATT connection was established.

Previously the OPEN_EVT in DISCONNECTING state was silently ignored,
leaving the client stuck in DISCONNECTING forever. Now we treat this
failed OPEN_EVT as the terminal event and transition to IDLE.
This commit is contained in:
J. Nick Koston
2026-02-23 09:28:50 -06:00
parent 3ae3242362
commit 246d455dc3
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
esphome/components/esp32_ble_client/ble_client_base.cpp
View File

@@ -295,10 +295,19 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
// ESP-IDF's BLE stack may send ESP_GATTC_OPEN_EVT after esp_ble_gattc_open() returns an
// error, if the error occurred at the BTA/GATT layer. This can result in the event
// arriving after we've already transitioned to IDLE state.
// It may also arrive during DISCONNECTING if the controller is still cleaning up.
if (this->state() == espbt::ClientState::IDLE || this->state() == espbt::ClientState::DISCONNECTING) {
ESP_LOGD(TAG, "[%d] [%s] ESP_GATTC_OPEN_EVT in %s state (status=%d), ignoring", this->connection_index_,
this->address_str_, espbt::client_state_to_string(this->state()), param->open.status);
if (this->state() == espbt::ClientState::IDLE) {
ESP_LOGD(TAG, "[%d] [%s] ESP_GATTC_OPEN_EVT in IDLE state (status=%d), ignoring", this->connection_index_,
this->address_str_, param->open.status);
break;
} else if (this->state() == espbt::ClientState::DISCONNECTING) {
// When a connection fails to establish, the ESP-IDF stack sends DISCONNECT_EVT
// (which we now transition to DISCONNECTING) followed by OPEN_EVT with a failure status.
// No CLOSE_EVT will follow since no GATT connection was established, so this
// failed OPEN_EVT is the terminal event — transition to IDLE here.
ESP_LOGD(TAG, "[%d] [%s] ESP_GATTC_OPEN_EVT in DISCONNECTING state (status=%d), completing disconnection",
this->connection_index_, this->address_str_, param->open.status);
this->set_state(espbt::ClientState::IDLE);
this->conn_id_ = UNSET_CONN_ID;
break;
}