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

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

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h
index ebe531ea00f8a2e5637032fca8b443f91a113565..20cdf739fb3cde50e33e55adea988aa781fb9f7e 100644 (file)
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS+TCP V2.0.11\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
@@ -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