ScStw/esp-nimble-cpp
2
0
Fork 0
mirror of https://github.com/h2zero/esp-nimble-cpp.git synced 2024-11-21 20:50:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor NimBLEClient::connect and NimBLEClient::secureConnection.

Browse source 
This change ensures that only the function that sets `m_pTaskData` clears it, potentially preventing a segmentation fault.

* Client will no longer disconnect if task timeout occurs when waiting for MTU exchange response.
This commit is contained in:
h2zero 2024-11-13 13:49:08 -07:00 committed by h2zero
parent 6a5d6ef5e3
commit a59e8ee9e1
1 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/NimBLEClient.cpp
View file

@ -204,10 +204,6 @@ bool NimBLEClient::connect(const NimBLEAddress& address, bool deleteAttributes,
int rc = 0; int rc = 0;
m_asyncConnect = asyncConnect; m_asyncConnect = asyncConnect;
m_exchangeMTU = exchangeMTU; m_exchangeMTU = exchangeMTU;
NimBLETaskData taskData(this);
if (!asyncConnect) {
m_pTaskData = &taskData;
}
// Set the connection in progress flag to prevent a scan from starting while connecting. // Set the connection in progress flag to prevent a scan from starting while connecting.
NimBLEDevice::setConnectionInProgress(true); NimBLEDevice::setConnectionInProgress(true);
@ -263,10 +259,8 @@ bool NimBLEClient::connect(const NimBLEAddress& address, bool deleteAttributes,
} while (rc == BLE_HS_EBUSY); } while (rc == BLE_HS_EBUSY);
m_lastErr = rc;
if (rc != 0) { if (rc != 0) {
m_lastErr = rc; m_lastErr = rc;
m_pTaskData = nullptr;
NimBLEDevice::setConnectionInProgress(false); NimBLEDevice::setConnectionInProgress(false);
return false; return false;
} }
@ -275,29 +269,31 @@ bool NimBLEClient::connect(const NimBLEAddress& address, bool deleteAttributes,
return true; return true;
} }
NimBLETaskData taskData(this);
m_pTaskData = &taskData;
// Wait for the connect timeout time +1 second for the connection to complete // Wait for the connect timeout time +1 second for the connection to complete
if (!NimBLEUtils::taskWait(*m_pTaskData, m_connectTimeout + 1000)) { if (!NimBLEUtils::taskWait(taskData, m_connectTimeout + 1000)) {
m_pTaskData = nullptr; // If a connection was made but no response from MTU exchange proceed anyway
// If a connection was made but no response from MTU exchange; disconnect
if (isConnected()) { if (isConnected()) {
NIMBLE_LOGE(LOG_TAG, "Connect timeout - no response"); taskData.m_flags = 0;
disconnect();
} else { } else {
// workaround; if the controller doesn't cancel the connection // workaround; if the controller doesn't cancel the connection at the timeout, cancel it here.
// at the timeout, cancel it here.
NIMBLE_LOGE(LOG_TAG, "Connect timeout - cancelling"); NIMBLE_LOGE(LOG_TAG, "Connect timeout - cancelling");
ble_gap_conn_cancel(); ble_gap_conn_cancel();
taskData.m_flags = BLE_HS_ETIMEOUT;
}
} }
return false; m_pTaskData = nullptr;
rc = taskData.m_flags;
} else if (taskData.m_flags != 0) { if (rc != 0) {
m_lastErr = taskData.m_flags; NIMBLE_LOGE(LOG_TAG, "Connection failed; status=%d %s", rc, NimBLEUtils::returnCodeToString(rc));
NIMBLE_LOGE(LOG_TAG, "Connection failed; status=%d %s", m_lastErr, NimBLEUtils::returnCodeToString(m_lastErr));
// If the failure was not a result of a disconnection, make sure we disconnect now to avoid dangling connections // If the failure was not a result of a disconnection, make sure we disconnect now to avoid dangling connections
if (isConnected()) { if (isConnected()) {
disconnect(); disconnect();
} }
m_lastErr = rc;
return false; return false;
} else { } else {
NIMBLE_LOGI(LOG_TAG, "Connection established"); NIMBLE_LOGI(LOG_TAG, "Connection established");
@ -319,29 +315,27 @@ bool NimBLEClient::connect(const NimBLEAddress& address, bool deleteAttributes,
*/ */
bool NimBLEClient::secureConnection() const { bool NimBLEClient::secureConnection() const {
NIMBLE_LOGD(LOG_TAG, ">> secureConnection()"); NIMBLE_LOGD(LOG_TAG, ">> secureConnection()");
NimBLETaskData taskData(const_cast<NimBLEClient*>(this));
int retryCount = 1;
do { NimBLETaskData taskData(const_cast<NimBLEClient*>(this), BLE_HS_ENOTCONN);
m_pTaskData = &taskData; m_pTaskData = &taskData;
int retryCount = 1;
if (!NimBLEDevice::startSecurity(m_connHandle)) { do {
m_lastErr = BLE_HS_ENOTCONN; if (NimBLEDevice::startSecurity(m_connHandle)) {
m_pTaskData = nullptr; NimBLEUtils::taskWait(taskData, BLE_NPL_TIME_FOREVER);
return false;
} }
NimBLEUtils::taskWait(*m_pTaskData, BLE_NPL_TIME_FOREVER);
} while (taskData.m_flags == (BLE_HS_ERR_HCI_BASE + BLE_ERR_PINKEY_MISSING) && retryCount--); } while (taskData.m_flags == (BLE_HS_ERR_HCI_BASE + BLE_ERR_PINKEY_MISSING) && retryCount--);
if (taskData.m_flags != 0) { m_pTaskData = nullptr;
if (taskData.m_flags == 0) {
NIMBLE_LOGD(LOG_TAG, "<< secureConnection: success");
return true;
}
m_lastErr = taskData.m_flags; m_lastErr = taskData.m_flags;
NIMBLE_LOGE(LOG_TAG, "secureConnection: failed rc=%d", taskData.m_flags); NIMBLE_LOGE(LOG_TAG, "secureConnection: failed rc=%d", taskData.m_flags);
return false; return false;
}
NIMBLE_LOGD(LOG_TAG, "<< secureConnection: success");
return true;
} // secureConnection } // secureConnection
/** /**
@ -988,7 +982,7 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event* event, void* arg) {
pClient->m_connEstablished = rc == 0; pClient->m_connEstablished = rc == 0;
pClient->m_pClientCallbacks->onConnect(pClient); pClient->m_pClientCallbacks->onConnect(pClient);
} else if (!pClient->m_exchangeMTU) { } else if (!pClient->m_exchangeMTU) {
break; // not wating for MTU exchange so release the task now. break; // not waiting for MTU exchange so release the task now.
} }
return 0; return 0;
@ -1177,7 +1171,6 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event* event, void* arg) {
if (pClient->m_pTaskData != nullptr) { if (pClient->m_pTaskData != nullptr) {
NimBLEUtils::taskRelease(*pClient->m_pTaskData, rc); NimBLEUtils::taskRelease(*pClient->m_pTaskData, rc);
pClient->m_pTaskData = nullptr;
} }
return 0; return 0;