Integrating callback change

sdk/inc/azure/core/az_mqtt5_connection.h

@@ -64,7 +64,7 @@ enum az_event_type_mqtt5_connection
  * @brief Callback for MQTT 5 connection events.
  *
  */
-typedef az_result (*az_mqtt5_connection_callback)(az_mqtt5_connection* client, az_event event, const void* event_callback_context);
+typedef az_result (*az_mqtt5_connection_callback)(az_mqtt5_connection* client, az_event event, void* event_callback_context);
 
 /**
  * @brief MQTT 5 connection options.
@@ -158,7 +158,7 @@ struct az_mqtt5_connection
      * @brief Context for MQTT 5 connection events callback.
      *
      */
-    const void* event_callback_context;
+    void* event_callback_context;
 
     /**
      * @brief Options for the MQTT 5 connection.
@@ -191,7 +191,7 @@ AZ_NODISCARD az_result az_mqtt5_connection_init(
     az_mqtt5* mqtt_client,
     az_mqtt5_connection_callback event_callback,
     az_mqtt5_connection_options* options,
-    const void* event_callback_context);
+    void* event_callback_context);
 
 /**
  * @brief Opens the connection to the broker.

sdk/samples/core/mosquitto_multiple_rpc_sample.c

@@ -78,7 +78,7 @@ az_result check_for_commands_to_execute();
 az_result copy_execution_event_data(
     az_mqtt5_rpc_server_execution_req_event_data* destination,
     az_mqtt5_rpc_server_execution_req_event_data source);
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event, const void* callback_context);
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context);
 void handle_response(az_span response_payload);
 az_result invoke_stop_module();
 az_result invoke_start_module();
@@ -252,7 +252,7 @@ void handle_response(az_span response_payload)
  * @brief MQTT client callback function for all clients
  * @note If you add other clients, you can add handling for their events here
  */
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event, const void* callback_context)
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context)
 {
   (void)client;
   (void)callback_context;

sdk/samples/core/mosquitto_rpc_client_sample.c

@@ -54,7 +54,7 @@ static az_mqtt5_rpc_client_codec rpc_client_codec;
 
 volatile bool sample_finished = false;
 
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event, const void* callback_context);
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context);
 void handle_response(az_span response_payload);
 az_result invoke_begin(az_span invoke_command_name, az_span payload);
 void remove_expired_commands();
@@ -76,7 +76,7 @@ void handle_response(az_span response_payload)
  * @brief MQTT client callback function for all clients
  * @note If you add other clients, you can add handling for their events here
  */
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event, const void* callback_context)
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context)
 {
   (void)client;
   (void)callback_context;

sdk/samples/core/mosquitto_rpc_server_sample.c

@@ -59,7 +59,7 @@ az_result check_for_commands();
 az_result copy_execution_event_data(
     az_mqtt5_rpc_server_execution_req_event_data* destination,
     az_mqtt5_rpc_server_execution_req_event_data source);
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event, const void* callback_context);
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context);
 
 void az_platform_critical_error()
 {
@@ -236,7 +236,7 @@ az_result copy_execution_event_data(
  * @brief MQTT client callback function for all clients
  * @note If you add other clients, you can add handling for their events here
  */
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event, const void* callback_context)
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context)
 {
   (void)client;
   (void)callback_context;

sdk/samples/core/paho_multiple_rpc_sample.c

@@ -78,7 +78,7 @@ az_result check_for_commands_to_execute();
 az_result copy_execution_event_data(
     az_mqtt5_rpc_server_execution_req_event_data* destination,
     az_mqtt5_rpc_server_execution_req_event_data source);
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event);
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context);
 void handle_response(az_span response_payload);
 az_result invoke_stop_module();
 az_result invoke_start_module();
@@ -252,9 +252,10 @@ void handle_response(az_span response_payload)
  * @brief MQTT client callback function for all clients
  * @note If you add other clients, you can add handling for their events here
  */
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event)
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context)
 {
   (void)client;
+  (void)callback_context;
   az_app_log_callback(event.type, AZ_SPAN_FROM_STR("APP/callback"));
   switch (event.type)
   {
@@ -492,7 +493,7 @@ int main(int argc, char* argv[])
   connection_options.client_certificates[0] = primary_credential;
 
   LOG_AND_EXIT_IF_FAILED(az_mqtt5_connection_init(
-      &mqtt_connection, &connection_context, &mqtt5, mqtt_callback, &connection_options));
+      &mqtt_connection, &connection_context, &mqtt5, mqtt_callback, &connection_options, NULL));
 
   LOG_AND_EXIT_IF_FAILED(az_platform_mutex_init(&pending_server_command_mutex));
 

sdk/samples/core/paho_rpc_client_sample.c

