Skip to content

Commit a4eab8d

Browse files
tony-josi-awstony-josi-aws
committed
Fix CI check
1 parent 6011fb4 commit a4eab8d

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎source/FreeRTOS_IPv4.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,9 @@ enum eFrameProcessingResult prvAllowIPPacketIPv4( const struct xIP_PACKET * cons
390390
/* Source is a multicast IP address. Drop the packet in conformity with RFC 1112 section 7.2. */
391391
eReturn = eReleaseBuffer;
392392
}
393-
/* Use ipv4_settings for filtering only after the endpoint is up,
394-
* so that DHCP packets that are echanged for DHCP (example, DHCP unicast offers)
393+
394+
/* Use ipv4_settings for filtering only after the endpoint is up,
395+
* so that DHCP packets that are exchanged for DHCP (example, DHCP unicast offers)
395396
* are not dropped/filtered. */
396397
else if( FreeRTOS_IsEndPointUp( pxEndPoint ) != pdFALSE )
397398
{
@@ -442,8 +443,8 @@ enum eFrameProcessingResult prvAllowIPPacketIPv4( const struct xIP_PACKET * cons
442443
* clients that cannot accept hardware unicast datagrams before the
443444
* TCP/IP software is configured. */
444445
if( ( memcmp( pxEndPoint->xMACAddress.ucBytes,
445-
pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes,
446-
sizeof( MACAddress_t ) ) != 0 ) )
446+
pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes,
447+
sizeof( MACAddress_t ) ) != 0 ) )
447448
{
448449
/* The endpoint is not up, and the destination MAC address of the
449450
* packet is not matching the endpoint's MAC address. Drop the
@@ -456,7 +457,6 @@ enum eFrameProcessingResult prvAllowIPPacketIPv4( const struct xIP_PACKET * cons
456457
* packet as per RFC 2131 */
457458
}
458459
}
459-
460460
}
461461
#endif /* ipconfigETHERNET_DRIVER_FILTERS_PACKETS */
462462

‎test/unit-test/FreeRTOS_IPv4/FreeRTOS_IPv4_utest.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ void test_prvAllowIPPacketIPv4_NotMatchingIP( void )
397397
pxIPHeader->ucVersionHeaderLength = 0x45;
398398
pxIPHeader->ulDestinationIPAddress = pxEndpoint->ipv4_settings.ulIPAddress + 1;
399399

400-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
400+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
401401

402402
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
403403

@@ -435,7 +435,7 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_DestIPMatch( void )
435435

436436
pxIPHeader->ulSourceIPAddress = 0xFFFFFFFF;
437437

438-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
438+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
439439

440440
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
441441

@@ -474,7 +474,7 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_DestIPBrdCast( void )
474474

475475
pxIPHeader->ulSourceIPAddress = 0xFFFFFFFF;
476476

477-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
477+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
478478

479479
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
480480

@@ -513,7 +513,7 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_DestIPLLMNR( void )
513513

514514
pxIPHeader->ulSourceIPAddress = 0xFFFFFFFF;
515515

516-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
516+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
517517

518518
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
519519

@@ -548,7 +548,7 @@ void test_prvAllowIPPacketIPv4_SourceIPBrdCast_NoLocalIP( void )
548548
pxIPHeader->ulDestinationIPAddress = 0;
549549

550550
pxIPHeader->ulSourceIPAddress = 0xFFFFFFFF;
551-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
551+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
552552

553553
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
554554

@@ -585,7 +585,7 @@ void test_prvAllowIPPacketIPv4_DestMACBrdCast_DestIPUnicast( void )
585585

586586
memcpy( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, xBroadcastMACAddress.ucBytes, sizeof( MACAddress_t ) );
587587

588-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
588+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
589589

590590
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
591591

@@ -622,7 +622,7 @@ void test_prvAllowIPPacketIPv4_EndpointDown_HappyPath( void )
622622

623623
memcpy( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, xEndpoint.xMACAddress.ucBytes, sizeof( MACAddress_t ) );
624624

625-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdFALSE);
625+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdFALSE );
626626
FreeRTOS_FindEndPointOnMAC_ExpectAnyArgsAndReturn( NULL );
627627

628628
usGenerateChecksum_ExpectAndReturn( 0U, ( uint8_t * ) &( pxIPHeader->ucVersionHeaderLength ), ( size_t ) uxHeaderLength, ipCORRECT_CRC );
@@ -665,7 +665,7 @@ void test_prvAllowIPPacketIPv4_EndpointDown_UnHappyPath( void )
665665
memset( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, 0xAB, sizeof( MACAddress_t ) );
666666
memset( xEndpoint.xMACAddress.ucBytes, 0xCD, sizeof( MACAddress_t ) );
667667

668-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdFALSE);
668+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdFALSE );
669669

670670
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
671671

