Skip to content

Bugfix for Socket lifetime issues #571

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

Closed
wants to merge 4 commits into from
Closed

Bugfix for Socket lifetime issues #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cc911f
Bugfix for Socket lifetime issues and potentially multiple close sock…
phelter Nov 7, 2022
8812792
Fixing spelling issues.
phelter Nov 9, 2022
a30bd2d
Fixing up unit tests now that vSocketClose no longer returns a value.
phelter Nov 9, 2022
5c874b9
Reducing coverage minimums until new unit tests are added to confirm …
phelter Nov 10, 2022
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 @@ -47,6 +47,7 @@ bcloseaftersend
bcloserequested
bconnpassed
bconnprepared
bdestroy
bds
berkeley
besr
Expand Down Expand Up @@ -1594,6 +1595,7 @@ xsize
xsizewithoutdata
xsocket
xsocketbits
xsocketlistitem
xsocketset
xsource
xsourceaddress
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ jobs:
uses: FreeRTOS/CI-CD-Github-Actions/coverage-cop@main
with:
path: ./test/unit-test/build/coverage.info
line-coverage-min: 99.8
branch-coverage-min: 98.7

spell-check:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion source/FreeRTOS_DHCP.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@
{
/* This modules runs from the IP-task. Use the internal
* function 'vSocketClose()` to close the socket. */
( void ) vSocketClose( xDHCPSocket );
vSocketClose( xDHCPSocket, pdTRUE_UNSIGNED );
xDHCPSocket = NULL;
}
}
Expand Down
8 changes: 7 additions & 1 deletion source/FreeRTOS_IP.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
#include "NetworkBufferManagement.h"
#include "FreeRTOS_DNS.h"

#if ( ipconfigUSE_TCP_MEM_STATS != 0 )
#include "tcp_mem_stats.h"
#endif

/* IPv4 multi-cast addresses range from 224.0.0.0.0 to 240.0.0.0. */
#define ipFIRST_MULTI_CAST_IPv4 0xE0000000U /**< Lower bound of the IPv4 multicast address. */
#define ipLAST_MULTI_CAST_IPv4 0xF0000000U /**< Higher bound of the IPv4 multicast address. */
Expand Down Expand Up @@ -357,6 +361,7 @@ static void prvProcessIPEventsAndTimers( void )
* API will unblock as soon as the eSOCKET_BOUND event is
* triggered. */
pxSocket = ( ( FreeRTOS_Socket_t * ) xReceivedEvent.pvData );
socketASSERT_IS_VALID( pxSocket );
xAddress.sin_addr = 0U; /* For the moment. */
xAddress.sin_port = FreeRTOS_ntohs( pxSocket->usLocalPort );
pxSocket->usLocalPort = 0U;
Expand All @@ -375,7 +380,7 @@ static void prvProcessIPEventsAndTimers( void )
* IP-task to actually close a socket. This is handled in
* vSocketClose(). As the socket gets closed, there is no way to
* report back to the API, so the API won't wait for the result */
( void ) vSocketClose( ( ( FreeRTOS_Socket_t * ) xReceivedEvent.pvData ) );
vSocketClose( ( ( FreeRTOS_Socket_t * ) xReceivedEvent.pvData ), pdTRUE_UNSIGNED );
break;

case eStackTxEvent:
Expand Down Expand Up @@ -453,6 +458,7 @@ static void prvProcessIPEventsAndTimers( void )
* received a new connection. */
#if ( ipconfigUSE_TCP == 1 )
pxSocket = ( ( FreeRTOS_Socket_t * ) xReceivedEvent.pvData );
socketASSERT_IS_VALID( pxSocket );

if( xTCPCheckNewClient( pxSocket ) != pdFALSE )
{
Expand Down
Loading