Fix network down up process

source/FreeRTOS_IP_Timers.c

@@ -57,8 +57,8 @@
 #include "FreeRTOS_DNS.h"
 /*-----------------------------------------------------------*/
 
-/** @brief 'xAllNetworksUp' becomes pdTRUE as soon as all network interfaces have
- * been initialised. */
+/** @brief 'xAllNetworksUp' becomes pdTRUE when all network interfaces are initialised
+ * and becomes pdFALSE when any network interface goes down. */
 /* MISRA Ref 8.9.1 [File scoped variables] */
 /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-89 */
 /* coverity[misra_c_2012_rule_8_9_violation] */
@@ -604,3 +604,13 @@ void vIPSetARPResolutionTimerEnableState( BaseType_t xEnableState )
 
 #endif /* ipconfigDNS_USE_CALLBACKS == 1 */
 /*-----------------------------------------------------------*/
+
+/**
+ * @brief Mark that at least one interface is down so that the 'xNetworkTimer' is checked.
+ *        Whenever the timer expires, all interfaces that are down will get a new NetworkDown
+ *        event.
+ */
+void vSetNotAllNetworksUp( void )
+{
+    xAllNetworksUp = pdFALSE;
+}

source/FreeRTOS_IP_Utils.c

@@ -861,6 +861,22 @@ void prvProcessNetworkDownEvent( struct xNetworkInterface * pxInterface )
          * treat network down as a "delivery problem" and flush the ARP cache for this
          *  interface. */
         FreeRTOS_ClearARP( pxEndPoint );
+
+        #if ( ( ipconfigUSE_DHCP != 0 ) || ( ipconfigUSE_DHCPv6 != 0 ) )
+            if( END_POINT_USES_DHCP( pxEndPoint ) )
+            {
+                /* Stop the DHCP process for this end-point. */
+                vIPSetDHCP_RATimerEnableState( pxEndPoint, pdFALSE );
+            }
+        #endif /* ( ( ipconfigUSE_DHCP != 0 ) || ( ipconfigUSE_DHCPv6 != 0 ) ) */
+
+        #if ( ( ipconfigUSE_RA != 0 ) && ( ipconfigUSE_IPv6 != 0 ) )
+            if( END_POINT_USES_RA( pxEndPoint ) )
+            {
+                /* Stop the RA/SLAAC process for this end-point. */
+                vIPSetDHCP_RATimerEnableState( pxEndPoint, pdFALSE );
+            }
+        #endif /* ( ( ipconfigUSE_RA != 0 ) && ( ipconfigUSE_IPv6 != 0 ) ) */
     }
 
     /* The network has been disconnected (or is being initialised for the first
@@ -936,7 +952,9 @@ void prvProcessNetworkDownEvent( struct xNetworkInterface * pxInterface )
     }
     else
     {
-        /* Nothing to do. When the 'xNetworkTimer' expires, all interfaces
+        vSetNotAllNetworksUp();
+
+        /* Nothing else to do. When the 'xNetworkTimer' expires, all interfaces
          * with bits.bInterfaceUp cleared will get a new 'eNetworkDownEvent' */
     }
 }

source/include/FreeRTOS_IP_Private.h

@@ -882,6 +882,9 @@ BaseType_t xIsCallingFromIPTask( void );
 /* Send the network-up event and start the ARP timer. */
 void vIPNetworkUpCalls( struct xNetworkEndPoint * pxEndPoint );
 
+/* Mark that at least one interface is down to trigger repeated NetworkDown events. */
+void vSetNotAllNetworksUp( void );
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     } /* extern "C" */

test/unit-test/FreeRTOS_IP_Utils/FreeRTOS_IP_Utils_utest.c

@@ -482,6 +482,8 @@ void test_prvProcessNetworkDownEvent_Pass( void )
 
     FreeRTOS_ClearARP_ExpectAnyArgs();
 
+    vIPSetDHCP_RATimerEnableState_Expect( &xEndPoint, pdFALSE );
+
     vDHCPProcess_Expect( pdTRUE, &xEndPoint );
 
     prvProcessNetworkDownEvent( &xInterfaces[ 0 ] );
@@ -497,6 +499,8 @@ void test_prvProcessNetworkDownEvent_Pass( void )
 
     FreeRTOS_ClearARP_Expect( &xEndPoint );
 
+    vIPSetDHCP_RATimerEnableState_Expect( &xEndPoint, pdFALSE );
+
     vDHCPProcess_Expect( pdTRUE, &xEndPoint );
 
     prvProcessNetworkDownEvent( &xInterfaces[ 0 ] );
@@ -575,6 +579,10 @@ void test_prvProcessNetworkDownEvent_InterfaceInitFail( void )
 
     FreeRTOS_ClearARP_ExpectAnyArgs();
 
+    vIPSetDHCP_RATimerEnableState_Expect( &xEndPoint, pdFALSE );
+
+    vSetNotAllNetworksUp_Expect();
+
     prvProcessNetworkDownEvent( &xInterface );
 }
 
@@ -601,6 +609,8 @@ void test_prvProcessNetworkDownEvent_PassDHCPv6( void )
 
     FreeRTOS_ClearARP_ExpectAnyArgs();
 
+    vIPSetDHCP_RATimerEnableState_Expect( &xEndPoint, pdFALSE );
+
     vDHCPv6Process_Expect( pdTRUE, &xEndPoint );
 
     prvProcessNetworkDownEvent( &xInterface );
@@ -629,6 +639,8 @@ void test_prvProcessNetworkDownEvent_PassRA( void )
 
     FreeRTOS_ClearARP_ExpectAnyArgs();
 
+    vIPSetDHCP_RATimerEnableState_Expect( &xEndPoint, pdFALSE );
+
     vRAProcess_Expect( pdTRUE, &xEndPoint );
 
     prvProcessNetworkDownEvent( &xInterface );

test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOS_IP_Utils_DiffConfig_utest.c

@@ -104,6 +104,8 @@ void test_prvProcessNetworkDownEvent_Pass_DHCP_Enabled( void )
 
     FreeRTOS_ClearARP_Expect( &xEndPoint );
 
+    vIPSetDHCP_RATimerEnableState_Expect( &xEndPoint, pdFALSE );
+
     FreeRTOS_NextEndPoint_ExpectAndReturn( &xInterface, &xEndPoint, NULL );
 
     xInterface.pfInitialise = xNetworkInterfaceInitialise_test;