Merging IPv6 demo changes to main (FreeRTOS#1028)

* Add IPv6 Demo (FreeRTOS#937)

* Add demo changes

* Update kernel and library paths

* Update main.c

* Run uncrustify

* Fix spell checker

* CI check file headers update

* Add IPv6/v4 UDP echo server with zero copy/non-zero copy versions

* Add VS proj file changes to include the UDP echo sample code

* readme update

---------

Co-authored-by: Tony Josi <[email protected]>

* Update Backward Compatibility Flag (FreeRTOS#954)

* Update Backward Compatibility Flag

* Update FreeRTOS_GetUDPPayloadBuffer_ByIPType

* Update FreeRTOS_IPStart to FreeRTOS_IPInit_Multi

* Update Application APIs

* Remove ipconfigCOMPATIBLE_WITH_SINGLE

* Update Static Lib files (FreeRTOS#956)

* Update Static Lib files

* making vApplicationIPNetworkEventHook backward compatible in demos

* Update CI check file headers

---------

Co-authored-by: Tony Josi <[email protected]>

* Add WinPCap NetworkInterface Changes (FreeRTOS#958)

* Update winpcap network interface

* Run uncrustify

* Update function to include NetworkInterface_t parameters

* Adding compatibility for xApplicationDNSQueryHook with latest dev branch for old demos (FreeRTOS#957)

* adding compatibility for xApplicationDNSQueryHook with latest dev branch

* adding tcp echo server source

* removing unused sub demos

* fix build issues (FreeRTOS#969)

* Update demo to latest +TCP dev/IPv6_integration (FreeRTOS#978)

* remove macro namings

* rename sin_addr to sin_address.ulIP_IPv4 for ipv6 demo

* replace in6addr_any with FreeRTOS_in6addr_any

* replace mainCREATE_UDP_ECHO_SERVER_TASK with mainCREATE_UDP_ECHO_TASKS_SINGLE

* handle removal of sin_addr macro to sin_address.ulIP_IPv4

* updating +TCP repo to latest dev/IPv6_integration

* minor update to more clear code

* more sin_addr to sin_address.ulIP_IPv4 replacements

* fix makefiles for qemu and posix demos

* review feedback changes

* Update FreeRTOS-Plus-TCP for RC2

* Change from PR (FreeRTOS#994)

* Update FreeRTOS-Plus-TCP for RC2

* Update copyright

* Ignore WinPCap for files header check failure.

* Update checker

* Update manifest

* Point manifest to latest commit

* Fix Spell-checker

* Update doxygen

* Update xApplicationDHCPHook for backward compatibility  (FreeRTOS#999)

* Update xApplicationDHCPHook for backward compatability

* Update IPv6

* Update VisualStudio Static Project files

* Update pxEndPoint error (FreeRTOS#1002)

* Update IPv6 demo ReadMe (FreeRTOS#1004)

* Update ReadMe

* Update setup requirement

* Update UDP demo info

* Update comment

* TCP demo changes post build separation (FreeRTOS#1011)

* adding sin_family to dest adddr for FreeRTOS_sendto

* updating FreeRTOS_bind to input sin_family post build separation changes

* updating FreeRTOS_connect to input sin_family post build separation changes

* minor fix

* updating copyright year

* updating file headers

* updating +TCP submodule

* updating file headers

* updating file headers

* updating manifest file to have latest +TCP submodule hash

* Fix issue with posix demo while running with ipconfigIPv4_BACKWARD_COMPATIBLE enabled for +TCP stack (FreeRTOS#1027)

* Update the submodule pointer to IPv6 main

* Update manifest with latest TCP commit

* Update file checker exception

* Ignore Visual studio project file from file header checker

---------

Co-authored-by: Tony Josi <[email protected]>

Author: moninom1

.github/scripts/core_checker.py

@@ -278,6 +278,9 @@
     r'FreeRTOS\-Plus/Demo/Common/WinPCap/.*',
     r'FreeRTOS\-Plus/Source/FreeRTOS-Plus-Trace/.*',
     r'FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/Trace_Recorder_Configuration/.*',
+    r'FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/common/WinPCap/.*',
+    r'FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/common/WinPCap/pcap/.*',
+    r'FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/FreeRTOS_Plus_TCP_IPv6_Multi.props',
     r'FreeRTOS/Demo/lwIP_AVR32_UC3/.*',
     r'FreeRTOS/Demo/Tensilica_Simulator_Xplorer_XCC/.*',
     r'FreeRTOS/Demo/CORTEX_LM3S102_GCC/makedefs',

FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/Common/FreeRTOS_TCP_server.c

@@ -1,6 +1,6 @@
 /*
- * FreeRTOS+TCP V2.0.3
- * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ * FreeRTOS V202212.00
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -19,8 +19,9 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * https://aws.amazon.com/freertos
  * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
+ *
  */
 
 
@@ -91,8 +92,18 @@ SocketSet_t xSocketSet;
 
 					if( xSocket != FREERTOS_INVALID_SOCKET )
 					{
-						xAddress.sin_addr = FreeRTOS_GetIPAddress(); // Single NIC, currently not used
+						#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
+						{
+							xAddress.sin_address.ulIP_IPv4 = FreeRTOS_GetIPAddress(); /* Single NIC, currently not used */
+						}
+						#else
+						{
+							xAddress.sin_addr = FreeRTOS_GetIPAddress(); /* Single NIC, currently not used */
+						} 
+						#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
+						
 						xAddress.sin_port = FreeRTOS_htons( xPortNumber );
+						xAddress.sin_family = FREERTOS_AF_INET;
 
 						FreeRTOS_bind( xSocket, &xAddress, sizeof( xAddress ) );
 						FreeRTOS_listen( xSocket, pxConfigs[ xIndex ].xBackLog );
@@ -209,7 +220,15 @@ const char *pcType = "Unknown";
 	{
 	struct freertos_sockaddr xRemoteAddress;
 		FreeRTOS_GetRemoteAddress( pxClient->xSocket, &xRemoteAddress );
-		FreeRTOS_printf( ( "TPC-server: new %s client %xip\n", pcType, (unsigned)FreeRTOS_ntohl( xRemoteAddress.sin_addr ) ) );
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
+		{
+			FreeRTOS_printf( ( "TPC-server: new %s client %xip\n", pcType, (unsigned)FreeRTOS_ntohl( xRemoteAddress.sin_address.ulIP_IPv4 ) ) );
+		}
+		#else
+		{	
+			FreeRTOS_printf( ( "TPC-server: new %s client %xip\n", pcType, (unsigned)FreeRTOS_ntohl( xRemoteAddress.sin_addr ) ) );
+		} 
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 	}
 
 	/* Remove compiler warnings in case FreeRTOS_printf() is not used. */

FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/FTP/FreeRTOS_FTP_server.c

@@ -1,11 +1,6 @@
 /*
- *!
- *! The protocols implemented in this file are intended to be demo quality only,
- *! and not for production devices.
- *!
- *
- * FreeRTOS+TCP V2.0.3
- * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ * FreeRTOS V202212.00
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -24,8 +19,16 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * https://aws.amazon.com/freertos
  * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
+ *
+ */
+
+/*
+ *!
+ *! The protocols implemented in this file are intended to be demo quality only,
+ *! and not for production devices.
+ *!
  */
 
 /* Standard includes. */
@@ -585,8 +588,18 @@ BaseType_t xResult = 0;
 				FreeRTOS_GetLocalAddress( pxClient->xTransferSocket, &xLocalAddress );
 				FreeRTOS_GetRemoteAddress( pxClient->xSocket, &xRemoteAddress );
 
-				ulIP = FreeRTOS_ntohl( xLocalAddress.sin_addr );
-				pxClient->ulClientIP = FreeRTOS_ntohl( xRemoteAddress.sin_addr );
+				#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
+				{
+					ulIP = FreeRTOS_ntohl( xLocalAddress.sin_address.ulIP_IPv4  );
+					pxClient->ulClientIP = FreeRTOS_ntohl( xRemoteAddress.sin_address.ulIP_IPv4  );
+				}
+				#else
+				{
+					ulIP = FreeRTOS_ntohl( xLocalAddress.sin_addr );
+					pxClient->ulClientIP = FreeRTOS_ntohl( xRemoteAddress.sin_addr );
+				}
+				#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
+				
 				ulPort = FreeRTOS_ntohs( xLocalAddress.sin_port );
 
 				pxClient->usClientPort = FreeRTOS_ntohs( xRemoteAddress.sin_port );
@@ -852,8 +865,19 @@ BaseType_t xResult;
 	#if( ipconfigFTP_TX_BUFSIZE > 0 )
 		WinProperties_t xWinProps;
 	#endif
-		xAddress.sin_addr = FreeRTOS_GetIPAddress( );	/* Single NIC, currently not used */
+
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
+		{
+			xAddress.sin_address.ulIP_IPv4  = FreeRTOS_GetIPAddress( );	/* Single NIC, currently not used */
+		}
+		#else
+		{
+			xAddress.sin_addr = FreeRTOS_GetIPAddress( );	/* Single NIC, currently not used */
+		}
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
+		
 		xAddress.sin_port = FreeRTOS_htons( 0 );		/* Bind to any available port number */
+		xAddress.sin_family = FREERTOS_AF_INET;
 
 		BaseType_t xBindResult;
 		xBindResult = FreeRTOS_bind( xSocket, &xAddress, sizeof( xAddress ) );
@@ -929,10 +953,22 @@ BaseType_t xResult;
 	}
 	else
 	{
-	struct freertos_sockaddr xAddress;
+		struct freertos_sockaddr xAddress;
+
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
+		{
+			xAddress.sin_address.ulIP_IPv4 = FreeRTOS_htonl( pxClient->ulClientIP );
+		}
+		#else
+		{
+			xAddress.sin_addr = FreeRTOS_htonl( pxClient->ulClientIP );
+		}
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 
-		xAddress.sin_addr = FreeRTOS_htonl( pxClient->ulClientIP );
+		
 		xAddress.sin_port = FreeRTOS_htons( pxClient->usClientPort );
+		xAddress.sin_family = FREERTOS_AF_INET;
+		
 		/* Start an active connection for this data socket */
 		xResult = FreeRTOS_connect( pxClient->xTransferSocket, &xAddress, sizeof( xAddress ) );
 	}

FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/NTP/NTPDemo.c

@@ -1,11 +1,6 @@
 /*
- *!
- *! The protocols implemented in this file are intended to be demo quality only,
- *! and not for production devices.
- *!
- *
- * FreeRTOS+TCP V2.0.3
- * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ * FreeRTOS V202212.00
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -24,11 +19,17 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * https://aws.amazon.com/freertos
  * https://www.FreeRTOS.org
+ * https://github.com/FreeRTOS
+ *
  */
 
 /*
+ *!
+ *! The protocols implemented in this file are intended to be demo quality only,
+ *! and not for production devices.
+ *!
+ *
  * NTPDemo.c
  *
  * An example of how to lookup a domain using DNS
@@ -149,8 +150,18 @@ void vStartNTPTask( uint16_t usTaskStackSize, UBaseType_t uxTaskPriority )
 			BaseType_t xReceiveTimeOut = pdMS_TO_TICKS( 5000 );
 		#endif
 
-			xAddress.sin_addr = 0ul;
+			#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
+			{
+				xAddress.sin_address.ulIP_IPv4 = 0ul;
+			}
+			#else
+			{
+				xAddress.sin_addr = 0ul;
+			}
+			#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
+
 			xAddress.sin_port = FreeRTOS_htons( NTP_PORT );
+			xAddress.sin_family = FREERTOS_AF_INET;
 
 			FreeRTOS_bind( xUDPSocket, &xAddress, sizeof( xAddress ) );
 			FreeRTOS_setsockopt( xUDPSocket, 0, FREERTOS_SO_RCVTIMEO, &xReceiveTimeOut, sizeof( xReceiveTimeOut ) );
@@ -386,10 +397,23 @@ struct freertos_sockaddr xAddress;
 			char pcBuf[16];
 
 				prvNTPPacketInit( );
-				xAddress.sin_addr = ulIPAddressFound;
-				xAddress.sin_port = FreeRTOS_htons( NTP_PORT );
 
-				FreeRTOS_inet_ntoa( xAddress.sin_addr, pcBuf );
+				#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
+				{
+					xAddress.sin_address.ulIP_IPv4 = ulIPAddressFound;
+					xAddress.sin_port = FreeRTOS_htons( NTP_PORT );
+					FreeRTOS_inet_ntoa( xAddress.sin_address.ulIP_IPv4, pcBuf );
+				}
+				#else
+				{
+					xAddress.sin_addr = ulIPAddressFound;
+					xAddress.sin_port = FreeRTOS_htons( NTP_PORT );
+					FreeRTOS_inet_ntoa( xAddress.sin_addr, pcBuf );
+				}
+				#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
+
+				xAddress.sin_family = FREERTOS_AF_INET;
+				
 				FreeRTOS_printf( ( "Sending UDP message to %s:%u\n",
 					pcBuf,
 					FreeRTOS_ntohs( xAddress.sin_port ) ) );

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_CLI_Demos/UDP-Related-CLI-commands.c

@@ -266,44 +266,44 @@ uint32_t ulAddress;
 	switch( xIndex )
 	{
 		case 0 :
-		#if defined( FREERTOS_PLUS_TCP_VERSION ) && ( FREERTOS_PLUS_TCP_VERSION >= 10 )
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
 			FreeRTOS_GetEndPointConfiguration( &ulAddress, NULL, NULL, NULL, pxNetworkEndPoints );
 		#else
 			FreeRTOS_GetAddressConfiguration( &ulAddress, NULL, NULL, NULL );
-		#endif
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 			sprintf( pcWriteBuffer, "\r\nIP address " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 1 :
-		#if defined( FREERTOS_PLUS_TCP_VERSION ) && ( FREERTOS_PLUS_TCP_VERSION >= 10 )
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
 			FreeRTOS_GetEndPointConfiguration( NULL, &ulAddress,  NULL, NULL, pxNetworkEndPoints );
 		#else
 			FreeRTOS_GetAddressConfiguration( NULL, &ulAddress, NULL, NULL );
-		#endif
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 			sprintf( pcWriteBuffer, "\r\nNet mask " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 2 :
-		#if defined( FREERTOS_PLUS_TCP_VERSION ) && ( FREERTOS_PLUS_TCP_VERSION >= 10 )
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
 			FreeRTOS_GetEndPointConfiguration( NULL, NULL, &ulAddress, NULL, pxNetworkEndPoints );
 		#else
 			FreeRTOS_GetAddressConfiguration( NULL, NULL, &ulAddress, NULL );
-		#endif
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 			sprintf( pcWriteBuffer, "\r\nGateway address " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 3 :
-		#if defined( FREERTOS_PLUS_TCP_VERSION ) && ( FREERTOS_PLUS_TCP_VERSION >= 10 )
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
 			FreeRTOS_GetEndPointConfiguration( NULL, NULL, NULL, &ulAddress, pxNetworkEndPoints );
 		#else
 			FreeRTOS_GetAddressConfiguration( NULL, NULL, NULL, &ulAddress );
-		#endif
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 			sprintf( pcWriteBuffer, "\r\nDNS server address " );
 			xReturn = pdTRUE;
 			xIndex++;

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/CLI-commands.c

@@ -565,44 +565,44 @@ uint32_t ulAddress;
 	switch( xIndex )
 	{
 		case 0 :
-		#if defined( FREERTOS_PLUS_TCP_VERSION ) && ( FREERTOS_PLUS_TCP_VERSION >= 10 )
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
 			FreeRTOS_GetEndPointConfiguration( &ulAddress, NULL, NULL, NULL, pxNetworkEndPoints );
 		#else
 			FreeRTOS_GetAddressConfiguration( &ulAddress, NULL, NULL, NULL );
-		#endif
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 			sprintf( pcWriteBuffer, "\r\nIP address " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 1 :
-		#if defined( FREERTOS_PLUS_TCP_VERSION ) && ( FREERTOS_PLUS_TCP_VERSION >= 10 )
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
 			FreeRTOS_GetEndPointConfiguration( NULL, &ulAddress, NULL, NULL, pxNetworkEndPoints );
 		#else
 			FreeRTOS_GetAddressConfiguration( NULL, &ulAddress, NULL, NULL );
-		#endif
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 			sprintf( pcWriteBuffer, "\r\nNet mask " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 2 :
-		#if defined( FREERTOS_PLUS_TCP_VERSION ) && ( FREERTOS_PLUS_TCP_VERSION >= 10 )
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
 			FreeRTOS_GetEndPointConfiguration( NULL, NULL, &ulAddress, NULL, pxNetworkEndPoints );
 		#else
 			FreeRTOS_GetAddressConfiguration( NULL, NULL, &ulAddress, NULL );
-		#endif
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 			sprintf( pcWriteBuffer, "\r\nGateway address " );
 			xReturn = pdTRUE;
 			xIndex++;
 			break;
 
 		case 3 :
-		#if defined( FREERTOS_PLUS_TCP_VERSION ) && ( FREERTOS_PLUS_TCP_VERSION >= 10 )
+		#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
 			FreeRTOS_GetEndPointConfiguration( NULL, NULL, NULL, &ulAddress, pxNetworkEndPoints );
 		#else
 			FreeRTOS_GetAddressConfiguration( NULL, NULL, NULL, &ulAddress );
-		#endif
+		#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 			sprintf( pcWriteBuffer, "\r\nDNS server address " );
 			xReturn = pdTRUE;
 			xIndex++;

FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/UDPCommandServer.c

@@ -1,6 +1,6 @@
 /*
  * FreeRTOS V202212.00
- * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
@@ -20,7 +20,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  * https://www.FreeRTOS.org
- * https://aws.amazon.com/freertos
+ * https://github.com/FreeRTOS
  *
  */
 
@@ -190,6 +190,7 @@ xSocket_t xSocket = FREERTOS_INVALID_SOCKET;
 
 		/* Set family and port. */
 		xServer.sin_port = FreeRTOS_htons( usPort );
+		xServer.sin_family = FREERTOS_AF_INET;
 
 		/* Bind the address to the socket. */
 		if( FreeRTOS_bind( xSocket, &xServer, sizeof( xServer ) ) == -1 )