use invalid connection handle for locally stopped adv sets

Author: paul-szczepanek-arm

connectivity/FEATURE_BLE/libraries/cordio_stack/ble-host/sources/stack/dm/dm_adv_ae.c

@@ -1227,6 +1227,7 @@ void dmExtAdvActHciEnableCmpl(hciEvt_t *pEvent)
       /* prepare the message for callback */
       dmMsg.advSetStop.numComplEvts = 0; /* this value is invalid, we zero it to avoid confusing the user */
       dmMsg.advSetStop.handle = DM_CONN_ID_NONE;
+      dmMsg.advSetStop.handle = DM_ADV_HCI_HANDLE_NONE;
       dmMsg.advSetStop.status = dmMsg.hdr.status;
       dmMsg.advSetStop.advHandle = i;
 

connectivity/FEATURE_BLE/source/cordio/source/PalGapImpl.cpp

@@ -870,14 +870,17 @@ void PalGap::gap_handler(const wsfMsgHdr_t *msg)
             }
 
             hci_error_code_t status = hci_error_code_t(evt->status);
-            if (status == hci_error_code_t::SUCCESS && evt->handle == DM_CONN_ID_NONE) {
-                /* we stopped advertising without a connection, reflect that in the status */
-                status = hci_error_code_t::OPERATION_CANCELLED_BY_HOST;
+            connection_handle_t connection_handle = DM_CONN_ID_NONE;
+            /* the way we distinguish between local close and connection is the invalid HCI conn handle */
+            if (evt->handle != DM_CONN_HCI_HANDLE_NONE) {
+                /* use the translated conn handle */
+                connection_handle = evt->hdr.param;
             }
+
             handler->on_advertising_set_terminated(
                 status,
                 evt->advHandle,
-                evt->handle,
+                connection_handle,
                 evt->numComplEvts
             );
         }   break;

connectivity/FEATURE_BLE/source/generic/GapImpl.cpp

@@ -3479,16 +3479,14 @@ void Gap::on_advertising_set_terminated(
             connection_handle,
             to_string(status),
             number_of_completed_extended_advertising_events);
-    
+
     ble_error_t error_code = BLE_ERROR_UNSPECIFIED;
     bool connected = false;
 
-    if (status == hci_error_code_t::SUCCESS) {
-        /* hci code success means connection terminated it */
+    if (status == hci_error_code_t::SUCCESS && connection_handle != DM_CONN_ID_NONE) {
         connected = true;
         error_code = BLE_ERROR_NONE;
-    } else if (status == hci_error_code_t::OPERATION_CANCELLED_BY_HOST) {
-        /* if we stopped the set ourselves this is not an error */
+    } else if (status == hci_error_code_t::ADVERTISING_TIMEOUT) {
         error_code = BLE_ERROR_NONE;
     }