scan forever and allow cancellation

Author: paul-szczepanek-arm

connectivity/FEATURE_BLE/source/generic/GapImpl.cpp

@@ -557,7 +557,7 @@ ble_error_t Gap::connect(
 #if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
         if (_connect_to_address_type != peer_address_type_t::ANONYMOUS) {
             ret = startScan(
-                (scan_duration_t)connectionParams.getConnectionSupervisionTimeoutArray()[0],
+                scan_duration_t::forever(),
                 duplicates_filter_t::ENABLE,
                 (scan_period_t)0
             );
@@ -710,6 +710,14 @@ ble_error_t Gap::rejectConnectionParametersUpdate(
 #if BLE_ROLE_CENTRAL
 ble_error_t Gap::cancelConnect()
 {
+#if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
+    if (_ready_to_connect_to_host_resolved_address) {
+        connecting_to_host_resolved_address_failed(false);
+        stopScan();
+        return BLE_ERROR_NONE;
+    }
+#endif // BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
+
     if (!_initiating) {
         return BLE_ERROR_NONE;
     }
@@ -1183,9 +1191,9 @@ void Gap::on_scan_stopped(bool success)
 }
 
 #if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
-void Gap::connecting_to_host_resolved_address_failed()
+void Gap::connecting_to_host_resolved_address_failed(bool inform_user)
 {
-    if (_event_handler) {
+    if (inform_user && _event_handler) {
         _event_handler->onConnectionComplete(
             ConnectionCompleteEvent(
                 BLE_ERROR_NOT_FOUND,
@@ -1219,13 +1227,6 @@ void Gap::on_scan_timeout()
     _scan_enabled = false;
     _scan_pending = false;
 
-#if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
-    if (_ready_to_connect_to_host_resolved_address) {
-        connecting_to_host_resolved_address_failed();
-        return;
-    }
-#endif // BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
-
     if (_event_handler) {
         _event_handler->onScanTimeout(ScanTimeoutEvent());
     }
@@ -1241,13 +1242,6 @@ void Gap::process_legacy_scan_timeout()
     /* legacy scanning timed out is based on timer so we need to stop the scan manually */
     _pal_gap.scan_enable(false, false);
 
-#if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
-    if (_ready_to_connect_to_host_resolved_address) {
-        connecting_to_host_resolved_address_failed();
-        return;
-    }
-#endif // BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
-
     if (_event_handler) {
         _event_handler->onScanTimeout(ScanTimeoutEvent());
     }

connectivity/FEATURE_BLE/source/generic/GapImpl.h

@@ -799,7 +799,7 @@ class Gap :
     const address_t *get_random_address(controller_operation_t operation, size_t advertising_set = 0);
 
 #if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
-    void connecting_to_host_resolved_address_failed();
+    void connecting_to_host_resolved_address_failed(bool inform_user = true);
 #endif // BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
 
 private: