Add value handle field to callback params

Author: Abbas Bracken Ziad

connectivity/FEATURE_BLE/include/ble/gatt/GattCallbackParamTypes.h

@@ -443,8 +443,31 @@ struct GattDataSentCallbackParams {
 
 };
 
-using GattUpdatesEnabledCallbackParams        = GattDataSentCallbackParams;
-using GattUpdatesDisabledCallbackParams       = GattDataSentCallbackParams;
+/**
+ * Gatt Updates Enabled Attribute related events
+ *
+ * Used by `onUpdatesEnabled`
+ */
+struct GattUpdatesEnabledCallbackParams {
+
+    /**
+     * The handle of the connection that triggered the event.
+     */
+    ble::connection_handle_t connHandle;
+
+    /**
+     * The handle of the CCCD producing the event
+     */
+    GattAttribute::Handle_t attHandle;
+
+    /**
+     * The handle of the characteristic containing the CCCD  
+     */
+    GattAttribute::Handle_t charHandle;
+    
+};
+
+using GattUpdatesDisabledCallbackParams       = GattUpdatesEnabledCallbackParams;
 using GattConfirmationReceivedCallbackParams  = GattDataSentCallbackParams;
 
 namespace ble {

connectivity/FEATURE_BLE/source/cordio/source/GattServerImpl.cpp

@@ -1729,13 +1729,18 @@ void GattServer::handleEvent(
     GattAttribute::Handle_t attributeHandle
 )
 {
+    // To be used in cases where the characteristic value handle differs from the attribute handle
+    GattAttribute::Handle_t charHandle;
+
     switch (type) {
         case GattServerEvents::GATT_EVENT_UPDATES_ENABLED:
             tr_info("Updates enabled for attribute %d on connection %d", attributeHandle, connHandle);
+            get_value_handle_by_cccd_handle(attributeHandle, charHandle);
             if(eventHandler) {
                 GattUpdatesEnabledCallbackParams params({
                     .connHandle = connHandle,
-                    .attHandle = attributeHandle
+                    .attHandle = attributeHandle,
+                    .charHandle = charHandle
                 });
                 eventHandler->onUpdatesEnabled(params);
             }
@@ -1747,10 +1752,12 @@ void GattServer::handleEvent(
             break;
         case GattServerEvents::GATT_EVENT_UPDATES_DISABLED:
             tr_info("Updates disabled for attribute %d on connection %d", attributeHandle, connHandle);
+            get_value_handle_by_cccd_handle(attributeHandle, charHandle);
             if(eventHandler) {
                 GattUpdatesDisabledCallbackParams params({
                     .connHandle = connHandle,
-                    .attHandle = attributeHandle
+                    .attHandle = attributeHandle,
+                    .charHandle = charHandle
                 });
                 eventHandler->onUpdatesDisabled(params);
             }