From 8133702da8a38dcd78dae21a2b23e2b9a3f716fd Mon Sep 17 00:00:00 2001 From: microcris <31326314+microcris@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:00:47 +0000 Subject: [PATCH 1/2] Update FreeRTOS_debug_printf in ipARP_REPLY (#1048) Replace ipconfigHAS_PRINTF by FreeRTOS_debug_printf in the ipARP_REPLY debug print --- source/FreeRTOS_ARP.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/FreeRTOS_ARP.c b/source/FreeRTOS_ARP.c index cc24dbfb7..5a84cd60b 100644 --- a/source/FreeRTOS_ARP.c +++ b/source/FreeRTOS_ARP.c @@ -259,13 +259,13 @@ static TickType_t xLastGratuitousARPTime = 0U; traceARP_PACKET_RECEIVED(); /* Some extra logging while still testing. */ - #if ( ipconfigHAS_PRINTF != 0 ) + #if ( ipconfigHAS_DEBUG_PRINTF != 0 ) if( pxARPHeader->usOperation == ( uint16_t ) ipARP_REPLY ) { - FreeRTOS_printf( ( "ipARP_REPLY from %xip to %xip end-point %xip\n", - ( unsigned ) FreeRTOS_ntohl( ulSenderProtocolAddress ), - ( unsigned ) FreeRTOS_ntohl( ulTargetProtocolAddress ), - ( unsigned ) FreeRTOS_ntohl( ( pxTargetEndPoint != NULL ) ? pxTargetEndPoint->ipv4_settings.ulIPAddress : 0U ) ) ); + FreeRTOS_debug_printf( ( "ipARP_REPLY from %xip to %xip end-point %xip\n", + ( unsigned ) FreeRTOS_ntohl( ulSenderProtocolAddress ), + ( unsigned ) FreeRTOS_ntohl( ulTargetProtocolAddress ), + ( unsigned ) FreeRTOS_ntohl( ( pxTargetEndPoint != NULL ) ? pxTargetEndPoint->ipv4_settings.ulIPAddress : 0U ) ) ); } #endif /* ( ipconfigHAS_DEBUG_PRINTF != 0 ) */ From d70a21ce03569118e030b348844477b92f5fd227 Mon Sep 17 00:00:00 2001 From: Monika Singh Date: Mon, 4 Dec 2023 11:00:20 +0530 Subject: [PATCH 2/2] Fix UT coverage to 100% (#1053) * Update to 100% coverage * Fix UT coverage --- .github/workflows/ci.yml | 2 ++ .../FreeRTOS_Sockets_TCP_API_utest.c | 4 +++ .../FreeRTOS_Sockets_privates_utest.c | 26 ++++++++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c21195c62..9d21a66b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,6 +71,8 @@ jobs: uses: FreeRTOS/CI-CD-Github-Actions/coverage-cop@main with: coverage-file: ./test/unit-test/build/coverage.info + branch-coverage-min: 100 + line-coverage-min: 100 spell-check: runs-on: ubuntu-latest diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c index f242720d8..8a562c408 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_TCP_API_utest.c @@ -1863,6 +1863,10 @@ void test_FreeRTOS_get_tx_base_InvalidParams( void ) xSocket.ucProtocol = FREERTOS_IPPROTO_TCP; pucReturn = FreeRTOS_get_tx_base( &xSocket ); TEST_ASSERT_EQUAL( NULL, pucReturn ); + + xSocket.u.xTCP.bits.bMallocError == pdTRUE_UNSIGNED; + pucReturn = FreeRTOS_get_tx_base( &xSocket ); + TEST_ASSERT_EQUAL( NULL, pucReturn ); } /** diff --git a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c index 53ef4625a..8c7304893 100644 --- a/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c +++ b/test/unit-test/FreeRTOS_Sockets/FreeRTOS_Sockets_privates_utest.c @@ -591,7 +591,7 @@ void test_vSocketBind_TCP( void ) /** * @brief Address passed is NULL. */ -void test_vSocketBind_TCPNULLAddress( void ) +void test_vSocketBind_TCPNULLAddress_v4( void ) { BaseType_t xReturn; FreeRTOS_Socket_t xSocket; @@ -603,6 +603,30 @@ void test_vSocketBind_TCPNULLAddress( void ) memset( &xSocket, 0, sizeof( xSocket ) ); xSocket.ucProtocol = ( uint8_t ) FREERTOS_IPPROTO_TCP; + xSocket.bits.bIsIPv6 = 0; + + xApplicationGetRandomNumber_ExpectAnyArgsAndReturn( pdFALSE ); + xReturn = vSocketBind( &xSocket, NULL, uxAddressLength, xInternal ); + + TEST_ASSERT_EQUAL( -pdFREERTOS_ERRNO_EADDRNOTAVAIL, xReturn ); +} + +/** + * @brief Address passed is NULL. + */ +void test_vSocketBind_TCPNULLAddress_v6( void ) +{ + BaseType_t xReturn; + FreeRTOS_Socket_t xSocket; + struct freertos_sockaddr xBindAddress; + size_t uxAddressLength; + BaseType_t xInternal = pdFALSE; + + memset( &xBindAddress, 0xFC, sizeof( xBindAddress ) ); + memset( &xSocket, 0, sizeof( xSocket ) ); + + xSocket.ucProtocol = ( uint8_t ) FREERTOS_IPPROTO_TCP; + xSocket.bits.bIsIPv6 = 1; xApplicationGetRandomNumber_ExpectAnyArgsAndReturn( pdFALSE ); xReturn = vSocketBind( &xSocket, NULL, uxAddressLength, xInternal );