[Bugfix] NimBLEAdvertisedDevice::isConnectable incorrect result

Author: h2zero

src/NimBLEAdvertisedDevice.cpp

@@ -755,8 +755,12 @@ bool NimBLEAdvertisedDevice::isConnectable() const {
     if (m_isLegacyAdv) {
         return m_advType == BLE_HCI_ADV_RPT_EVTYPE_ADV_IND || m_advType == BLE_HCI_ADV_RPT_EVTYPE_DIR_IND;
     }
-# endif
+
     return (m_advType & BLE_HCI_ADV_CONN_MASK) || (m_advType & BLE_HCI_ADV_DIRECT_MASK);
+# else
+    return m_advType == BLE_HCI_ADV_TYPE_ADV_IND || m_advType == BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_HD ||
+           m_advType == BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_LD;
+# endif
 } // isConnectable
 
 /**

src/NimBLEScan.cpp

@@ -66,11 +66,11 @@ int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) {
 # if CONFIG_BT_NIMBLE_EXT_ADV
             const auto& disc        = event->ext_disc;
             const bool  isLegacyAdv = disc.props & BLE_HCI_ADV_LEGACY_MASK;
-            const auto  event_type  = isLegacyAdv ? disc.legacy_event_type : disc.props;
+            const auto  eventType   = isLegacyAdv ? disc.legacy_event_type : disc.props;
 # else
             const auto& disc        = event->disc;
             const bool  isLegacyAdv = true;
-            const auto  event_type  = disc.event_type;
+            const auto  eventType   = disc.event_type;
 # endif
             NimBLEAddress advertisedAddress(disc.addr);
 
@@ -108,16 +108,16 @@ int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) {
                     return 0;
                 }
 
-                if (isLegacyAdv && event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
+                if (isLegacyAdv && eventType == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
                     NIMBLE_LOGI(LOG_TAG, "Scan response without advertisement: %s", advertisedAddress.toString().c_str());
                 }
 
-                advertisedDevice = new NimBLEAdvertisedDevice(event, event_type);
+                advertisedDevice = new NimBLEAdvertisedDevice(event, eventType);
                 pScan->m_scanResults.m_deviceVec.push_back(advertisedDevice);
                 NIMBLE_LOGI(LOG_TAG, "New advertiser: %s", advertisedAddress.toString().c_str());
             } else {
-                advertisedDevice->update(event, event_type);
-                if (isLegacyAdv && event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
+                advertisedDevice->update(event, eventType);
+                if (isLegacyAdv && eventType == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
                     NIMBLE_LOGI(LOG_TAG, "Scan response from: %s", advertisedAddress.toString().c_str());
                 } else {
                     NIMBLE_LOGI(LOG_TAG, "Duplicate; updated: %s", advertisedAddress.toString().c_str());
@@ -134,7 +134,7 @@ int NimBLEScan::handleGapEvent(ble_gap_event* event, void* arg) {
             if (pScan->m_scanParams.passive || !isLegacyAdv || !advertisedDevice->isScannable()) {
                 advertisedDevice->m_callbackSent++;
                 pScan->m_pScanCallbacks->onResult(advertisedDevice);
-            } else if (isLegacyAdv && event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
+            } else if (isLegacyAdv && eventType == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
                 advertisedDevice->m_callbackSent++;
                 // got the scan response report the full data.
                 pScan->m_pScanCallbacks->onResult(advertisedDevice);