EnDefineNS pcName buffer when MDNS/LLMNR enabled.

Author: ActoryOu

source/FreeRTOS_DNS.c

@@ -257,6 +257,9 @@ const MACAddress_t xMDNS_MacAddressIPv6 = { { 0x33, 0x33, 0x00, 0x00, 0x00, 0xFB
 
         /* 'xFamily' might not be used when IPv6 is disabled. */
         ( void ) xFamily;
+        /* 'pcName' might not be used when DNS cache is disabled. */
+        ( void ) pcName;
+
         pvBuffer = pvPortMalloc( sizeof( *pxAddrInfo ) );
 
         if( pvBuffer != NULL )

source/FreeRTOS_DNS_Parser.c

@@ -47,8 +47,10 @@
 
 #if ( ipconfigUSE_DNS != 0 )
 
-
-    #if ( ipconfigUSE_DNS_CACHE == 1 ) || ( ipconfigDNS_USE_CALLBACKS == 1 )
+    #if ( ipconfigIS_ENABLED( ipconfigUSE_DNS_CACHE ) ||     \
+          ipconfigIS_ENABLED( ipconfigDNS_USE_CALLBACKS ) || \
+          ipconfigIS_ENABLED( ipconfigUSE_MDNS ) ||          \
+          ipconfigIS_ENABLED( ipconfigUSE_LLMNR ) )
 
 /**
  * @brief Read the Name field out of a DNS response packet.
@@ -162,7 +164,7 @@
 
             return uxIndex;
         }
-    #endif /* ipconfigUSE_DNS_CACHE || ipconfigDNS_USE_CALLBACKS */
+    #endif /* ipconfigUSE_DNS_CACHE || ipconfigDNS_USE_CALLBACKS || ipconfigUSE_MDNS || ipconfigUSE_LLMNR */
 
 /**
  * @brief Simple routine that jumps over the NAME field of a resource record.
@@ -288,7 +290,7 @@
              * for easier access. */
 
             /* MISRA Ref 11.3.1 [Misaligned access] */
-/* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */
+            /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */
             /* coverity[misra_c_2012_rule_11_3_violation] */
             xSet.pxDNSMessageHeader = ( ( DNSMessage_t * )
                                         pucUDPPayloadBuffer );
@@ -358,15 +360,19 @@
                     }
                     #endif
 
-                    #if ( ipconfigUSE_DNS_CACHE == 1 ) || ( ipconfigDNS_USE_CALLBACKS == 1 )
+                    #if ( ipconfigIS_ENABLED( ipconfigUSE_DNS_CACHE ) ||     \
+                          ipconfigIS_ENABLED( ipconfigDNS_USE_CALLBACKS ) || \
+                          ipconfigIS_ENABLED( ipconfigUSE_MDNS ) ||          \
+                          ipconfigIS_ENABLED( ipconfigUSE_LLMNR ) )
+
                         if( x == 0U )
                         {
                             uxResult = DNS_ReadNameField( &xSet,
                                                           sizeof( xSet.pcName ) );
                             ( void ) uxResult;
                         }
                         else
-                    #endif /* ipconfigUSE_DNS_CACHE || ipconfigDNS_USE_CALLBACKS */
+                    #endif /* ipconfigUSE_DNS_CACHE || ipconfigDNS_USE_CALLBACKS || ipconfigUSE_MDNS || ipconfigUSE_LLMNR */
                     {
                         /* Skip the variable length pcName field. */
                         uxResult = DNS_SkipNameField( xSet.pucByte,
@@ -724,7 +730,7 @@
                  * fields of the structure. */
 
                 /* MISRA Ref 11.3.1 [Misaligned access] */
-/* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */
+                /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */
                 /* coverity[misra_c_2012_rule_11_3_violation] */
                 pxDNSAnswerRecord = ( ( DNSAnswerRecord_t * ) pxSet->pucByte );
 
@@ -877,7 +883,7 @@
                 /* Cast the response to DNSAnswerRecord for easy access to fields of the DNS response. */
 
                 /* MISRA Ref 11.3.1 [Misaligned access] */
-/* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */
+                /* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-113 */
                 /* coverity[misra_c_2012_rule_11_3_violation] */
                 pxDNSAnswerRecord = ( ( DNSAnswerRecord_t * ) pxSet->pucByte );
 

source/include/FreeRTOS_DNS_Globals.h

@@ -189,7 +189,11 @@
             uint16_t usClass;              /**< Only the value 'dnsCLASS_IN' is recognised, which stands for "Internet". */
             char * pcRequestedName;        /**< A pointer to the full name of the host being looked up. */
         #endif
-        #if ( ipconfigUSE_DNS_CACHE == 1 ) || ( ipconfigDNS_USE_CALLBACKS == 1 ) || ( ipconfigUSE_MDNS == 1 )
+
+        #if ( ipconfigIS_ENABLED( ipconfigUSE_DNS_CACHE ) ||     \
+              ipconfigIS_ENABLED( ipconfigDNS_USE_CALLBACKS ) || \
+              ipconfigIS_ENABLED( ipconfigUSE_MDNS ) ||          \
+              ipconfigIS_ENABLED( ipconfigUSE_LLMNR ) )
             BaseType_t xDoStore;                          /**< Becomes true when a DNS reply was requested by this device,
                                                            *   i.e. it has a matching request ID. */
             char pcName[ ipconfigDNS_CACHE_NAME_LENGTH ]; /**< A copy of the name that is mentioned in the questions. */