Sync FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP with the version in GitHub at (23665258ca...

[freertos] / FreeRTOS-Plus / Source / FreeRTOS-Plus-TCP / include / FreeRTOS_TCP_WIN.h

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_WIN.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_WIN.h
index 3c533bf0487e143062a181ff35d1574f80cc9e22..9532fd159887cac0d220dff23203398f516202f9 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_WIN.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_WIN.h
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS+TCP V2.0.0\r
+ * FreeRTOS+TCP V2.2.0\r
  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
  *\r
  * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
@@ -10,8 +10,7 @@
  * subject to the following conditions:\r
  *\r
  * The above copyright notice and this permission notice shall be included in all\r
- * copies or substantial portions of the Software. If you wish to use our Amazon\r
- * FreeRTOS name, please do so in a fair use way that does not cause confusion.\r
+ * copies or substantial portions of the Software.\r
  *\r
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\r
@@ -20,10 +19,8 @@
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
  *\r
- * http://www.FreeRTOS.org\r
  * http://aws.amazon.com/freertos\r
- *\r
- * 1 tab == 4 spaces!\r
+ * http://www.FreeRTOS.org\r
  */\r
 \r
 /*\r
@@ -83,17 +80,9 @@ typedef struct xTCP_WINSIZE
  */\r
 /* Keep this as a multiple of 4 */\r
 #if( ipconfigUSE_TCP_WIN == 1 )\r
-       #if( ipconfigUSE_TCP_TIMESTAMPS == 1 )\r
-               #define ipSIZE_TCP_OPTIONS      ( 16u + 12u )\r
-       #else\r
-               #define ipSIZE_TCP_OPTIONS      16u\r
-       #endif\r
+       #define ipSIZE_TCP_OPTIONS      16u\r
 #else\r
-       #if     ipconfigUSE_TCP_TIMESTAMPS == 1\r
-               #define ipSIZE_TCP_OPTIONS   ( 12u + 12u )\r
-       #else\r
-               #define ipSIZE_TCP_OPTIONS   12u\r
-       #endif\r
+       #define ipSIZE_TCP_OPTIONS   12u\r
 #endif\r
 \r
 /*\r
@@ -123,9 +112,6 @@ typedef struct xTCP_WINDOW
                                                                                  * In other words: the sequence number of the left side of the sliding window */\r
                uint32_t ulFINSequenceNumber;    /* The sequence number which carried the FIN flag */\r
                uint32_t ulHighestSequenceNumber;/* Sequence number of the right-most byte + 1 */\r
-#if( ipconfigUSE_TCP_TIMESTAMPS == 1 )\r
-               uint32_t ulTimeStamp;                    /* The value of the TCP timestamp, transmitted or received */\r
-#endif\r
        } rx, tx;\r
        uint32_t ulOurSequenceNumber;           /* The SEQ number we're sending out */\r
        uint32_t ulUserDataLength;                      /* Number of bytes in Rx buffer which may be passed to the user, after having received a 'missing packet' */\r
@@ -168,6 +154,9 @@ void vTCPWindowDestroy( TCPWindow_t *pxWindow );
 /* Initialize a window */\r
 void vTCPWindowInit( TCPWindow_t *pxWindow, uint32_t ulAckNumber, uint32_t ulSequenceNumber, uint32_t ulMSS );\r
 \r
+/* Clean up allocated segments. Should only be called when FreeRTOS+TCP will no longer be used. */\r
+void vTCPSegmentCleanup( void );\r
+\r
 /*=============================================================================\r
  *\r
  * Rx functions\r