@@ -54,7 +54,7 @@ static az_mqtt5_rpc_client_codec rpc_client_codec;
 
 volatile bool sample_finished = false;
 
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event);
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context);
 void handle_response(az_span response_payload);
 az_result invoke_begin(az_span invoke_command_name, az_span payload);
 void remove_expired_commands();
@@ -76,9 +76,10 @@ void handle_response(az_span response_payload)
  * @brief MQTT client callback function for all clients
  * @note If you add other clients, you can add handling for their events here
  */
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event)
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context)
 {
   (void)client;
+  (void)callback_context;
   az_app_log_callback(event.type, AZ_SPAN_FROM_STR("APP/callback"));
   switch (event.type)
   {
@@ -251,7 +252,7 @@ int main(int argc, char* argv[])
   connection_options.client_certificates[0] = primary_credential;
 
   LOG_AND_EXIT_IF_FAILED(az_mqtt5_connection_init(
-      &mqtt_connection, &connection_context, &mqtt5, mqtt_callback, &connection_options));
+      &mqtt_connection, &connection_context, &mqtt5, mqtt_callback, &connection_options, NULL));
 
   az_mqtt5_property_bag property_bag;
   MQTTProperties prop = MQTTProperties_initializer;

sdk/samples/core/paho_rpc_server_sample.c

@@ -59,7 +59,7 @@ az_result check_for_commands();
 az_result copy_execution_event_data(
     az_mqtt5_rpc_server_execution_req_event_data* destination,
     az_mqtt5_rpc_server_execution_req_event_data source);
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event);
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context);
 
 void az_platform_critical_error()
 {
@@ -236,9 +236,10 @@ az_result copy_execution_event_data(
  * @brief MQTT client callback function for all clients
  * @note If you add other clients, you can add handling for their events here
  */
-az_result mqtt_callback(az_mqtt5_connection* client, az_event event)
+az_result mqtt_callback(az_mqtt5_connection* client, az_event event, void* callback_context)
 {
   (void)client;
+  (void)callback_context;
   az_app_log_callback(event.type, AZ_SPAN_FROM_STR("APP/callback"));
   switch (event.type)
   {
@@ -341,7 +342,7 @@ int main(int argc, char* argv[])
   connection_options.client_certificates[0] = primary_credential;
 
   LOG_AND_EXIT_IF_FAILED(az_mqtt5_connection_init(
-      &mqtt_connection, &connection_context, &mqtt5, mqtt_callback, &connection_options));
+      &mqtt_connection, &connection_context, &mqtt5, mqtt_callback, &connection_options, NULL));
 
   LOG_AND_EXIT_IF_FAILED(az_platform_mutex_init(&pending_command_mutex));
 

sdk/src/azure/core/az_mqtt5_connection.c

@@ -29,7 +29,7 @@ AZ_NODISCARD az_result az_mqtt5_connection_init(
     az_mqtt5* mqtt_client,
     az_mqtt5_connection_callback event_callback,
     az_mqtt5_connection_options* options,
-    const void* event_callback_context)
+    void* event_callback_context)
 {
   _az_PRECONDITION_NOT_NULL(client);
   _az_PRECONDITION_NOT_NULL(mqtt_client);

sdk/tests/core/test_az_mqtt5_connection.c

@@ -107,7 +107,7 @@ static az_result test_subclient_policy_2_root(az_event_policy* me, az_event even
   return AZ_OK;
 }
 
-static az_result test_mqtt_connection_callback(az_mqtt5_connection* client, az_event event, const void* callback_context)
+static az_result test_mqtt_connection_callback(az_mqtt5_connection* client, az_event event, void* callback_context)
 {
   (void)client;
   (void)callback_context;

sdk/tests/core/test_az_mqtt5_rpc_client_hfsm.c

@@ -131,7 +131,7 @@ static az_result test_subclient_policy_1_root(az_event_policy* me, az_event even
   return AZ_OK;
 }
 
-static az_result test_mqtt_connection_callback(az_mqtt5_connection* client, az_event event, const void* event_callback_context)
+static az_result test_mqtt_connection_callback(az_mqtt5_connection* client, az_event event, void* event_callback_context)
 {
   (void)client;
   (void)event_callback_context;

sdk/tests/core/test_az_mqtt5_rpc_server_hfsm.c

@@ -110,7 +110,7 @@ static az_result test_subclient_policy_1_root(az_event_policy* me, az_event even
   return AZ_OK;
 }
 
-static az_result test_mqtt_connection_callback(az_mqtt5_connection* client, az_event event, const void* event_callback_context)
+static az_result test_mqtt_connection_callback(az_mqtt5_connection* client, az_event event, void* event_callback_context)
 {
   (void)client;
   (void)event_callback_context;