Skip to content

Create IPv6 socket for DHCPv6 flow #987

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 2 commits into from
Aug 4, 2023
Merged

Create IPv6 socket for DHCPv6 flow #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7d6540
Create IPv6 socket for DHCPv6 flow
ActoryOu Aug 4, 2023
25657e5
Merge branch 'main' into DHCPv6Only
ActoryOu Aug 4, 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
2 changes: 1 addition & 1 deletion source/FreeRTOS_DHCPv6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ static void prvCreateDHCPv6Socket( NetworkEndPoint_t * pxEndPoint )
}
else if( xDHCPv6Socket == NULL ) /* Create the socket, if it has not already been created. */
{
xDHCPv6Socket = FreeRTOS_socket( FREERTOS_AF_INET, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP );
xDHCPv6Socket = FreeRTOS_socket( FREERTOS_AF_INET6, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP );
configASSERT( xSocketValid( xDHCPv6Socket ) == pdTRUE );

/* Ensure the Rx and Tx timeouts are zero as the DHCP executes in the
Expand Down
12 changes: 6 additions & 6 deletions test/unit-test/FreeRTOS_DHCPv6/FreeRTOS_DHCPv6_utest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,7 +1377,7 @@ void test_vDHCPv6Process_ResetFromInit()
xEndPoint.xDHCPData.eDHCPState = eInitialWait;
xEndPoint.xDHCPData.eExpectedState = eInitialWait;

FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket );
FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET6, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket );
xSocketValid_ExpectAndReturn( &xLocalDHCPv6Socket, pdTRUE );
prvSetCheckerAndReturn_FreeRTOS_setsockopt( &xLocalDHCPv6Socket, sizeof( TickType_t ) );
FreeRTOS_setsockopt_Stub( xStubFreeRTOS_setsockopt );
Expand Down Expand Up @@ -1413,7 +1413,7 @@ void test_vDHCPv6Process_ResetFromLease()
memcpy( xEndPoint.ipv6_settings.xIPAddress.ucBytes, xIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS );
xEndPoint.pxDHCPMessage = &xDHCPMessage;

FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket );
FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET6, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket );
xSocketValid_ExpectAndReturn( &xLocalDHCPv6Socket, pdTRUE );
prvSetCheckerAndReturn_FreeRTOS_setsockopt( &xLocalDHCPv6Socket, sizeof( TickType_t ) );
FreeRTOS_setsockopt_Stub( xStubFreeRTOS_setsockopt );
Expand Down Expand Up @@ -1449,7 +1449,7 @@ void test_vDHCPv6Process_ResetDifferentState()
memcpy( xEndPoint.ipv6_settings.xIPAddress.ucBytes, xIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS );
xEndPoint.pxDHCPMessage = &xDHCPMessage;

FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket );
FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET6, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket );
xSocketValid_ExpectAndReturn( &xLocalDHCPv6Socket, pdTRUE );
prvSetCheckerAndReturn_FreeRTOS_setsockopt( &xLocalDHCPv6Socket, sizeof( TickType_t ) );
FreeRTOS_setsockopt_Stub( xStubFreeRTOS_setsockopt );
Expand Down Expand Up @@ -3207,7 +3207,7 @@ void test_vDHCPv6Process_prvCloseDHCPv6Socket_MultipleEndpointsCloseSockets()

pxNetworkEndPoints = &xEndPoint[ 0 ];

FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket[ 0 ] );
FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET6, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket[ 0 ] );
xSocketValid_ExpectAndReturn( &xLocalDHCPv6Socket[ 0 ], pdTRUE );
prvSetCheckerAndReturn_FreeRTOS_setsockopt( &xLocalDHCPv6Socket[ 0 ], sizeof( TickType_t ) );
FreeRTOS_setsockopt_Stub( xStubFreeRTOS_setsockopt );
Expand Down Expand Up @@ -3320,7 +3320,7 @@ void test_vDHCPv6Process_prvCreateDHCPv6Socket_CreateSocketFail()

pxNetworkEndPoints = &xEndPoint;

FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket );
FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET6, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket );
xSocketValid_ExpectAndReturn( &xLocalDHCPv6Socket, pdFALSE );

catch_assert( vDHCPv6Process( pdTRUE, &xEndPoint ) );
Expand Down Expand Up @@ -3353,7 +3353,7 @@ void test_vDHCPv6Process_prvCreateDHCPv6Socket_BindSocketFail()

pxNetworkEndPoints = &xEndPoint;

FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket );
FreeRTOS_socket_ExpectAndReturn( FREERTOS_AF_INET6, FREERTOS_SOCK_DGRAM, FREERTOS_IPPROTO_UDP, &xLocalDHCPv6Socket );
xSocketValid_ExpectAndReturn( &xLocalDHCPv6Socket, pdTRUE );
prvSetCheckerAndReturn_FreeRTOS_setsockopt( &xLocalDHCPv6Socket, sizeof( TickType_t ) );
FreeRTOS_setsockopt_Stub( xStubFreeRTOS_setsockopt );
Expand Down