Merge branch 'feature/tls_configurable_timeouts'

Amit Sheth · Amit Sheth · commit 8acb914c8061 · 2024-07-16T16:18:12.000+05:30
diff --git a/examples/fleet_provisioning/fleet_provisioning_with_csr/main/mqtt_operations.c b/examples/fleet_provisioning/fleet_provisioning_with_csr/main/mqtt_operations.c
@@ -853,6 +853,7 @@ bool EstablishMqttSession( MQTTPublishCallback_t publishCallback,
                     returnStatus = false;
                     LogError( ( "Connection with MQTT broker failed with status %s.",
                                 MQTT_Status_strerror( mqttStatus ) ) );
+                    Mbedtls_Pkcs11_Disconnect(pNetworkContext);
                 }
                 else
                 {
diff --git a/examples/jobs/main/mqtt_demo_helpers.c b/examples/jobs/main/mqtt_demo_helpers.c
@@ -833,6 +833,7 @@ int32_t EstablishMqttSession( MQTTEventCallback_t eventCallback )
                 {
                     returnStatus = EXIT_FAILURE;
                     LogError( ( "Connection with MQTT broker failed with status %u.", mqttStatus ) );
+                    xTlsDisconnect( pNetworkContext );
                 }
                 else
                 {
diff --git a/examples/ota/ota_http/CMakeLists.txt b/examples/ota/ota_http/CMakeLists.txt
@@ -4,8 +4,8 @@ cmake_minimum_required(VERSION 3.5)
 
 set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/common_components/protocol_examples_common"
    					     "${CMAKE_CURRENT_LIST_DIR}/../../../libraries/ota-for-aws-iot-embedded-sdk"
-						 "${CMAKE_CURRENT_LIST_DIR}/../../../libraries/coreMQTT"
 						 "${CMAKE_CURRENT_LIST_DIR}/../../../libraries/coreHTTP"
+						 "${CMAKE_CURRENT_LIST_DIR}/../../../libraries/coreMQTT"
 						 "${CMAKE_CURRENT_LIST_DIR}/../../../libraries/coreJSON"			 
 						 "${CMAKE_CURRENT_LIST_DIR}/../../../libraries/corePKCS11"
 						 "${CMAKE_CURRENT_LIST_DIR}/../../../libraries/backoffAlgorithm"
diff --git a/examples/ota/ota_http/main/ota_demo_core_http.c b/examples/ota/ota_http/main/ota_demo_core_http.c
@@ -1337,6 +1337,7 @@ static int establishConnection( void )
             LogError( ( "Failed creating an MQTT connection to %.*s.",
                         AWS_IOT_ENDPOINT_LENGTH,
                         AWS_IOT_ENDPOINT ) );
+            xTlsDisconnect( &networkContextMqtt );
         }
         else
         {
diff --git a/examples/ota/ota_mqtt/main/ota_demo_core_mqtt.c b/examples/ota/ota_mqtt/main/ota_demo_core_mqtt.c
@@ -142,7 +142,7 @@ extern const char pcAwsCodeSigningCertPem[] asm("_binary_aws_codesign_crt_start"
 /**
  * @brief Period for demo loop sleep in milliseconds.
  */
-#define OTA_EXAMPLE_LOOP_SLEEP_PERIOD_MS    ( 5U )
+#define OTA_EXAMPLE_LOOP_SLEEP_PERIOD_MS    ( 20U )
 
 /**
  * @brief Size of the network buffer to receive the MQTT message.
@@ -1207,6 +1207,7 @@ static int establishConnection( void )
             LogError( ( "Failed creating an MQTT connection to %.*s.",
                         AWS_IOT_ENDPOINT_LENGTH,
                         AWS_IOT_ENDPOINT ) );
+            xTlsDisconnect(&networkContext);
         }
         else
         {
@@ -1573,6 +1574,8 @@ static void * otaThread( void * pParam )
     return NULL;
 }
 /*-----------------------------------------------------------*/
+uint32_t otaPacketsReceived_prev = 0;
+
 static int startOTADemo( void )
 {
     /* Status indicating a successful demo or not. */
@@ -1707,7 +1710,13 @@ static int startOTADemo( void )
                                otaStatistics.otaPacketsDropped ) );
 
                     /* Delay to allow data to buffer for MQTT_ProcessLoop. */
-                    Clock_SleepMs( OTA_EXAMPLE_LOOP_SLEEP_PERIOD_MS );
+
+                    if (otaStatistics.otaPacketsReceived == otaPacketsReceived_prev) {
+                        Clock_SleepMs( OTA_EXAMPLE_LOOP_SLEEP_PERIOD_MS );
+                    }
+
+                    otaPacketsReceived_prev = otaStatistics.otaPacketsReceived;
+
                 }
                 else
                 {
diff --git a/examples/thing_shadow/main/shadow_demo_helpers.c b/examples/thing_shadow/main/shadow_demo_helpers.c
@@ -832,6 +832,7 @@ int32_t EstablishMqttSession( MQTTEventCallback_t eventCallback )
                 {
                     returnStatus = EXIT_FAILURE;
                     LogError( ( "Connection with MQTT broker failed with status %u.", mqttStatus ) );
+                    xTlsDisconnect( pNetworkContext );
                 }
                 else
                 {
diff --git a/libraries/coreMQTT/port/network_transport/network_transport.c b/libraries/coreMQTT/port/network_transport/network_transport.c
diff --git a/libraries/coreMQTT/port/network_transport/network_transport.h b/libraries/coreMQTT/port/network_transport/network_transport.h

Original file line number	Diff line number	Diff line change
`@@ -853,6 +853,7 @@ bool EstablishMqttSession( MQTTPublishCallback_t publishCallback,`
`853`	`853`	`returnStatus = false;`
`854`	`854`	`LogError( ( "Connection with MQTT broker failed with status %s.",`
`855`	`855`	`MQTT_Status_strerror( mqttStatus ) ) );`
	`856`	`+ Mbedtls_Pkcs11_Disconnect(pNetworkContext);`
`856`	`857`	`}`
`857`	`858`	`else`
`858`	`859`	`{`
Original file line number	Diff line number	Diff line change
`@@ -833,6 +833,7 @@ int32_t EstablishMqttSession( MQTTEventCallback_t eventCallback )`
`833`	`833`	`{`
`834`	`834`	`returnStatus = EXIT_FAILURE;`
`835`	`835`	`LogError( ( "Connection with MQTT broker failed with status %u.", mqttStatus ) );`
	`836`	`+ xTlsDisconnect( pNetworkContext );`
`836`	`837`	`}`
`837`	`838`	`else`
`838`	`839`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1337,6 +1337,7 @@ static int establishConnection( void )`
`1337`	`1337`	`LogError( ( "Failed creating an MQTT connection to %.*s.",`
`1338`	`1338`	`AWS_IOT_ENDPOINT_LENGTH,`
`1339`	`1339`	`AWS_IOT_ENDPOINT ) );`
	`1340`	`+ xTlsDisconnect( &networkContextMqtt );`
`1340`	`1341`	`}`
`1341`	`1342`	`else`
`1342`	`1343`	`{`
Original file line number	Diff line number	Diff line change
`@@ -832,6 +832,7 @@ int32_t EstablishMqttSession( MQTTEventCallback_t eventCallback )`
`832`	`832`	`{`
`833`	`833`	`returnStatus = EXIT_FAILURE;`
`834`	`834`	`LogError( ( "Connection with MQTT broker failed with status %u.", mqttStatus ) );`
	`835`	`+ xTlsDisconnect( pNetworkContext );`
`835`	`836`	`}`
`836`	`837`	`else`
`837`	`838`	`{`