Skip to content

[IPv6] Allow buffer length to be greater than IP packet in IPv6. #927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 22, 2023
Merged

[IPv6] Allow buffer length to be greater than IP packet in IPv6. #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9157429
Allow buffer data^Cength to be more than IP packets
ActoryOu Jun 16, 2023
8301462
Fix UT
ActoryOu Jun 16, 2023
0227250
Use MACRO instead to represent payload length
ActoryOu Jun 21, 2023
57666ba
Merge branch 'dev/IPv6_integration' into AllowMoreLength
tony-josi-aws Jun 21, 2023
bd6c793
Merge branch 'dev/IPv6_integration' into AllowMoreLength
tony-josi-aws Jun 22, 2023
69ff753
Merge branch 'dev/IPv6_integration' into AllowMoreLength
tony-josi-aws Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion source/FreeRTOS_IPv6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ const struct xIPv6_Address FreeRTOS_in6addr_loopback = { { 0, 0, 0, 0, 0, 0, 0,
/* Check if the complete IPv6-header plus protocol data have been transferred: */
usPayloadLength = FreeRTOS_ntohs( pxIPv6Packet->xIPHeader.usPayloadLength );

if( uxBufferLength != ( size_t ) ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + ( size_t ) usPayloadLength ) )
/* Since network interface might put some data in the network buffer,
* we allow buffer length to be greater than necessary. */
if( uxBufferLength < ( size_t ) ( ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + ( size_t ) usPayloadLength ) )
{
DEBUG_SET_TRACE_VARIABLE( xLocation, 4 );
break;
Expand Down
9 changes: 6 additions & 3 deletions ...t/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOS_IPv6_ConfigDriverCheckChecksum_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ const IPv6_Address_t xIPAddressTen = { 0x20, 0x01, 0x12, 0x34, 0x56, 0x78, 0x00,
/* MAC Address for endpoint. */
const uint8_t ucMACAddress[ ipMAC_ADDRESS_LENGTH_BYTES ] = { 0xab, 0xcd, 0xef, 0x11, 0x22, 0x33 };

/* Default payload length in this test. */
#define TEST_DEFAULT_PROTOCOL_PAYLOAD_LENGTH ( 8U )

/* ======================== Stub Callback Functions ========================= */

NetworkEndPoint_t * prvInitializeEndpoint()
Expand All @@ -74,14 +77,14 @@ NetworkEndPoint_t * prvInitializeEndpoint()
NetworkBufferDescriptor_t * prvInitializeNetworkDescriptor()
{
static NetworkBufferDescriptor_t xNetworkBuffer;
static uint8_t pcNetworkBuffer[ sizeof( TCPPacket_IPv6_t ) + 8U ];
static uint8_t pcNetworkBuffer[ sizeof( TCPPacket_IPv6_t ) + TEST_DEFAULT_PROTOCOL_PAYLOAD_LENGTH ];
TCPPacket_IPv6_t * pxTCPPacket = ( TCPPacket_IPv6_t * ) pcNetworkBuffer;

/* Initialize network buffer descriptor. */
memset( &xNetworkBuffer, 0, sizeof( xNetworkBuffer ) );
xNetworkBuffer.pxEndPoint = prvInitializeEndpoint();
xNetworkBuffer.pucEthernetBuffer = ( uint8_t * ) pxTCPPacket;
xNetworkBuffer.xDataLength = sizeof( TCPPacket_IPv6_t ) + 8U;
xNetworkBuffer.xDataLength = sizeof( TCPPacket_IPv6_t ) + TEST_DEFAULT_PROTOCOL_PAYLOAD_LENGTH;

/* Initialize network buffer. */
memset( pcNetworkBuffer, 0, sizeof( pcNetworkBuffer ) );
Expand All @@ -93,7 +96,7 @@ NetworkBufferDescriptor_t * prvInitializeNetworkDescriptor()
memcpy( pxTCPPacket->xIPHeader.xSourceAddress.ucBytes, xIPAddressTen.ucBytes, sizeof( IPv6_Address_t ) );
memcpy( pxTCPPacket->xIPHeader.xDestinationAddress.ucBytes, xIPAddressFive.ucBytes, sizeof( IPv6_Address_t ) );
pxTCPPacket->xIPHeader.ucVersionTrafficClass |= 6U << 4;
pxTCPPacket->xIPHeader.usPayloadLength = FreeRTOS_htons( sizeof( TCPHeader_t ) + 8U );
pxTCPPacket->xIPHeader.usPayloadLength = FreeRTOS_htons( sizeof( TCPHeader_t ) + TEST_DEFAULT_PROTOCOL_PAYLOAD_LENGTH );
pxTCPPacket->xIPHeader.ucNextHeader = ipPROTOCOL_TCP;

return &xNetworkBuffer;
Expand Down
4 changes: 2 additions & 2 deletions ...t/FreeRTOS_IPv6_ConfigDriverCheckChecksum/FreeRTOS_IPv6_ConfigDriverCheckChecksum_utest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ void test_prvAllowIPPacketIPv6_xCheckIPv6SizeFields_wrong_ip_length()
NetworkBufferDescriptor_t * pxNetworkBuffer = prvInitializeNetworkDescriptor();
IPPacket_IPv6_t * pxIPPacket = ( IPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer;

/* Modify the length in IP header */
pxIPPacket->xIPHeader.usPayloadLength = FreeRTOS_htons( sizeof( TCPHeader_t ) );
/* Modify the length in IP header to be greater than data length. */
pxIPPacket->xIPHeader.usPayloadLength = FreeRTOS_htons( sizeof( TCPHeader_t ) + TEST_DEFAULT_PROTOCOL_PAYLOAD_LENGTH + 1U );

eResult = prvAllowIPPacketIPv6( &pxIPPacket->xIPHeader, pxNetworkBuffer, 0U );
TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
Expand Down