jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for issue 3974 m_connectedCount incorrectly decremented when no connection exists

Browse Source 
There is no need to decrement if nothing was removed from removePeerDevice

Reference issue:
#3974
This commit is contained in:
James.Y 2020-05-31 15:35:01 -07:00 committed by GitHub
parent 09bff5027d
commit 35d9759fa6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/BLE/src/BLEServer.cpp
View File

@ -202,13 +202,19 @@ void BLEServer::handleGATTServerEvent(esp_gatts_cb_event_t event, esp_gatt_if_t
// If we receive a disconnect event then invoke the callback for disconnects (if one is present). // If we receive a disconnect event then invoke the callback for disconnects (if one is present).
// we also want to start advertising again. // we also want to start advertising again.
case ESP_GATTS_DISCONNECT_EVT: { case ESP_GATTS_DISCONNECT_EVT: {
m_connectedCount--; // Decrement the number of connected devices count.
if (m_pServerCallbacks != nullptr) { // If we have callbacks, call now. if (m_pServerCallbacks != nullptr) { // If we have callbacks, call now.
m_pServerCallbacks->onDisconnect(this); m_pServerCallbacks->onDisconnect(this);
} }
startAdvertising(); //- do this with some delay from the loop() if(m_connId == ESP_GATT_IF_NONE) {
removePeerDevice(param->disconnect.conn_id, false); return;
break; }
// only decrement if connection is found in map and removed
// sometimes this event triggers w/o a valid connection
if(removePeerDevice(param->disconnect.conn_id, false)) {
m_connectedCount--; // Decrement the number of connected devices count.
}
break;
} // ESP_GATTS_DISCONNECT_EVT } // ESP_GATTS_DISCONNECT_EVT
@ -395,8 +401,8 @@ void BLEServer::addPeerDevice(void* peer, bool _client, uint16_t conn_id) {
m_connectedServersMap.insert(std::pair<uint16_t, conn_status_t>(conn_id, status)); m_connectedServersMap.insert(std::pair<uint16_t, conn_status_t>(conn_id, status));
} }
void BLEServer::removePeerDevice(uint16_t conn_id, bool _client) { bool BLEServer::removePeerDevice(uint16_t conn_id, bool _client) {
m_connectedServersMap.erase(conn_id); return m_connectedServersMap.erase(conn_id) > 0;
} }
/* multi connect support */ /* multi connect support */

2
libraries/BLE/src/BLEServer.h
View File

@ -79,7 +79,7 @@ public:
/* multi connection support */ /* multi connection support */
std::map<uint16_t, conn_status_t> getPeerDevices(bool client); std::map<uint16_t, conn_status_t> getPeerDevices(bool client);
void addPeerDevice(void* peer, bool is_client, uint16_t conn_id); void addPeerDevice(void* peer, bool is_client, uint16_t conn_id);
void removePeerDevice(uint16_t conn_id, bool client); bool removePeerDevice(uint16_t conn_id, bool client);
BLEServer* getServerByConnId(uint16_t conn_id); BLEServer* getServerByConnId(uint16_t conn_id);
void updatePeerMTU(uint16_t connId, uint16_t mtu); void updatePeerMTU(uint16_t connId, uint16_t mtu);
uint16_t getPeerMTU(uint16_t conn_id); uint16_t getPeerMTU(uint16_t conn_id);