Skip to content

Commit 297cce5

Browse files
authored
Replace 'xMDNS_MACAddressIPv6' with 'xMDNS_MacAddressIPv6' to increase uniformity (FreeRTOS#1169)
1 parent 3979677 commit 297cce5

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

source/FreeRTOS_DNS.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
* The MAC-addresses are provided here in case a network
151151
* interface needs it.
152152
*/
153-
const MACAddress_t xMDNS_MACAddressIPv6 = { { 0x33, 0x33, 0x00, 0x00, 0x00, 0xFB } };
153+
const MACAddress_t xMDNS_MacAddressIPv6 = { { 0x33, 0x33, 0x00, 0x00, 0x00, 0xFB } };
154154
#endif /* ( ipconfigUSE_MDNS == 1 ) && ( ipconfigUSE_IPv6 != 0 ) */
155155

156156

source/include/FreeRTOS_DNS.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,12 @@ uint32_t ulDNSHandlePacket( const NetworkBufferDescriptor_t * pxNetworkBuffer );
7171
extern const IPv6_Address_t ipMDNS_IP_ADDR_IPv6;
7272

7373
/* The MDNS IPv6 MAC address is 33:33:00:01:00:03 */
74-
extern const MACAddress_t xMDNS_MACAddressIPv6;
74+
75+
/* This type-name was formally "misspelled" as
76+
* xMDNS_MACAddressIPv6 with "MAC": */
77+
extern const MACAddress_t xMDNS_MacAddressIPv6;
78+
/* Guarantee backward compatibility. */
79+
#define xMDNS_MACAddressIPv6 xMDNS_MacAddressIPv6
7580
#endif /* ipconfigUSE_MDNS */
7681

7782
/** @brief While doing integration tests, it is necessary to influence the choice

source/portable/NetworkInterface/DriverSAM/NetworkInterface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ static BaseType_t prvGMACInit( NetworkInterface_t * pxInterface )
787787

788788
#if ( ipconfigUSE_MDNS == ipconfigENABLE )
789789
{
790-
prvAddAllowedMACAddress( pxInterface, xMDNS_MACAddressIPv6.ucBytes );
790+
prvAddAllowedMACAddress( pxInterface, xMDNS_MacAddressIPv6.ucBytes );
791791
}
792792
#endif /* ipconfigUSE_MDNS */
793793
}

source/portable/NetworkInterface/STM32Fxx/NetworkInterface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ BaseType_t xSTM32F_NetworkInterfaceInitialise( NetworkInterface_t * pxInterface
537537
#endif
538538
#if ( ( ipconfigUSE_MDNS == 1 ) && ( ipconfigUSE_IPv6 != 0 ) )
539539
{
540-
prvMACAddressConfig( &xETH, xMACEntry, ( uint8_t * ) xMDNS_MACAddressIPv6.ucBytes );
540+
prvMACAddressConfig( &xETH, xMACEntry, ( uint8_t * ) xMDNS_MacAddressIPv6.ucBytes );
541541
xMACEntry += 8;
542542
}
543543
#endif

source/portable/NetworkInterface/Zynq/NetworkInterface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ static BaseType_t xZynqNetworkInterfaceInitialise( NetworkInterface_t * pxInterf
288288

289289
#if ( ( ipconfigUSE_MDNS == 1 ) && ( ipconfigUSE_IPv6 != 0 ) )
290290
XEmacPs_SetHash( pxEMAC_PS, ( void * ) xMDNS_MacAddress.ucBytes );
291-
XEmacPs_SetHash( pxEMAC_PS, ( void * ) xMDNS_MACAddressIPv6.ucBytes );
291+
XEmacPs_SetHash( pxEMAC_PS, ( void * ) xMDNS_MacAddressIPv6.ucBytes );
292292
#endif
293293

294294
pxEndPoint = FreeRTOS_NextEndPoint( pxInterface, pxEndPoint );

0 commit comments

Comments
 (0)