Sync FreeRTOS-Labs -CLI -TCP -Trace with the version in FreeRTOS-Plus.

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

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h
index 96f4f53fbdf240dd9a4cf2d9285a22492d7ff117..20cdf739fb3cde50e33e55adea988aa781fb9f7e 100644 (file)
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h
@@ -1,6 +1,6 @@
 /*\r
- * FreeRTOS+TCP 191100 experimental\r
- * Copyright (C) 2018 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\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
  * this software and associated documentation files (the "Software"), to deal in\r
@@ -169,6 +169,14 @@ from the FreeRTOSIPConfig.h configuration header file. */
        #define ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME    portMAX_DELAY\r
 #endif\r
 \r
+\r
+#ifndef        ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS\r
+       #define ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS    pdMS_TO_TICKS( 500u )\r
+#endif\r
+\r
+#ifndef        ipconfigDNS_SEND_BLOCK_TIME_TICKS\r
+       #define ipconfigDNS_SEND_BLOCK_TIME_TICKS               pdMS_TO_TICKS( 500u )\r
+#endif\r
 /*\r
  * FreeRTOS debug logging routine (proposal)\r
  * The macro will be called in the printf() style. Users can define\r
@@ -375,6 +383,14 @@ from the FreeRTOSIPConfig.h configuration header file. */
        #endif /* _WINDOWS_ */\r
 #endif /* ipconfigMAXIMUM_DISCOVER_TX_PERIOD */\r
 \r
+#if( ipconfigUSE_DNS == 0 )\r
+       /* The DNS module will not be included. */\r
+       #if( ( ipconfigUSE_LLMNR != 0 ) || ( ipconfigUSE_NBNS != 0 ) )\r
+               /* LLMNR and NBNS depend on DNS because those protocols share a lot of code. */\r
+               #error When either LLMNR or NBNS is used, ipconfigUSE_DNS must be defined\r
+       #endif\r
+#endif\r
+\r
 #ifndef ipconfigUSE_DNS\r
        #define ipconfigUSE_DNS                                         1\r
 #endif\r
@@ -408,13 +424,6 @@ from the FreeRTOSIPConfig.h configuration header file. */
        #define ipconfigUSE_LLMNR                                       ( 0 )\r
 #endif\r
 \r
-#if( !defined( ipconfigUSE_DNS ) )\r
-       #if( ( ipconfigUSE_LLMNR != 0 ) || ( ipconfigUSE_NBNS != 0 ) )\r
-               /* LLMNR and NBNS depend on DNS because those protocols share a lot of code. */\r
-               #error When either LLMNR or NBNS is used, ipconfigUSE_DNS must be defined\r
-       #endif\r
-#endif\r
-\r
 #ifndef ipconfigREPLY_TO_INCOMING_PINGS\r
        #define ipconfigREPLY_TO_INCOMING_PINGS         1\r
 #endif\r
@@ -507,14 +516,6 @@ from the FreeRTOSIPConfig.h configuration header file. */
        #define ipconfigSOCKET_HAS_USER_WAKE_CALLBACK 0\r
 #endif\r
 \r
-#ifndef ipconfigSOCKET_HAS_USER_WAKE_CALLBACK_WITH_CONTEXT\r
-       #define ipconfigSOCKET_HAS_USER_WAKE_CALLBACK_WITH_CONTEXT 0\r
-#endif\r
-\r
-#if( ipconfigSOCKET_HAS_USER_WAKE_CALLBACK != 0 ) && ( ipconfigSOCKET_HAS_USER_WAKE_CALLBACK_WITH_CONTEXT != 0 )\r
-       #error ipconfigSOCKET_HAS_USER_WAKE_CALLBACK_WITH_CONTEXT cannot be used with ipconfigSOCKET_HAS_USER_WAKE_CALLBACK - undefine one of them\r
-#endif\r
-\r
 #ifndef ipconfigSUPPORT_SELECT_FUNCTION\r
        #define ipconfigSUPPORT_SELECT_FUNCTION 0\r
 #endif\r
@@ -535,7 +536,7 @@ from the FreeRTOSIPConfig.h configuration header file. */
        #define ipconfigUSE_NBNS 0\r
 #endif\r
 \r
-/* As an attack surface reduction for ports that listen for inbound\r
+/* As an attack surface reduction for ports that listen for inbound \r
 connections, hang protection can help reduce the impact of SYN floods. */\r
 #ifndef ipconfigTCP_HANG_PROTECTION\r
        #define ipconfigTCP_HANG_PROTECTION  1\r