Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
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/.cSpellWords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,7 @@ NCARR
NCFGR
NCONFIG
NCPDT
neighbours
Netif
Nett
netto
Expand Down Expand Up @@ -1360,6 +1361,7 @@ THALT
THRES
tiarmclang
TIDM
TLLA
tmout
TMXBFR
totalappdescnbr
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
uses: FreeRTOS/CI-CD-Github-Actions/formatting@main
with:
path: ./
exclude-dirs: source/portable/NetworkInterface/STM32
exclude-dirs: source/portable/NetworkInterface/STM32, test/integration-test/ndp

doxygen:
runs-on: ubuntu-latest
Expand Down
10 changes: 5 additions & 5 deletions source/FreeRTOS_IP.c
Original file line number Diff line number Diff line change
Expand Up @@ -1823,17 +1823,18 @@ static void prvProcessEthernetPacket( NetworkBufferDescriptor_t * const pxNetwor
#if ipconfigIS_ENABLED( ipconfigUSE_IPv6 )
if( pxNDWaitingNetworkBuffer == NULL )
{
/* Nothing to copy out: the ND code reads the source address
* back out of the packet itself. */
pxNDWaitingNetworkBuffer = pxNetworkBuffer;
vIPTimerStartNDResolution( ipND_RESOLUTION_MAX_DELAY );

iptraceDELAYED_ND_REQUEST_STARTED();
}
else
#endif /* if ipconfigIS_ENABLED( ipconfigUSE_IPv6 ) */
{
/* We are already waiting on one resolution. This frame will be dropped. */
vReleaseNetworkBufferAndDescriptor( pxNetworkBuffer );

FreeRTOS_debug_printf( ( "NDBuffer: = full/release\n" ) );
iptraceDELAYED_ND_BUFFER_FULL();
}

Expand Down Expand Up @@ -2131,7 +2132,8 @@ static eFrameProcessingResult_t prvProcessIPPacket( const IPPacket_t * pxIPPacke
{
#if ( ipconfigUSE_IPv6 != 0 )
case ipIPv6_FRAME_TYPE:
vNDRefreshCacheEntry( &( pxIPPacket->xEthernetHeader.xSourceAddress ), &( pxIPHeader_IPv6->xSourceAddress ), pxNetworkBuffer->pxEndPoint );
vNDRefreshCacheEntryAge( &( pxIPPacket->xEthernetHeader.xSourceAddress ),
&( pxIPHeader_IPv6->xSourceAddress ) );
break;
#endif /* ( ipconfigUSE_IPv6 != 0 ) */

Expand Down Expand Up @@ -2163,9 +2165,7 @@ static eFrameProcessingResult_t prvProcessIPPacket( const IPPacket_t * pxIPPacke
* went wrong because it will not be able to validate what it
* receives. */
#if ( ipconfigREPLY_TO_INCOMING_PINGS == 1 ) || ( ipconfigSUPPORT_OUTGOING_PINGS == 1 )
{
eReturn = ProcessICMPPacket( pxNetworkBuffer );
}
#endif /* ( ipconfigREPLY_TO_INCOMING_PINGS == 1 ) || ( ipconfigSUPPORT_OUTGOING_PINGS == 1 ) */
break;
#endif /* ( ipconfigUSE_IPv4 != 0 ) */
Expand Down
5 changes: 4 additions & 1 deletion source/FreeRTOS_IP_Timers.c
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,10 @@ static BaseType_t prvIPTimerCheck( IPTimer_t * pxTimer )
void vIPSetDHCP_RATimerEnableState( NetworkEndPoint_t * pxEndPoint,
BaseType_t xEnableState )
{
FreeRTOS_printf( ( "vIPSetDHCP_RATimerEnableState: %s\n", ( xEnableState != 0 ) ? "On" : "Off" ) );
if( ( pxEndPoint->xDHCP_RATimer.bActive != 0 ) != ( xEnableState != 0 ) )
{
FreeRTOS_printf( ( "vIPSetDHCP_RATimerEnableState: %s\n", ( xEnableState != 0 ) ? "On" : "Off" ) );
Comment thread
AniruddhaKanhere marked this conversation as resolved.
Resolved
}

/* 'xDHCP_RATimer' is shared between DHCP (IPv4) and RA/SLAAC (IPv6). */
if( xEnableState != 0 )
Expand Down
Loading
Loading