Introduce new GattServer::EventHandler callback functions for those previously deprecated

Author: AGlass0fMilk

connectivity/FEATURE_BLE/include/ble/GattServer.h

@@ -120,6 +120,49 @@ class GattServer {
             (void)connectionHandle;
             (void)attMtuSize;
         }
+
+        /**
+         * Function invoked when the server has sent data to a client as
+         * part of a notification/indication.
+         *
+         * @note params has a temporary scope and should be copied by the
+         * application if needed later
+         */
+        virtual void onDataSent(const GattDataSentCallbackParams* params) {
+            (void)params;
+        }
+
+        /**
+         * Function invoked when the client has subscribed to characteristic updates
+         *
+         * @note params has a temporary scope and should be copied by the
+         * application if needed later
+         */
+        virtual void onUpdatesEnabled(const GattUpdatesEnabledCallbackParams* params) {
+            (void)params;
+        }
+
+        /**
+         * Function invoked when the client has unsubscribed to characteristic updates
+         *
+         * @note params has a temporary scope and should be copied by the
+         * application if needed later
+         */
+        virtual void onUpdatesDisabled(const GattUpdatesDisabledCallbackParams* params) {
+            (void)params;
+        }
+
+        /**
+         * Function invoked when an ACK has been received for an
+         * indication sent to the client.
+         *
+         * @note params has a temporary scope and should be copied by the
+         * application if needed later
+         */
+        virtual void onConfirmationReceived(const GattConfirmationReceivedCallbackParams* params) {
+            (void)params;
+        }
+
     protected:
         /**
          * Prevent polymorphic deletion and avoid unnecessary virtual destructor

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

@@ -399,7 +399,7 @@ struct GattDataSentCallbackParams {
     /**
      * Attribute Handle to which the event applies
      */
-    GattAttribute::Handle_t handle;
+    GattAttribute::Handle_t attHandle;
 
 };
 

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

@@ -1497,22 +1497,62 @@ void GattServer::handleEvent(
 {
     switch (type) {
         case GattServerEvents::GATT_EVENT_UPDATES_ENABLED:
+
+            if(eventHandler) {
+                GattUpdatesEnabledCallbackParams params({
+                    .connHandle = connHandle,
+                    .attHandle = attributeHandle
+                });
+                eventHandler->onUpdatesEnabled(&params);
+            }
+
+            // Execute deprecated callback
             if (updatesEnabledCallback) {
                 updatesEnabledCallback(attributeHandle);
             }
             break;
         case GattServerEvents::GATT_EVENT_UPDATES_DISABLED:
+
+            if(eventHandler) {
+                GattUpdatesDisabledCallbackParams params({
+                    .connHandle = connHandle,
+                    .attHandle = attributeHandle
+                });
+                eventHandler->onUpdatesDisabled(&params);
+            }
+
+            // Execute deprecated callback
             if (updatesDisabledCallback) {
                 updatesDisabledCallback(attributeHandle);
             }
             break;
         case GattServerEvents::GATT_EVENT_CONFIRMATION_RECEIVED:
+
+            if(eventHandler) {
+                GattConfirmationReceivedCallbackParams params({
+                    .connHandle = connHandle,
+                    .attHandle = attributeHandle
+                });
+                eventHandler->onConfirmationReceived(&params);
+            }
+
+            // Execute deprecated callback
             if (confirmationReceivedCallback) {
                 confirmationReceivedCallback(attributeHandle);
             }
             break;
 
         case GattServerEvents::GATT_EVENT_DATA_SENT:
+
+            if(eventHandler) {
+                GattDataSentCallbackParams params({
+                    .connHandle = connHandle,
+                    .attHandle = attributeHandle
+                });
+                eventHandler->onDataSent(&params);
+            }
+
+            // Execute deprecated callback
             // Called every time a notification or indication has been sent
             handleDataSentEvent(1);
             break;