TCP demo changes post build separation (#1011)devIPv6

* 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

22 files changed, 104 insertions, 93 deletions

diff --git a/FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/Common/FreeRTOS_TCP_server.c b/FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/Common/FreeRTOS_TCP_server.c
index ec75c77af..9fb2feed1 100644
--- a/FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/Common/FreeRTOS_TCP_server.c
+++ b/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

+ *

  */

 

 

@@ -102,6 +103,7 @@ SocketSet_t xSocketSet;
 						#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 );

diff --git a/FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/FTP/FreeRTOS_FTP_server.c b/FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/FTP/FreeRTOS_FTP_server.c
index 59e21b7e5..f0f251beb 100644
--- a/FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/FTP/FreeRTOS_FTP_server.c
+++ b/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. */

@@ -874,6 +877,7 @@ BaseType_t xResult;
 		#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 ) );

@@ -963,6 +967,8 @@ BaseType_t xResult;
 

 		

 		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 ) );

 	}

diff --git a/FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/NTP/NTPDemo.c b/FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/NTP/NTPDemo.c
index 1bf86697e..93d90e5bf 100644
--- a/FreeRTOS-Plus/Demo/Common/Demo_IP_Protocols/NTP/NTPDemo.c
+++ b/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

@@ -160,6 +161,7 @@ void vStartNTPTask( uint16_t usTaskStackSize, UBaseType_t uxTaskPriority )
 			#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 ) );

@@ -409,6 +411,8 @@ struct freertos_sockaddr xAddress;
 					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,

diff --git a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/UDPCommandServer.c b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/UDPCommandServer.c
index 0be8f5c9c..10730610a 100644
--- a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/UDPCommandServer.c
+++ b/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 )

diff --git a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.c b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.c
index 6cba51074..c40e350e2 100644
--- a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.c
+++ b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.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

  *

  */

 

@@ -147,6 +147,8 @@ uint32_t xAddressLength = sizeof( xEchoServerAddress );
 	}

 	#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */

 

+	xEchoServerAddress.sin_family = FREERTOS_AF_INET;

+

 	for( ;; )

 	{

 		/* Create a socket. */

@@ -267,6 +269,8 @@ const size_t xBufferLength = strlen( pcStringToSend ) + 15;
 	}

 	#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */

 

+	xEchoServerAddress.sin_family = FREERTOS_AF_INET;

+

 	for( ;; )

 	{

 		/* Create a socket. */

diff --git a/FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c b/FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c
index f9122e3d9..0b2244381 100644
--- a/FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c
+++ b/FreeRTOS-Plus/Demo/Common/Logging/windows/Logging_WinSim.c
@@ -191,6 +191,8 @@ void vLoggingInit( BaseType_t xLogToStdout,
                     xPrintUDPAddress.sin_addr = ulRemoteIPAddress;
                 }
                 #endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
+
+                xPrintUDPAddress.sin_family = FREERTOS_AF_INET;
                 
             }
 
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/SimpleTCPEchoServer.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/SimpleTCPEchoServer.c
index 67b6d202a..40842ab4a 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/SimpleTCPEchoServer.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/SimpleTCPEchoServer.c
@@ -192,6 +192,7 @@
          * listen for incoming connections. */
         xBindAddress.sin_port = tcpechoPORT_NUMBER;
         xBindAddress.sin_port = FreeRTOS_htons( xBindAddress.sin_port );
+        xBindAddress.sin_family = FREERTOS_AF_INET;
         FreeRTOS_bind( xListeningSocket, &xBindAddress, sizeof( xBindAddress ) );
         FreeRTOS_listen( xListeningSocket, xBacklog );
 
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/TCPEchoClient_SingleTasks.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/TCPEchoClient_SingleTasks.c
index 3766e8455..4614a72c9 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/TCPEchoClient_SingleTasks.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/TCPEchoClient_SingleTasks.c
@@ -175,6 +175,8 @@
         }
         #endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 
