Skip to content

IPv6/multi : Before sending a challenge, check the sequence number #246

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 5 commits into from
May 12, 2021
Merged

IPv6/multi : Before sending a challenge, check the sequence number #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6971c5
IPv6/multi : Before sending a challenge, check the sequence number mo…
May 8, 2021
9334bb9
Make 2 sequence compare functions public in TCP_WIN.
May 8, 2021
c64eab5
Changes to lexicon.txt
May 9, 2021
3d24eed
Merge branch 'labs/ipv6_multi' into ipv6_multi_checks_for_challenge_ack
gkwicker May 11, 2021
9c293b5
Merge branch 'labs/ipv6_multi' into ipv6_multi_checks_for_challenge_ack
AniruddhaKanhere May 12, 2021
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
2 changes: 2 additions & 0 deletions .github/lexicon.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ gmacsa
gpio
gpl
gratuitous
greaterthan
grr
gswutr
gw
Expand Down Expand Up @@ -457,6 +458,7 @@ ldistance
leds
len
lendofframe
lessthan
letbase
linkcurr
linklayer
Expand Down
6 changes: 3 additions & 3 deletions FreeRTOS_TCP_IP.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3967,9 +3967,9 @@
vTCPStateChange( pxSocket, eCLOSED );
}
/* Otherwise, check whether the packet is within the receive window. */
else if( ( ulSequenceNumber > pxSocket->u.xTCP.xTCPWindow.rx.ulCurrentSequenceNumber ) &&
( ulSequenceNumber < ( pxSocket->u.xTCP.xTCPWindow.rx.ulCurrentSequenceNumber +
pxSocket->u.xTCP.xTCPWindow.xSize.ulRxWindowLength ) ) )
else if( ( xSequenceGreaterThan( ulSequenceNumber, pxSocket->u.xTCP.xTCPWindow.rx.ulCurrentSequenceNumber ) != pdFALSE ) &&
( xSequenceLessThan( ulSequenceNumber, pxSocket->u.xTCP.xTCPWindow.rx.ulCurrentSequenceNumber +
pxSocket->u.xTCP.xTCPWindow.xSize.ulRxWindowLength ) != pdFALSE ) )
{
/* Send a challenge ACK. */
( void ) prvTCPSendChallengeAck( pxNetworkBuffer );
Expand Down
54 changes: 22 additions & 32 deletions FreeRTOS_TCP_WIN.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,6 @@
#endif /* ipconfigUSE_TCP_WIN */
/*-----------------------------------------------------------*/

#if ( ipconfigUSE_TCP_WIN == 1 )
static portINLINE BaseType_t xSequenceLessThan( uint32_t a,
uint32_t b );

/**
* @brief Check if a < b.
*
Expand All @@ -272,26 +268,21 @@
*
* @return pdTRUE when "( b - ( a + 1 ) ) < 0x80000000", else pdFALSE.
*/
static portINLINE BaseType_t xSequenceLessThan( uint32_t a,
uint32_t b )
{
BaseType_t xResult = pdFALSE;

/* Test if a < b */
if( ( ( b - ( a + 1U ) ) & 0x80000000U ) == 0U )
{
xResult = pdTRUE;
}
BaseType_t xSequenceLessThan( uint32_t a,
uint32_t b )
{
BaseType_t xResult = pdFALSE;

return xResult;
/* Test if a < b */
if( ( ( b - ( a + 1U ) ) & 0x80000000U ) == 0U )
{
xResult = pdTRUE;
}

#endif /* ipconfigUSE_TCP_WIN */
/*-----------------------------------------------------------*/
return xResult;
}

#if ( ipconfigUSE_TCP_WIN == 1 )
static portINLINE BaseType_t xSequenceGreaterThan( uint32_t a,
uint32_t b );
/*-----------------------------------------------------------*/

/**
* @brief Check if a > b.
Expand All @@ -301,21 +292,20 @@
*
* @return pdTRUE when "( a - b ) < 0x80000000", else pdFALSE.
*/
static portINLINE BaseType_t xSequenceGreaterThan( uint32_t a,
uint32_t b )
{
BaseType_t xResult = pdFALSE;

/* Test if a > b */
if( ( ( a - ( b + 1U ) ) & 0x80000000U ) == 0U )
{
xResult = pdTRUE;
}
BaseType_t xSequenceGreaterThan( uint32_t a,
uint32_t b )
{
BaseType_t xResult = pdFALSE;

return xResult;
/* Test if a > b */
if( ( ( a - ( b + 1U ) ) & 0x80000000U ) == 0U )
{
xResult = pdTRUE;
}

#endif /* ipconfigUSE_TCP_WIN */
return xResult;
}


/*-----------------------------------------------------------*/
static portINLINE BaseType_t xSequenceGreaterThanOrEqual( uint32_t a,
Expand Down
25 changes: 25 additions & 0 deletions include/FreeRTOS_TCP_WIN.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,31 @@
uint32_t ulFirst,
uint32_t ulLast );

/**
* @brief Check if a > b, where a and b are rolling counters.
*
* @param[in] a: The value on the left-hand side.
* @param[in] b: The value on the right-hand side.
*
* @return pdTRUE if a > b, otherwise pdFALSE.
*
* @note GreaterThan is calculated as "( a - ( b + 1U ) ) < 0x80000000".
*/
BaseType_t xSequenceGreaterThan( uint32_t a,
uint32_t b );

/**
* @brief Check if a < b, where a and b are rolling counters.
*
* @param[in] a: The value on the left-hand side.
* @param[in] b: The value on the right-hand side.
*
* @return pdTRUE if a < b, otherwise pdFALSE.
*
* @note LessThan is implemented as "( b - ( a + 1 ) ) < 0x80000000".
*/
BaseType_t xSequenceLessThan( uint32_t a,
uint32_t b );

#ifdef __cplusplus
} /* extern "C" */
Expand Down