Skip to content

Commit 7f7c4cc

Browse files
author
Emil Popov
committed
Addresses random issues
Removes an unused variable Renames ipBROADCAST_IP_ADDRESS to FREERTOS_INADDR_BROADCAST in the unit tests and the STM32 network driver
1 parent 173a284 commit 7f7c4cc

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

source/FreeRTOS_IPv4.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ BaseType_t xIsIPv4Broadcast( uint32_t ulIPAddress,
224224
struct xNetworkEndPoint ** ppxEndPoint )
225225
{
226226
BaseType_t xIsBroadcast;
227-
uint32_t ulEndPointBroadcast;
228227
NetworkEndPoint_t * pxEndPoint;
229228

230229
/* Assign a default answer based on the "global" broadcast. This way

source/portable/NetworkInterface/STM32/NetworkInterface.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,8 +1178,8 @@ static void prvInitMacAddresses( ETH_HandleTypeDef * pxEthHandle,
11781178
xL3FilterConfig.DestAddrFilterMatch = ETH_L3_DEST_ADDR_PERFECT_MATCH_ENABLE;
11791179
xL3FilterConfig.SrcAddrHigherBitsMatch = 0x1FU;
11801180
xL3FilterConfig.DestAddrHigherBitsMatch = 0x1FU;
1181-
xL3FilterConfig.Ip4SrcAddr = ipBROADCAST_IP_ADDRESS;
1182-
xL3FilterConfig.Ip4DestAddr = ipBROADCAST_IP_ADDRESS;
1181+
xL3FilterConfig.Ip4SrcAddr = FREERTOS_INADDR_BROADCAST ;
1182+
xL3FilterConfig.Ip4DestAddr = FREERTOS_INADDR_BROADCAST;
11831183
( void ) HAL_ETHEx_SetL3FilterConfig( pxEthHandle, ETH_L3_FILTER_0, &xL3FilterConfig );
11841184
#endif /* if ipconfigIS_DISABLED( ipconfigUSE_IPv4 ) */
11851185

test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_utest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2154,7 +2154,7 @@ void test_eARPGetCacheEntry_IPMatchesOtherBroadcastAddr( void )
21542154
struct xNetworkEndPoint * pxEndPoint, xEndPoint;
21552155

21562156
/* =================================================== */
2157-
ulIPAddress = FreeRTOS_ntohl( ipBROADCAST_IP_ADDRESS );
2157+
ulIPAddress = FreeRTOS_ntohl( FREERTOS_INADDR_BROADCAST );
21582158
/* Not worried about what these functions do. */
21592159
FreeRTOS_FindEndPointOnIP_IPv4_ExpectAnyArgsAndReturn( NULL );
21602160
xIsIPv4Loopback_ExpectAndReturn( ulIPAddress, 0UL );

test/unit-test/FreeRTOS_DHCP/FreeRTOS_DHCP_utest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4695,7 +4695,7 @@ void test_vDHCPProcess_eWaitingAcknowledge_IncorrectDNSServerAddress2( void )
46954695
prvWriteDHCPOptionU32( &DHCPOption, dhcpIPv4_SUBNET_MASK_OPTION_CODE, ulSubnetMask );
46964696
prvWriteDHCPOptionU32( &DHCPOption, dhcpIPv4_GATEWAY_OPTION_CODE, ulGateway );
46974697
prvWriteDHCPOptionU32( &DHCPOption, dhcpIPv4_LEASE_TIME_OPTION_CODE, ulLeaseTime );
4698-
prvWriteDHCPOptionU32( &DHCPOption, dhcpIPv4_DNS_SERVER_OPTIONS_CODE, ipBROADCAST_IP_ADDRESS );
4698+
prvWriteDHCPOptionU32( &DHCPOption, dhcpIPv4_DNS_SERVER_OPTIONS_CODE, FREERTOS_INADDR_BROADCAST );
46994699

47004700
*DHCPOption++ = 0xFF;
47014701
TEST_ASSERT_EQUAL( DHCPOption - DHCPMsg, xTotalLength );

test/unit-test/FreeRTOS_DNS/FreeRTOS_DNS_utest.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ void test_FreeRTOS_getaddrinfo_a_IPv4Random_BindFailWithDot( void )
10331033

10341034
xEndPoint[ 2 ].bits.bIPv6 = pdFALSE;
10351035
xEndPoint[ 2 ].ipv4_settings.ucDNSIndex = 0;
1036-
xEndPoint[ 2 ].ipv4_settings.ulDNSServerAddresses[ 0 ] = ipBROADCAST_IP_ADDRESS;
1036+
xEndPoint[ 2 ].ipv4_settings.ulDNSServerAddresses[ 0 ] = FREERTOS_INADDR_BROADCAST;
10371037

10381038
xEndPoint[ 3 ].bits.bIPv6 = pdFALSE;
10391039
xEndPoint[ 3 ].ipv4_settings.ucDNSIndex = 0;

0 commit comments

Comments
 (0)