Remove ipconfigMULTI_INTERFACE (#1121)

HTRamsey · actions-user · ActoryOu · web-flow · commit e7ddc7d5ed3f · 2024-03-25T10:05:10.000+05:30
* Remove ipconfigMULTI_INTERFACE

* Uncrustify: triggered by comment.

* Empty commit to trigger CI.

---------

Co-authored-by: GitHub Action &lt;action@github.com&gt;
Co-authored-by: ActoryOu &lt;ousc@amazon.com&gt;
diff --git a/source/FreeRTOS_Routing.c b/source/FreeRTOS_Routing.c
@@ -170,10 +170,6 @@ struct xIPv6_Couple
             {
                 /* Other interfaces are already defined, so iterate to the end of the
                  * list. */
-
-                /*_RB_ Question - if ipconfigMULTI_INTERFACE is used to define the
-                 * maximum number of interfaces, would it be more efficient to have an
-                 * array of interfaces rather than a linked list of interfaces? */
                 pxIterator = pxNetworkInterfaces;
 
                 for( ; ; )
diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h
@@ -3072,27 +3072,6 @@ STATIC_ASSERT( ipconfigDNS_SEND_BLOCK_TIME_TICKS <= portMAX_DELAY );
 
 /*---------------------------------------------------------------------------*/
 
-/*
- * ipconfigMULTI_INTERFACE
- *
- * Type: BaseType_t ( ipconfigENABLE | ipconfigDISABLE )
- *
- * Used to let applications know that multiple interfaces are supported by
- * this version of the TCP/IP stack.
- *
- * Must be enabled for demo applications to work.
- */
-
-#ifndef ipconfigMULTI_INTERFACE
-    #define ipconfigMULTI_INTERFACE    ipconfigENABLE
-#endif
-
-#if ( ( ipconfigMULTI_INTERFACE != ipconfigDISABLE ) && ( ipconfigMULTI_INTERFACE != ipconfigENABLE ) )
-    #error Invalid ipconfigMULTI_INTERFACE configuration
-#endif
-
-/*---------------------------------------------------------------------------*/
-
 /*===========================================================================*/
 /*                              ROUTING CONFIG                               */
 /*===========================================================================*/
diff --git a/test/unit-test/ConfigFiles/FreeRTOSIPConfig.h b/test/unit-test/ConfigFiles/FreeRTOSIPConfig.h
@@ -37,7 +37,6 @@
 #define ipconfigUSE_IPv4                    ( 1 )
 #define ipconfigUSE_IPv6                    ( 1 )
 
-#define ipconfigMULTI_INTERFACE             1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    0
 
 #define ipconfigUSE_IPv4                    ( 1 )
diff --git a/test/unit-test/FreeRTOS_DHCPv6/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_DHCPv6/FreeRTOSIPConfig.h
@@ -38,8 +38,6 @@
 #define ipconfigUSE_IPv6                    ( 1 )
 #define ipconfigUSE_DHCPv6                  1
 
-#define ipconfigMULTI_INTERFACE             1
-
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    0
 
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
diff --git a/test/unit-test/FreeRTOS_DNS/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_DNS/FreeRTOSIPConfig.h
@@ -37,8 +37,6 @@
 #define ipconfigUSE_IPv4                          ( 1 )
 #define ipconfigUSE_IPv6                          ( 1 )
 
-#define ipconfigMULTI_INTERFACE                   1
-
 #define ipconfigIPv4_BACKWARD_COMPATIBLE          0
 #define ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM    0
 #define ipconfigUSE_MDNS                          1
diff --git a/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_DNS_ConfigNoCallback/FreeRTOSIPConfig.h
@@ -37,8 +37,6 @@
 #define ipconfigUSE_IPv4                          ( 1 )
 #define ipconfigUSE_IPv6                          ( 1 )
 
-#define ipconfigMULTI_INTERFACE                   1
-
 #define ipconfigIPv4_BACKWARD_COMPATIBLE          0
 #define ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM    0
 #define ipconfigUSE_MDNS                          1
diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig/FreeRTOSIPConfig.h
@@ -37,7 +37,6 @@
 #define ipconfigUSE_IPv4                    ( 1 )
 #define ipconfigUSE_IPv6                    ( 1 )
 
-#define ipconfigMULTI_INTERFACE             1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    0
 
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig1/FreeRTOSIPConfig.h
@@ -37,7 +37,6 @@
 #define ipconfigUSE_IPv4                    ( 1 )
 #define ipconfigUSE_IPv6                    ( 0 )
 
-#define ipconfigMULTI_INTERFACE             1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    1
 
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig2/FreeRTOSIPConfig.h
@@ -37,7 +37,6 @@
 #define ipconfigUSE_IPv4                    ( 1 )
 #define ipconfigUSE_IPv6                    ( 1 )
 
-#define ipconfigMULTI_INTERFACE             1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    1
 
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
diff --git a/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_DiffConfig3/FreeRTOSIPConfig.h
@@ -39,7 +39,6 @@
 
 #define ipconfigUSE_DHCPv6                  ( 1 )
 
-#define ipconfigMULTI_INTERFACE             1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    0
 
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
diff --git a/test/unit-test/FreeRTOS_IP_Utils/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_Utils/FreeRTOSIPConfig.h
@@ -34,7 +34,6 @@
 
 #define TEST                                1
 
-#define ipconfigMULTI_INTERFACE             1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    0
 
 #define ipconfigUSE_IPv4                    ( 1 )
diff --git a/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IP_Utils_DiffConfig/FreeRTOSIPConfig.h
@@ -34,7 +34,6 @@
 
 #define TEST                                1
 
-#define ipconfigMULTI_INTERFACE             1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    1
 
 #define ipconfigUSE_IPv4                    ( 1 )
diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOSIPConfig.h
@@ -37,7 +37,6 @@
 #define ipconfigUSE_IPv4                    ( 1 )
 #define ipconfigUSE_IPv6                    ( 1 )
 
-#define ipconfigMULTI_INTERFACE             1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    0
 
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
diff --git a/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IPv4_DiffConfig1/FreeRTOSIPConfig.h
@@ -37,7 +37,6 @@
 #define ipconfigUSE_IPv4                    ( 1 )
 #define ipconfigUSE_IPv6                    ( 1 )
 
-#define ipconfigMULTI_INTERFACE             1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    0
 
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
diff --git a/test/unit-test/FreeRTOS_IPv6/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IPv6/FreeRTOSIPConfig.h
@@ -37,7 +37,6 @@
 #define ipconfigUSE_IPv6                           ( 1 )
 #define ipconfigETHERNET_DRIVER_FILTERS_PACKETS    ( 0 )
 
-#define ipconfigMULTI_INTERFACE                    1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE           0
 
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
diff --git a/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOSIPConfig.h
@@ -37,7 +37,6 @@
 #define ipconfigUSE_IPv6                           ( 1 )
 #define ipconfigETHERNET_DRIVER_FILTERS_PACKETS    ( 0 )
 
-#define ipconfigMULTI_INTERFACE                    1
 #define ipconfigIPv4_BACKWARD_COMPATIBLE           0
 
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
diff --git a/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_Routing_ConfigV4Only/FreeRTOSIPConfig.h
@@ -34,8 +34,6 @@
 
 #define TEST                                      1
 
-#define ipconfigMULTI_INTERFACE                   1
-
 #define ipconfigUSE_IPv4                          ( 1 )
 
 #define ipconfigUSE_IPv6                          ( 0 )
diff --git a/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOSIPConfig.h
@@ -34,8 +34,6 @@
 
 #define TEST                                1
 
-#define ipconfigMULTI_INTERFACE             1
-
 #define ipconfigIPv4_BACKWARD_COMPATIBLE    0
 
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
diff --git a/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_UDP_IPv4/FreeRTOSIPConfig.h
@@ -37,8 +37,6 @@
 #define ipconfigUSE_IPv4                          ( 1 )
 #define ipconfigUSE_IPv6                          ( 1 )
 
-#define ipconfigMULTI_INTERFACE                   1
-
 #define ipconfigIPv4_BACKWARD_COMPATIBLE          0
 #define ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM    0
 #define ipconfigUSE_MDNS                          1
diff --git a/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOSIPConfig.h b/test/unit-test/FreeRTOS_UDP_IPv6/FreeRTOSIPConfig.h
@@ -37,8 +37,6 @@
 #define ipconfigUSE_IPv4                          ( 1 )
 #define ipconfigUSE_IPv6                          ( 1 )
 
-#define ipconfigMULTI_INTERFACE                   1
-
 #define ipconfigIPv4_BACKWARD_COMPATIBLE          0
 #define ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM    0
 
diff --git a/tools/tcp_utilities/NTPDemo.c b/tools/tcp_utilities/NTPDemo.c
@@ -544,55 +544,42 @@ static void prvNTPTask( void * pvParameters )
                     FreeRTOS_printf( ( "Looking up server '%s' IPv%c\n",
                                        pcServerName,
                                        ( xPreferredHostType == FREERTOS_AF_INET4 ) ? '4' : '6' ) );
-                    #if ( ipconfigMULTI_INTERFACE != 0 )
-                        struct freertos_addrinfo xHints;
-                        struct freertos_addrinfo * pxResults = NULL;
+                    struct freertos_addrinfo xHints;
+                    struct freertos_addrinfo * pxResults = NULL;
 
-                        memset( &( xHints ), 0, sizeof xHints );
-                        xHints.ai_family = xPreferredHostType;
+                    memset( &( xHints ), 0, sizeof xHints );
+                    xHints.ai_family = xPreferredHostType;
 
-                        if( xDNSAsynchronous != 0 )
+                    if( xDNSAsynchronous != 0 )
+                    {
+                        #if ( ipconfigDNS_USE_CALLBACKS != 0 )
                         {
-                            #if ( ipconfigDNS_USE_CALLBACKS != 0 )
-                            {
-                                FreeRTOS_getaddrinfo_a( pcServerName,    /* The name of the node or device */
-                                                        NULL,            /* Ignored for now. */
-                                                        &( xHints ),     /* If not NULL: preferences. */
-                                                        &( pxResults ),  /* An allocated struct, containing the results. */
-                                                        vDNS_callback,
-                                                        ( void * ) NULL, /* An object or a reference. */
-                                                        pdMS_TO_TICKS( 2500U ) );
-                            }
-                            #else
-                            {
-                                FreeRTOS_printf( ( "ipconfigDNS_USE_CALLBACKS is not defined\n" ) );
-                            }
-                            #endif /* if ( ipconfigDNS_USE_CALLBACKS != 0 ) */
+                            FreeRTOS_getaddrinfo_a( pcServerName,    /* The name of the node or device */
+                                                    NULL,            /* Ignored for now. */
+                                                    &( xHints ),     /* If not NULL: preferences. */
+                                                    &( pxResults ),  /* An allocated struct, containing the results. */
+                                                    vDNS_callback,
+                                                    ( void * ) NULL, /* An object or a reference. */
+                                                    pdMS_TO_TICKS( 2500U ) );
                         }
-                        else
+                        #else
                         {
-                            FreeRTOS_getaddrinfo( pcServerName,     /* The name of the node or device */
-                                                  NULL,             /* Ignored for now. */
-                                                  &( xHints ),      /* If not NULL: preferences. */
-                                                  &( pxResults ) ); /* An allocated struct, containing the results. */
-
-                            if( pxResults != NULL )
-                            {
-                                vDNS_callback( pcServerName, NULL, pxResults );
-                            }
+                            FreeRTOS_printf( ( "ipconfigDNS_USE_CALLBACKS is not defined\n" ) );
                         }
-                    #else /* if ( ipconfigMULTI_INTERFACE != 0 ) */
-                        #if ( ipconfigDNS_USE_CALLBACKS != 0 )
-                            FreeRTOS_gethostbyname_a( pcServerName, vDNS_callback, ( void * ) NULL, 1200U );
-                        #else
-                            uint32_t ulIPAddress = FreeRTOS_gethostbyname( pcServerName );
-
-                            if( ulIPAddress != 0U )
-                            {
-                                vDNS_callback( pcServerName, NULL, ulIPAddress );
-                            }
-                        #endif
-                    #endif /* if ( ipconfigMULTI_INTERFACE != 0 ) */
+                        #endif /* if ( ipconfigDNS_USE_CALLBACKS != 0 ) */
+                    }
+                    else
+                    {
+                        FreeRTOS_getaddrinfo( pcServerName,     /* The name of the node or device */
+                                              NULL,             /* Ignored for now. */
+                                              &( xHints ),      /* If not NULL: preferences. */
+                                              &( pxResults ) ); /* An allocated struct, containing the results. */
+
+                        if( pxResults != NULL )
+                        {
+                            vDNS_callback( pcServerName, NULL, pxResults );
+                        }
+                    }
                 }
                 else
                 {
diff --git a/tools/tcp_utilities/http_client_test.c b/tools/tcp_utilities/http_client_test.c
diff --git a/tools/tcp_utilities/include/plus_tcp_demo_cli.h b/tools/tcp_utilities/include/plus_tcp_demo_cli.h
diff --git a/tools/tcp_utilities/plus_tcp_demo_cli.c b/tools/tcp_utilities/plus_tcp_demo_cli.c
