Remove reset of ping timeout

source/core_mqtt.c

@@ -995,28 +995,21 @@ static MQTTStatus_t handleKeepAlive( MQTTContext_t * pContext )
 {
     MQTTStatus_t status = MQTTSuccess;
     uint32_t now = 0U, keepAliveMs = 0U;
-    uint32_t pingrespTimeoutMs = MQTT_PINGRESP_TIMEOUT_MS;
 
     assert( pContext != NULL );
     assert( pContext->getTime != NULL );
 
     now = pContext->getTime();
     keepAliveMs = 1000U * ( uint32_t ) pContext->keepAliveIntervalSec;
 
-    /* It is not useful for the ping response timeout to be greater than half
-     * the keep alive, as the server will have disconnected us by that point. */
-    if( pingrespTimeoutMs > ( keepAliveMs / 2 ) )
-    {
-        pingrespTimeoutMs = keepAliveMs / 2;
-    }
-
     /* If keep alive interval is 0, it is disabled. */
     if( keepAliveMs != 0U )
     {
         if( pContext->waitingForPingResp == true )
         {
             /* Has time expired? */
-            if( calculateElapsedTime( now, pContext->pingReqSendTimeMs ) > pingrespTimeoutMs )
+            if( calculateElapsedTime( now, pContext->pingReqSendTimeMs ) >
+                MQTT_PINGRESP_TIMEOUT_MS )
             {
                 status = MQTTKeepAliveTimeout;
             }

test/unit-test/core_mqtt_utest.c

@@ -1943,11 +1943,7 @@ void test_MQTT_ProcessLoop_handleKeepAlive_Happy_Paths( void )
     mqttStatus = MQTT_Init( &context, &transport, getTime, eventCallback, &networkBuffer );
     TEST_ASSERT_EQUAL( MQTTSuccess, mqttStatus );
     context.waitingForPingResp = true;
-
-    /* Use a large keep alive interval for this test so that the ping response
-     * timeout will be #MQTT_PINGRESP_TIMEOUT_MS and not keep alive interval / 2.
-     * We use 4 * ping response timeout, so timeout / 1000 * 4 = timeout / 250. */
-    context.keepAliveIntervalSec = MQTT_PINGRESP_TIMEOUT_MS / 250;
+    context.keepAliveIntervalSec = MQTT_SAMPLE_KEEPALIVE_INTERVAL_S;
     context.lastPacketTime = MQTT_ONE_SECOND_TO_MS;
     context.pingReqSendTimeMs = MQTT_ONE_SECOND_TO_MS;
     /* Set expected return values in the loop. All success. */
@@ -1981,7 +1977,7 @@ void test_MQTT_ProcessLoop_handleKeepAlive_Error_Paths( void )
     setupTransportInterface( &transport );
 
     modifyIncomingPacketStatus = MQTTNoDataAvailable;
-    globalEntryTime = MQTT_ONE_SECOND_TO_MS;
+    globalEntryTime = MQTT_PINGRESP_TIMEOUT_MS + 1;
 
     /* Coverage for the branch path where PINGRESP timeout interval has expired. */
     mqttStatus = MQTT_Init( &context, &transport, getTime, eventCallback, &networkBuffer );