@@ -702,7 +702,7 @@ void test_prvAllowIPPacketIPv4_DestMACBrdCast_DestIPBroadcastAndIncorrectChkSum(
702702
xEndpoint.ipv4_settings.ulBroadcastAddress = 0xABCDFFFF;
703703

704704
memcpy( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, xBroadcastMACAddress.ucBytes, sizeof( MACAddress_t ) );
705-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
705+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
706706

707707
FreeRTOS_FindEndPointOnMAC_ExpectAnyArgsAndReturn( NULL );
708708

@@ -859,7 +859,7 @@ void test_prvAllowIPPacketIPv4_IncorrectChecksum( void )
859859

860860
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
861861

862-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
862+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
863863
FreeRTOS_FindEndPointOnMAC_ExpectAnyArgsAndReturn( NULL );
864864

865865
usGenerateChecksum_ExpectAndReturn( 0U, ( uint8_t * ) &( pxIPHeader->ucVersionHeaderLength ), ( size_t ) uxHeaderLength, ipCORRECT_CRC - 1 );
@@ -903,7 +903,7 @@ void test_prvAllowIPPacketIPv4_IncorrectProtocolChecksum( void )
903903

904904
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
905905

906-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
906+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
907907
FreeRTOS_FindEndPointOnMAC_ExpectAnyArgsAndReturn( NULL );
908908

909909
usGenerateChecksum_ExpectAndReturn( 0U, ( uint8_t * ) &( pxIPHeader->ucVersionHeaderLength ), ( size_t ) uxHeaderLength, ipCORRECT_CRC );
@@ -948,7 +948,7 @@ void test_prvAllowIPPacketIPv4_HappyPath( void )
948948

949949
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
950950

951-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
951+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
952952
FreeRTOS_FindEndPointOnMAC_ExpectAnyArgsAndReturn( NULL );
953953

954954
usGenerateChecksum_ExpectAndReturn( 0U, ( uint8_t * ) &( pxIPHeader->ucVersionHeaderLength ), ( size_t ) uxHeaderLength, ipCORRECT_CRC );
@@ -1031,7 +1031,7 @@ void test_prvAllowIPPacketIPv4_DestMacBroadcastIPNotBroadcast( void )
10311031
memcpy( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, xBroadcastMACAddress.ucBytes, sizeof( MACAddress_t ) );
10321032

10331033
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
1034-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
1034+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
10351035

10361036
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
10371037

@@ -1199,7 +1199,7 @@ void test_xBadIPv4Loopback_0_test( void )
11991199

12001200
memcpy( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, xMACAddress.ucBytes, sizeof( MACAddress_t ) );
12011201

1202-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
1202+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
12031203

12041204
FreeRTOS_FindEndPointOnMAC_ExpectAnyArgsAndReturn( NULL );
12051205

‎test/unit-test/FreeRTOS_IPv4_DiffConfig/FreeRTOS_IPv4_DiffConfig_utest.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void test_prvAllowIPPacketIPv4_BroadcastSourceIP( void )
106106
memcpy( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, xBroadcastMACAddress.ucBytes, sizeof( MACAddress_t ) );
107107

108108
pxIPHeader->ulSourceIPAddress = 0xFFFFFFFF;
109-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
109+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
110110
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
111111

112112
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -147,7 +147,7 @@ void test_prvAllowIPPacketIPv4_BufferLengthLessThanMinimum( void )
147147

148148
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
149149

150-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
150+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
151151
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
152152

153153
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -192,7 +192,7 @@ void test_prvAllowIPPacketIPv4_UDPCheckSumZero( void )
192192

193193
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
194194

195-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
195+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
196196
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
197197

198198
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
@@ -243,7 +243,7 @@ void test_prvAllowIPPacketIPv4_UDP_HappyPath( void )
243243
/* Non-zero checksum. */
244244
pxProtPack->xUDPPacket.xUDPHeader.usChecksum = 0xFF12;
245245

246-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
246+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
247247
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
248248

249249
TEST_ASSERT_EQUAL( eProcessBuffer, eResult );
@@ -287,7 +287,7 @@ void test_prvAllowIPPacketIPv4_TCP_HappyPath( void )
287287
memcpy( pxIPPacket->xEthernetHeader.xDestinationAddress.ucBytes, xBroadcastMACAddress.ucBytes, sizeof( MACAddress_t ) );
288288

289289
pxIPHeader->ulSourceIPAddress = 0xC0C00101;
290-
FreeRTOS_IsEndPointUp_ExpectAndReturn(&xEndpoint, pdTRUE);
290+
FreeRTOS_IsEndPointUp_ExpectAndReturn( &xEndpoint, pdTRUE );
291291

292292
eResult = prvAllowIPPacketIPv4( pxIPPacket, pxNetworkBuffer, uxHeaderLength );
293293

0 commit comments

Comments
 (0)