Merge branch 'main' into zynq_slcr

Author: tony-josi-aws

.github/workflows/ci.yml

@@ -106,9 +106,7 @@ jobs:
           echo "::endgroup::"
           echo -e "${{ env.bashPass }} Built Coverage Tests ${{ env.bashEnd }}"
 
-          wget https://github.com/linux-test-project/lcov/releases/download/v2.3.1/lcov-2.3.1.tar.gz
-          tar -xvzf lcov-2.3.1.tar.gz 
-          ./lcov-2.3.1/bin/lcov --list --rc branch_coverage=1  test/unit-test/build/coverage.info
+          lcov --summary --rc lcov_branch_coverage=1 test/unit-test/build/coverage.info
 
           echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
 

.github/workflows/formatting.yml

@@ -3900,12 +3900,6 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t * pxSocket )
             if( pxParentSocket->u.xTCP.bits.bReuseSocket == pdFALSE_UNSIGNED )
             {
                 pxClientSocket = pxParentSocket->u.xTCP.pxPeerSocket;
-
-                if( pxClientSocket != NULL )
-                {
-                    FreeRTOS_printf( ( "prvAcceptWaitClient: client %p parent %p\n",
-                                       ( void * ) pxClientSocket, ( void * ) pxParentSocket ) );
-                }
             }
             else
             {
@@ -3932,6 +3926,12 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t * pxSocket )
         }
         ( void ) xTaskResumeAll();
 
+        if( ( pxClientSocket != NULL ) && ( pxParentSocket->u.xTCP.bits.bReuseSocket == pdFALSE_UNSIGNED ) )
+        {
+            FreeRTOS_printf( ( "prvAcceptWaitClient: client %p parent %p\n",
+                               ( void * ) pxClientSocket, ( void * ) pxParentSocket ) );
+        }
+
         if( pxClientSocket != NULL )
         {
             if( pxAddressLength != NULL )

source/FreeRTOS_Sockets.c

@@ -273,8 +273,7 @@ void vProcessGeneratedUDPPacket_IPv4( NetworkBufferDescriptor_t * const pxNetwor
 
             /* 'ulIPAddress' might have become the address of the Gateway.
              * Find the route again. */
-
-            pxNetworkBuffer->pxEndPoint = FreeRTOS_FindEndPointOnNetMask( pxNetworkBuffer->xIPAddress.ulIP_IPv4 );
+            pxNetworkBuffer->pxEndPoint = FreeRTOS_FindEndPointOnNetMask( ulIPAddress );
 
             if( pxNetworkBuffer->pxEndPoint == NULL )
             {