fix(nimble): Fix connected count

Author: lucasssvaz

libraries/BLE/src/BLEServer.cpp

@@ -551,6 +551,10 @@ void BLEServerCallbacks::onMtuChanged(BLEServer *pServer, esp_ble_gatts_cb_param
 
 #if defined(CONFIG_NIMBLE_ENABLED)
 
+uint16_t BLEServer::getHandle() {
+  return getConnId();
+}
+
 /**
  * @brief Resets the GATT server, used when services are added/removed after initialization.
  */
@@ -604,6 +608,7 @@ int BLEServer::handleGATTServerEvent(struct ble_gap_event *event, void *arg) {
         log_e("Connection failed");
         BLEDevice::startAdvertising();
       } else {
+        server->m_connId = event->connect.conn_handle;
         server->addPeerDevice((void *)server, false, event->connect.conn_handle);
         rc = ble_gap_conn_find(event->connect.conn_handle, &desc);
         if (rc != 0) {
@@ -614,6 +619,8 @@ int BLEServer::handleGATTServerEvent(struct ble_gap_event *event, void *arg) {
           server->m_pServerCallbacks->onConnect(server);
           server->m_pServerCallbacks->onConnect(server, &desc);
         }
+
+        server->m_connectedCount++;
       }
 
       return 0;
@@ -634,7 +641,9 @@ int BLEServer::handleGATTServerEvent(struct ble_gap_event *event, void *arg) {
         default: break;
       }
 
-      server->removePeerDevice(event->disconnect.conn.conn_handle, false);
+      if (server->removePeerDevice(event->disconnect.conn.conn_handle, false)) {
+        server->m_connectedCount--;
+      }
 
       if (server->m_svcChanged) {
         server->resetGATT();
@@ -654,8 +663,8 @@ int BLEServer::handleGATTServerEvent(struct ble_gap_event *event, void *arg) {
 
       for (auto &it : server->m_notifyChrVec) {
         if (it->getHandle() == event->subscribe.attr_handle) {
-          if ((it->getProperties() & BLE_GATT_CHR_F_READ_AUTHEN) || (it->getProperties() & BLE_GATT_CHR_F_READ_AUTHOR)
-              || (it->getProperties() & BLE_GATT_CHR_F_READ_ENC)) {
+          uint16_t properties = it->getProperties();
+          if ((properties & BLE_GATT_CHR_F_READ_AUTHEN) || (properties & BLE_GATT_CHR_F_READ_AUTHOR) || (properties & BLE_GATT_CHR_F_READ_ENC)) {
             rc = ble_gap_conn_find(event->subscribe.conn_handle, &desc);
             if (rc != 0) {
               break;

libraries/BLE/src/BLEServer.h

@@ -154,6 +154,7 @@ class BLEServer {
    ***************************************************************************/
 
 #if defined(CONFIG_NIMBLE_ENABLED)
+  uint16_t getHandle();
   void updateConnParams(uint16_t conn_handle, uint16_t minInterval, uint16_t maxInterval, uint16_t latency, uint16_t timeout);
   int disconnect(uint16_t connId, uint8_t reason = BLE_ERR_REM_USER_CONN_TERM);
 #endif