Make secure counter mutable, remove useless checks

Author: thekurtovic

src/NimBLEClient.cpp

@@ -314,27 +314,13 @@ bool NimBLEClient::connect(const NimBLEAddress& address, bool deleteAttributes,
  * @return True on success.
  * @details This is a blocking function and should not be used in a callback.
  */
-bool NimBLEClient::secureConnection(bool async) {
+bool NimBLEClient::secureConnection(bool async)  const {
     NIMBLE_LOGD(LOG_TAG, ">> secureConnection()");
 
-    if (!NimBLEDevice::m_synced) {
-        NIMBLE_LOGE(LOG_TAG, "Host reset, wait for sync.");
-        return false;
-    }
-
-    if (NimBLEDevice::isSecureInProgress()) {
-        NIMBLE_LOGE(LOG_TAG, "Secure already in progress");
-        return false;
-    }
-
-    // Set the secure in progress flag to prevent a scan from starting while securing.
-    NimBLEDevice::setSecureInProgress(true);
-
     int rc = 0;
     if (async && !NimBLEDevice::startSecurity(m_connHandle, &rc)) {
         m_lastErr = rc;
         m_asyncSecureAttempt = 0;
-        NimBLEDevice::setSecureInProgress(false);
         NIMBLE_LOGE(LOG_TAG, "secureConnection: failed to start rc=%d", rc);
         return false;
     }
@@ -1116,7 +1102,6 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event* event, void* arg) {
                 return 0;
             }
 
-            NimBLEDevice::setSecureInProgress(false);
             if (event->enc_change.status == 0 ||
                 event->enc_change.status == (BLE_HS_ERR_HCI_BASE + BLE_ERR_PINKEY_MISSING)) {
                 NimBLEConnInfo peerInfo;

src/NimBLEClient.h

@@ -64,7 +64,7 @@ class NimBLEClient {
     bool           setConnection(uint16_t connHandle);
     uint16_t       getMTU() const;
     bool           exchangeMTU();
-    bool           secureConnection(bool async = false);
+    bool           secureConnection(bool async = false) const;
     void           setConnectTimeout(uint32_t timeout);
     bool           setDataLen(uint16_t txOctets);
     bool           discoverAttributes();
@@ -120,7 +120,7 @@ class NimBLEClient {
     bool                              m_deleteCallbacks;
     bool                              m_connEstablished;
     bool                              m_asyncConnect;
-    uint8_t                           m_asyncSecureAttempt;
+    mutable uint8_t                   m_asyncSecureAttempt;
     bool                              m_exchangeMTU;
 # if CONFIG_BT_NIMBLE_EXT_ADV
     uint8_t m_phyMask;

src/NimBLEDevice.cpp

@@ -103,7 +103,6 @@ uint8_t                    NimBLEDevice::m_ownAddrType{BLE_OWN_ADDR_PUBLIC};
 
 # if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL) || defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 bool NimBLEDevice::m_connectionInProgress{false};
-bool NimBLEDevice::m_secureInProgress{false};
 # endif
 
 # ifdef ESP_PLATFORM
@@ -1272,23 +1271,6 @@ bool NimBLEDevice::isConnectionInProgress() {
     return m_connectionInProgress;
 } // isConnectionInProgress
 
-/**
- * @brief Set the secure in progress flag.
- * @param [in] inProgress The secure in progress flag.
- * @details This is used to prevent a scan from starting while a secure is in progress.
- */
-void NimBLEDevice::setSecureInProgress(bool inProgress) {
-    m_secureInProgress = inProgress;
-} // setSecureInProgress
-
-/**
- * @brief Check if a secure is in progress.
- * @return True if a secure is in progress.
- */
-bool NimBLEDevice::isSecureInProgress() {
-    return m_secureInProgress;
-} // isSecureInProgress
-
 /**
  * @brief Return a string representation of the address of this device.
  * @return A string representation of this device address.

src/NimBLEDevice.h

@@ -186,8 +186,6 @@ class NimBLEDevice {
     static NimBLEAddress getBondedAddress(int index);
     static void          setConnectionInProgress(bool inProgress);
     static bool          isConnectionInProgress();
-    static void          setSecureInProgress(bool inProgress);
-    static bool          isSecureInProgress();
 # endif
 
   private:
@@ -201,7 +199,6 @@ class NimBLEDevice {
 
 # if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL) || defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
     static bool m_connectionInProgress;
-    static bool m_secureInProgress;
 # endif
 
 # if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)

src/NimBLERemoteValueAttribute.cpp

@@ -19,7 +19,7 @@ const char* LOG_TAG = "NimBLERemoteValueAttribute";
 bool NimBLERemoteValueAttribute::writeValue(const uint8_t* data, size_t length, bool response) const {
     NIMBLE_LOGD(LOG_TAG, ">> writeValue()");
 
-    NimBLEClient*       pClient    = getClient();
+    const NimBLEClient* pClient    = getClient();
     int                 retryCount = 1;
     int                 rc         = 0;
     uint16_t            mtu        = pClient->getMTU() - 3;
@@ -109,7 +109,7 @@ NimBLEAttValue NimBLERemoteValueAttribute::readValue(time_t* timestamp) const {
     NIMBLE_LOGD(LOG_TAG, ">> readValue()");
 
     NimBLEAttValue      value{};
-    NimBLEClient*       pClient    = getClient();
+    const NimBLEClient* pClient    = getClient();
     int                 rc         = 0;
     int                 retryCount = 1;
     NimBLETaskData      taskData(const_cast<NimBLERemoteValueAttribute*>(this), 0, &value);

src/NimBLEScan.cpp

@@ -291,8 +291,8 @@ bool NimBLEScan::isScanning() {
 bool NimBLEScan::start(uint32_t duration, bool is_continue) {
     NIMBLE_LOGD(LOG_TAG, ">> start: duration=%" PRIu32, duration);
 
-    if (NimBLEDevice::isConnectionInProgress() || NimBLEDevice::isSecureInProgress()) {
-        NIMBLE_LOGE(LOG_TAG, "Connection/Secure in progress, cannot start scan");
+    if (NimBLEDevice::isConnectionInProgress()) {
+        NIMBLE_LOGE(LOG_TAG, "Connection in progress, cannot start scan");
         return false;
     }