+        xEchoServerAddress.sin_family = FREERTOS_AF_INET;
+
         for( ; ; )
         {
             /* Create a TCP socket. */
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/TCPEchoClient_SingleTasks.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/TCPEchoClient_SingleTasks.c
index c99dc5e50..bf59f0622 100755
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/TCPEchoClient_SingleTasks.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/TCPEchoClient_SingleTasks.c
@@ -176,6 +176,8 @@
         }
         #endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 
+        xEchoServerAddress.sin_family = FREERTOS_AF_INET;
+
         for( ; ; )
         {
             /* Create a TCP socket. */
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/common/Logging/windows/Logging_WinSim.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/common/Logging/windows/Logging_WinSim.c
index 9c5e44338..16cb8c9de 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/common/Logging/windows/Logging_WinSim.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/common/Logging/windows/Logging_WinSim.c
@@ -182,6 +182,7 @@ void vLoggingInit( BaseType_t xLogToStdout,
                 /* Set the address to which the print messages are sent. */

                 xPrintUDPAddress.sin_port = FreeRTOS_htons( usRemotePort );

                 xPrintUDPAddress.sin_address.ulIP_IPv4 = ulRemoteIPAddress;

+                xPrintUDPAddress.sin_family = FREERTOS_AF_INET;

             }

 

             /* If a disk file or stdout are to be used then Win32 system calls will

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/common/NTP/NTPDemo.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/common/NTP/NTPDemo.c
index 04ad081a1..aea71abab 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/common/NTP/NTPDemo.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/common/NTP/NTPDemo.c
@@ -220,6 +220,7 @@ void vStartNTPTask( uint16_t usTaskStackSize,
 
             xAddress.sin_address.ulIP_IPv4 = 0ul;
             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 ) );
@@ -607,6 +608,7 @@ static void prvNTPTask( void * pvParameters )
                 {
                     xAddress.sin_address.ulIP_IPv4 = ulIPAddressFound;
                     xAddress.sin_port = FreeRTOS_htons( NTP_PORT );
+                    xAddress.sin_family = FREERTOS_AF_INET;
 
                     FreeRTOS_printf( ( "Sending UDP message to %lxip:%u\n",
                                        FreeRTOS_ntohl( ulIPAddressFound ),
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/SimpleTCPEchoServer.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/SimpleTCPEchoServer.c
index 03604d74a..f0d1fd7de 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/SimpleTCPEchoServer.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/SimpleTCPEchoServer.c
@@ -1,71 +1,28 @@
 /*

-    FreeRTOS V202212.00

-    All rights reserved

-

-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.

-

-    This file is part of the FreeRTOS distribution.

-

-    FreeRTOS is free software; you can redistribute it and/or modify it under

-    the terms of the GNU General Public License (version 2) as published by the

-    Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.

-

-    ***************************************************************************

-    >>!   NOTE: The modification to the GPL is included to allow you to     !<<

-    >>!   distribute a combined work that includes FreeRTOS without being   !<<

-    >>!   obliged to provide the source code for proprietary components     !<<

-    >>!   outside of the FreeRTOS kernel.                                   !<<

-    ***************************************************************************

-

-    FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY

-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS

-    FOR A PARTICULAR PURPOSE.  Full license text is available on the following

-    link: http://www.freertos.org/a00114.html

-

-    ***************************************************************************

-     *                                                                       *

-     *    FreeRTOS provides completely free yet professionally developed,    *

-     *    robust, strictly quality controlled, supported, and cross          *

-     *    platform software that is more than just the market leader, it     *

-     *    is the industry's de facto standard.                               *

-     *                                                                       *

-     *    Help yourself get started quickly while simultaneously helping     *

-     *    to support the FreeRTOS project by purchasing a FreeRTOS           *

-     *    tutorial book, reference manual, or both:                          *

-     *    http://www.FreeRTOS.org/Documentation                              *

-     *                                                                       *

-    ***************************************************************************

-

-    http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading

-    the FAQ page "My application does not run, what could be wrong?".  Have you

-    defined configASSERT()?

-

-    http://www.FreeRTOS.org/support - In return for receiving this top quality

-    embedded software for free we request you assist our global community by

-    participating in the support forum.

-

-    http://www.FreeRTOS.org/training - Investing in training allows your team to

-    be as productive as possible as early as possible.  Now you can receive

-    FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers

-    Ltd, and the world's leading authority on the world's leading RTOS.

-

-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,

-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS

-    compatible FAT file system, and our tiny thread aware UDP/IP stack.

-

-    http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.

-    Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.

-

-    http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High

-    Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS

-    licenses offer ticketed support, indemnification and commercial middleware.

-

-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety

-    engineered and independently SIL3 certified version for use in safety and

-    mission critical applications that require provable dependability.

-

-    1 tab == 4 spaces!

-*/

+ * 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

+ * the Software without restriction, including without limitation the rights to

+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of

+ * the Software, and to permit persons to whom the Software is furnished to do so,

+ * subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice shall be included in all

+ * copies or substantial portions of the Software.

+ *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS

+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR

+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER

+ * 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://www.FreeRTOS.org

+ * https://github.com/FreeRTOS

+ *

+ */

 

 /*

  * FreeRTOS tasks are used with FreeRTOS+TCP to create a TCP echo server on the

@@ -189,6 +146,7 @@ const BaseType_t xBacklog = 20;
 	listen for incoming connections. */

 	xBindAddress.sin_port = tcpechoPORT_NUMBER;

 	xBindAddress.sin_port = FreeRTOS_htons( xBindAddress.sin_port );

+	xBindAddress.sin_family = FREERTOS_AF_INET;

 	FreeRTOS_bind( xListeningSocket, &xBindAddress, sizeof( xBindAddress ) );

 	FreeRTOS_listen( xListeningSocket, xBacklog );

 

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/SimpleUDPClientAndServer.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/SimpleUDPClientAndServer.c
index 08958605f..5ed5a060c 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/SimpleUDPClientAndServer.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/SimpleUDPClientAndServer.c
@@ -125,6 +125,7 @@ const TickType_t x150ms = 150UL / portTICK_PERIOD_MS;
 	

 	xDestinationAddress.sin_port = ( uint16_t ) ( ( uint32_t ) pvParameters ) & 0xffffUL;

 	xDestinationAddress.sin_port = FreeRTOS_htons( xDestinationAddress.sin_port );

+	xDestinationAddress.sin_family = FREERTOS_AF_INET;

 

 	for( ;; )

 	{

@@ -183,6 +184,7 @@ Socket_t xListeningSocket;
 	so the IP address is valid here. */

 	xBindAddress.sin_port = ( uint16_t ) ( ( uint32_t ) pvParameters ) & 0xffffUL;

 	xBindAddress.sin_port = FreeRTOS_htons( xBindAddress.sin_port );

+	xBindAddress.sin_family = FREERTOS_AF_INET;

 

 	/* Bind the socket to the port that the client task will send to. */

 	FreeRTOS_bind( xListeningSocket, &xBindAddress, sizeof( xBindAddress ) );

@@ -244,6 +246,7 @@ const size_t xStringLength = strlen( pcStringToSend ) + 15;
 

 	xDestinationAddress.sin_port = ( uint16_t ) ( ( uint32_t ) pvParameters ) & 0xffffUL;

 	xDestinationAddress.sin_port = FreeRTOS_htons( xDestinationAddress.sin_port );

+	xDestinationAddress.sin_family = FREERTOS_AF_INET;

 

 	for( ;; )

 	{

@@ -352,6 +355,7 @@ Socket_t xListeningSocket;
 	

 	xBindAddress.sin_port = ( uint16_t ) ( ( uint32_t ) pvParameters ) & 0xffffUL;

 	xBindAddress.sin_port = FreeRTOS_htons( xBindAddress.sin_port );

+	xBindAddress.sin_family = FREERTOS_AF_INET;

 

 	/* Bind the socket to the port that the client task will send to. */

 	FreeRTOS_bind( xListeningSocket, &xBindAddress, sizeof( xBindAddress ) );

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/TCPEchoClient_SingleTasks.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/TCPEchoClient_SingleTasks.c
index 7b1bd8773..f5166259b 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/TCPEchoClient_SingleTasks.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/DemoTasks/TCPEchoClient_SingleTasks.c
@@ -164,6 +164,8 @@ TickType_t xTimeOnEntering;
 	}

 	#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */

 

+	xEchoServerAddress.sin_family = FREERTOS_AF_INET;

+

 	for( ;; )

 	{

 		/* Create a TCP socket. */

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/SimpleClientAndServer.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/SimpleClientAndServer.c
index 2c65a264b..183853ea0 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/SimpleClientAndServer.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/SimpleClientAndServer.c
@@ -112,6 +112,7 @@ const portTickType x150ms = 150UL / portTICK_RATE_MS;
 	
 	xDestinationAddress.sin_port = ( uint16_t ) ( ( uint32_t ) pvParameters ) & 0xffffUL;
 	xDestinationAddress.sin_port = FreeRTOS_htons( xDestinationAddress.sin_port );
+	xDestinationAddress.sin_family = FREERTOS_AF_INET;
 
 	for( ;; )
 	{
@@ -170,6 +171,7 @@ Socket_t xListeningSocket;
 	so the IP address is valid here. */
 	xBindAddress.sin_port = ( uint16_t ) ( ( uint32_t ) pvParameters ) & 0xffffUL;
 	xBindAddress.sin_port = FreeRTOS_htons( xBindAddress.sin_port );
+	xBindAddress.sin_family = FREERTOS_AF_INET;
 
 	/* Bind the socket to the port that the client task will send to. */
 	FreeRTOS_bind( xListeningSocket, &xBindAddress, sizeof( xBindAddress ) );
@@ -237,6 +239,7 @@ const size_t xStringLength = strlen( ( char * ) pucStringToSend ) + 15;
 
 	xDestinationAddress.sin_port = ( uint16_t ) ( ( uint32_t ) pvParameters ) & 0xffffUL;
 	xDestinationAddress.sin_port = FreeRTOS_htons( xDestinationAddress.sin_port );
+	xDestinationAddress.sin_family = FREERTOS_AF_INET;
 
 	for( ;; )
 	{
@@ -345,6 +348,7 @@ Socket_t xListeningSocket;
 	
 	xBindAddress.sin_port = ( uint16_t ) ( ( uint32_t ) pvParameters ) & 0xffffUL;
 	xBindAddress.sin_port = FreeRTOS_htons( xBindAddress.sin_port );
+	xBindAddress.sin_family = FREERTOS_AF_INET;
 
 	/* Bind the socket to the port that the client task will send to. */
 	FreeRTOS_bind( xListeningSocket, &xBindAddress, sizeof( xBindAddress ) );
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/TwoEchoClients.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/TwoEchoClients.c
index d78b99e01..0d8b7403d 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/TwoEchoClients.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/TwoEchoClients.c
@@ -156,6 +156,8 @@ uint32_t xAddressLength = sizeof( xEchoServerAddress );
 	}
 	#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 
+	xEchoServerAddress.sin_family = FREERTOS_AF_INET;
+
 	for( ;; )
 	{
 		/* Create a socket. */
@@ -299,6 +301,8 @@ const size_t xBufferLength = strlen( ( char * ) pucStringToSend ) + 15;
 	}
 	#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 
+	xEchoServerAddress.sin_family = FREERTOS_AF_INET;
+
 	for( ;; )
 	{
 		/* Create a socket. */
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c
index ef29030db..ecbf51dcf 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c
@@ -192,6 +192,7 @@ Socket_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 )
diff --git a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/DemoTasks/SerializerMQTTExample.c b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/DemoTasks/SerializerMQTTExample.c
index addeee382..1794ab87f 100644
--- a/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/DemoTasks/SerializerMQTTExample.c
+++ b/FreeRTOS-Plus/Demo/coreMQTT_Windows_Simulator/MQTT_Serializer/DemoTasks/SerializerMQTTExample.c
@@ -615,6 +615,8 @@ static Socket_t prvCreateTCPConnectionToBroker( void )
             }
             #endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 
+            xBrokerAddress.sin_family = FREERTOS_AF_INET;
+
             if( FreeRTOS_connect( xMQTTSocket, &xBrokerAddress, sizeof( xBrokerAddress ) ) == 0 )
             {
                 /* Connection was successful. */
diff --git a/FreeRTOS-Plus/Demo/coreSNTP_Windows_Simulator/SNTPClientTask.c b/FreeRTOS-Plus/Demo/coreSNTP_Windows_Simulator/SNTPClientTask.c
index 4bb5627fc..0a11d6341 100644
--- a/FreeRTOS-Plus/Demo/coreSNTP_Windows_Simulator/SNTPClientTask.c
+++ b/FreeRTOS-Plus/Demo/coreSNTP_Windows_Simulator/SNTPClientTask.c
@@ -744,6 +744,7 @@ int32_t UdpTransport_Send( NetworkContext_t * pNetworkContext,
     #endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
 
     destinationAddress.sin_port = FreeRTOS_htons( serverPort );
+    destinationAddress.sin_family = FREERTOS_AF_INET;
 
     /* Send the buffer with ulFlags set to 0, so the FREERTOS_ZERO_COPY bit
      * is clear. */
@@ -1406,6 +1407,7 @@ static bool createUdpSocket( Socket_t * pSocket )
          * spoofing vulnerability from "network off-path" attackers. */
         uint16_t randomPort = ( generateRandomNumber() % UINT16_MAX );
         bindAddress.sin_port = FreeRTOS_htons( randomPort );
+        bindAddress.sin_family = FREERTOS_AF_INET;
 
         if( FreeRTOS_bind( *pSocket, &bindAddress, sizeof( bindAddress ) ) == 0 )
         {
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP
-Subproject 997112866b9b5f4d4263a395c6ca6a78d4e60d1
+Subproject 1f98752059a203cb227c78801ab9ecfbf128a49
diff --git a/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Suite/Test_Code/Test_Cases/test_tcp.c b/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Suite/Test_Code/Test_Cases/test_tcp.c
index f6889888f..228935410 100644
--- a/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Suite/Test_Code/Test_Cases/test_tcp.c
+++ b/FreeRTOS-Plus/Test/FreeRTOS-Plus-TCP/Integration/Full-TCP-Suite/Test_Code/Test_Cases/test_tcp.c
@@ -1,5 +1,5 @@
 /*
- * FreeRTOS Secure Sockets V1.1.9
+ * 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
@@ -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
+ *
  */
 
 /* Standard includes. */
@@ -1838,6 +1839,8 @@ static void prvFreeRTOS_connect_InvalidParams( void )
         xEchoServerAddress.sin_addr = ulEchoServerIP;
     }
     #endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
+
+    xEchoServerAddress.sin_family = FREERTOS_AF_INET;
     
 
     /* Invalid socket. */
@@ -1865,6 +1868,8 @@ static void prvFreeRTOS_connect_InvalidParams( void )
         xEchoServerAddress.sin_addr = FreeRTOS_inet_addr_quick( 0, 0, 0, 0 );
     }
     #endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
+
+    xEchoServerAddress.sin_family = FREERTOS_AF_INET;
     
     xResult = FreeRTOS_connect( xSocket,
                                &xEchoServerAddress,
@@ -1892,6 +1897,8 @@ static void prvFreeRTOS_connect_InvalidParams( void )
         xEchoServerAddress.sin_addr = ulEchoServerIP;
     }
     #endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
+
+    xEchoServerAddress.sin_family = FREERTOS_AF_INET;
     
     xResult = FreeRTOS_connect( xSocket,
                                &xEchoServerAddress,
diff --git a/manifest.yml b/manifest.yml
index 00c25d961..c909a4a5f 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -11,7 +11,7 @@ dependencies:
       path: "FreeRTOS/Source"
 
   - name: "FreeRTOS-Plus-TCP"
-    version: "9971128"
+    version: "1f98752"
     repository:
       type: "git"
       url: "https://github.com/FreeRTOS/FreeRTOS-Plus-TCP.git"