Merge branch 'main' into main

tony-josi-aws · web-flow · commit 3e948aec6c22 · 2024-09-26T11:52:22.000+05:30
diff --git a/source/FreeRTOS_ARP.c b/source/FreeRTOS_ARP.c
@@ -962,7 +962,7 @@ static BaseType_t prvFindCacheEntry( const MACAddress_t * pxMACAddress,
                                           MACAddress_t * const pxMACAddress,
                                           struct xNetworkEndPoint ** ppxEndPoint )
     {
-        eARPLookupResult_t eReturn;
+        eARPLookupResult_t eReturn = eCantSendPacket;
         uint32_t ulAddressToLookup;
         NetworkEndPoint_t * pxEndPoint = NULL;
 
@@ -974,12 +974,21 @@ static BaseType_t prvFindCacheEntry( const MACAddress_t * pxMACAddress,
         ulAddressToLookup = *pulIPAddress;
         pxEndPoint = FreeRTOS_FindEndPointOnIP_IPv4( ulAddressToLookup );
 
-        if( xIsIPv4Multicast( ulAddressToLookup ) != 0 )
+        if( xIsIPv4Loopback( ulAddressToLookup ) != 0 )
+        {
+            if( pxEndPoint != NULL )
+            {
+                /* For multi-cast, use the first IPv4 end-point. */
+                memcpy( pxMACAddress->ucBytes, pxEndPoint->xMACAddress.ucBytes, sizeof( pxMACAddress->ucBytes ) );
+                *( ppxEndPoint ) = pxEndPoint;
+                eReturn = eARPCacheHit;
+            }
+        }
+        else if( xIsIPv4Multicast( ulAddressToLookup ) != 0 )
         {
             /* Get the lowest 23 bits of the IP-address. */
             vSetMultiCastIPv4MacAddress( ulAddressToLookup, pxMACAddress );
 
-            eReturn = eCantSendPacket;
             pxEndPoint = FreeRTOS_FirstEndPoint( NULL );
 
             for( ;
diff --git a/source/FreeRTOS_DNS_Callback.c b/source/FreeRTOS_DNS_Callback.c
@@ -76,8 +76,8 @@
                 BaseType_t xMatching;
                 DNSCallback_t * pxCallback = ( ( DNSCallback_t * ) listGET_LIST_ITEM_OWNER( pxIterator ) );
                 #if ( ipconfigUSE_MDNS == 1 )
-                    /* mDNS port 5353. */
-                    if( pxSet->usPortNumber == FreeRTOS_htons( ipMDNS_PORT ) )
+                    /* mDNS port 5353. Host byte order comparison. */
+                    if( pxSet->usPortNumber == ipMDNS_PORT )
                     {
                         /* In mDNS, the query ID field is ignored and the
                          * hostname will be compared with outstanding requests. */
diff --git a/source/FreeRTOS_Sockets.c b/source/FreeRTOS_Sockets.c
@@ -2356,17 +2356,25 @@ void * vSocketClose( FreeRTOS_Socket_t * pxSocket )
         uint32_t ulNewValue;
         BaseType_t xReturn;
 
+        if( ( FreeRTOS_issocketconnected( pxSocket ) == pdTRUE ) )
+        {
+            /* If this socket is the child of a listening socket, the remote client may or may not have already sent
+             * us data. If data was already sent, then pxSocket->u.xTCP.rxStream != NULL and this call will fail.
+             * Warn the user about this inconsistent behavior. */
+            FreeRTOS_printf( ( "Warning: Changing buffer/window properties on a connected socket may fail." ) );
+        }
+
         if( pxSocket->ucProtocol != ( uint8_t ) FREERTOS_IPPROTO_TCP )
         {
-            FreeRTOS_debug_printf( ( "Set SO_%sBUF: wrong socket type\n",
-                                     ( lOptionName == FREERTOS_SO_SNDBUF ) ? "SND" : "RCV" ) );
+            FreeRTOS_printf( ( "Set SO_%sBUF: wrong socket type\n",
+                               ( lOptionName == FREERTOS_SO_SNDBUF ) ? "SND" : "RCV" ) );
             xReturn = -pdFREERTOS_ERRNO_EINVAL;
         }
         else if( ( ( lOptionName == FREERTOS_SO_SNDBUF ) && ( pxSocket->u.xTCP.txStream != NULL ) ) ||
                  ( ( lOptionName == FREERTOS_SO_RCVBUF ) && ( pxSocket->u.xTCP.rxStream != NULL ) ) )
         {
-            FreeRTOS_debug_printf( ( "Set SO_%sBUF: buffer already created\n",
-                                     ( lOptionName == FREERTOS_SO_SNDBUF ) ? "SND" : "RCV" ) );
+            FreeRTOS_printf( ( "Set SO_%sBUF: buffer already created\n",
+                               ( lOptionName == FREERTOS_SO_SNDBUF ) ? "SND" : "RCV" ) );
             xReturn = -pdFREERTOS_ERRNO_EINVAL;
         }
         else
diff --git a/source/portable/NetworkInterface/ATSAM4E/NetworkInterface.c b/source/portable/NetworkInterface/ATSAM4E/NetworkInterface.c
@@ -88,7 +88,8 @@
 static BaseType_t xGMACWaitLS( TickType_t xMaxTime );
 
 #if ( ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM == 1 ) && ( ipconfigHAS_TX_CRC_OFFLOADING == 0 )
-    void vGMACGenerateChecksum( uint8_t * apBuffer );
+    void vGMACGenerateChecksum( uint8_t * pucBuffer,
+                                size_t uxLength );
 #endif
 
 /*
@@ -405,9 +406,10 @@ static BaseType_t xGMACWaitLS( TickType_t xMaxTime )
 
 /*#if( ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM == 1 ) && ( ipconfigHAS_TX_CRC_OFFLOADING == 0 ) */
 
-void vGMACGenerateChecksum( uint8_t * apBuffer )
+void vGMACGenerateChecksum( uint8_t * pucBuffer,
+                            size_t uxLength )
 {
-    ProtocolPacket_t * xProtPacket = ( ProtocolPacket_t * ) apBuffer;
+    ProtocolPacket_t * xProtPacket = ( ProtocolPacket_t * ) pucBuffer;
 
     if( xProtPacket->xTCPPacket.xEthernetHeader.usFrameType == ipIPv4_FRAME_TYPE )
     {
@@ -419,7 +421,7 @@ void vGMACGenerateChecksum( uint8_t * apBuffer )
         pxIPHeader->usHeaderChecksum = ~FreeRTOS_htons( pxIPHeader->usHeaderChecksum );
 
         /* Calculate the TCP checksum for an outgoing packet. */
-        usGenerateProtocolChecksum( ( uint8_t * ) apBuffer, pdTRUE );
+        usGenerateProtocolChecksum( ( uint8_t * ) pucBuffer, uxLength, pdTRUE );
     }
 }
 
diff --git a/source/portable/NetworkInterface/ATSAM4E/gmac.c b/source/portable/NetworkInterface/ATSAM4E/gmac.c
@@ -642,7 +642,8 @@ uint32_t gmac_dev_read( gmac_device_t * p_gmac_dev,
 }
 
 
-extern void vGMACGenerateChecksum( uint8_t * apBuffer );
+extern void vGMACGenerateChecksum( uint8_t * pucBuffer,
+                                   size_t uxLength );
 
 /**
  * \brief Send ulLength bytes from pcFrom. This copies the buffer to one of the
@@ -715,7 +716,7 @@ uint32_t gmac_dev_write( gmac_device_t * p_gmac_dev,
             memcpy( ( void * ) p_tx_td->addr, p_buffer, ul_size );
         }
         #endif /* ipconfigZERO_COPY_TX_DRIVER */
-        vGMACGenerateChecksum( ( uint8_t * ) p_tx_td->addr );
+        vGMACGenerateChecksum( ( uint8_t * ) p_tx_td->addr, ( size_t ) ul_size );
     }
 
     #if ( GMAC_USES_TX_CALLBACK != 0 )
diff --git a/source/portable/NetworkInterface/DriverSAM/NetworkInterface.c b/source/portable/NetworkInterface/DriverSAM/NetworkInterface.c
@@ -161,7 +161,7 @@ static BaseType_t xPHY_Write( BaseType_t xAddress,
                               uint32_t ulValue );
 
 #if ( ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM == 1 ) && ( ipconfigHAS_TX_CRC_OFFLOADING == 0 )
-    void vGMACGenerateChecksum( uint8_t * apBuffer,
+    void vGMACGenerateChecksum( uint8_t * pucBuffer,
                                 size_t uxLength );
 #endif
 
diff --git a/source/portable/NetworkInterface/DriverSAM/gmac_SAM.h b/source/portable/NetworkInterface/DriverSAM/gmac_SAM.h
@@ -1539,7 +1539,7 @@
 
 /* The SAM4E has problems offloading checksums for transmission.
  * The SAME70 does not set the CRC for ICMP packets (ping). */
-    extern void vGMACGenerateChecksum( uint8_t * apBuffer,
+    extern void vGMACGenerateChecksum( uint8_t * pucBuffer,
                                        size_t uxLength );
 
 /*/ @cond 0 */
diff --git a/source/portable/NetworkInterface/loopback/loopbackNetworkInterface.c b/source/portable/NetworkInterface/loopback/loopbackNetworkInterface.c
@@ -134,23 +134,23 @@ static BaseType_t prvLoopback_Output( NetworkInterface_t * pxInterface,
     }
 
     {
-        MACAddress_t xMACAddress;
+        const MACAddress_t * pxMACAddress = &( pxDescriptor->pxEndPoint->xMACAddress );
 
         if( pxDescriptor->pxEndPoint->bits.bIPv6 != 0 )
         {
             #if ( ipconfigUSE_IPv6 != 0 )
-                if( xIsIPv6Loopback( &( pxDescriptor->xIPAddress ) ) != pdFALSE )
+                if( xIsIPv6Loopback( &( pxDescriptor->xIPAddress.xIP_IPv6 ) ) != pdFALSE )
                 {
-                    vNDRefreshCacheEntry( &xMACAddress, &( pxDescriptor->xIPAddress.xIP_IPv6 ), pxDescriptor->pxEndPoint );
+                    vNDRefreshCacheEntry( pxMACAddress, &( pxDescriptor->xIPAddress.xIP_IPv6 ), pxDescriptor->pxEndPoint );
                 }
             #endif
         }
         else
         {
             #if ( ipconfigUSE_IPv4 != 0 )
-                if( xIsIPv4Loopback( pxDescriptor->xIPAddress.ulIP_IPv4 ) )
+                if( xIsIPv4Loopback( pxDescriptor->xIPAddress.ulIP_IPv4 ) != pdFALSE )
                 {
-                    vARPRefreshCacheEntry( &xMACAddress, pxDescriptor->xIPAddress.ulIP_IPv4, pxDescriptor->pxEndPoint );
+                    vARPRefreshCacheEntry( pxMACAddress, pxDescriptor->xIPAddress.ulIP_IPv4, pxDescriptor->pxEndPoint );
                 }
             #endif
         }
@@ -170,11 +170,21 @@ static BaseType_t prvLoopback_Output( NetworkInterface_t * pxInterface,
         xRxEvent.eEventType = eNetworkRxEvent;
         xRxEvent.pvData = ( void * ) pxDescriptor;
 
-        if( xSendEventStructToIPTask( &xRxEvent, 0u ) != pdTRUE )
+        pxDescriptor->pxInterface = xLoopbackInterface;
+        pxDescriptor->pxEndPoint = FreeRTOS_MatchingEndpoint( xLoopbackInterface, pxDescriptor->pucEthernetBuffer );
+
+        if( pxDescriptor->pxEndPoint == NULL )
+        {
+            vReleaseNetworkBufferAndDescriptor( pxDescriptor );
+            iptraceETHERNET_RX_EVENT_LOST();
+            FreeRTOS_printf( ( "prvLoopback_Output: Can not find a proper endpoint\n" ) );
+        }
+        else if( xSendEventStructToIPTask( &xRxEvent, 0u ) != pdTRUE )
         {
+            /* Sending failed, release the descriptor. */
             vReleaseNetworkBufferAndDescriptor( pxDescriptor );
             iptraceETHERNET_RX_EVENT_LOST();
-            FreeRTOS_printf( ( "prvEMACRxPoll: Can not queue return packet!\n" ) );
+            FreeRTOS_printf( ( "prvLoopback_Output: Can not queue return packet!\n" ) );
         }
     }
 
diff --git a/test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_utest.c b/test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_utest.c
diff --git a/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c b/test/unit-test/FreeRTOS_DNS_Callback/FreeRTOS_DNS_Callback_utest.c

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@`
`88`	`88`	`static BaseType_t xGMACWaitLS( TickType_t xMaxTime );`
`89`	`89`
`90`	`90`	`#if ( ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM == 1 ) && ( ipconfigHAS_TX_CRC_OFFLOADING == 0 )`
`91`		`- void vGMACGenerateChecksum( uint8_t * apBuffer );`
	`91`	`+ void vGMACGenerateChecksum( uint8_t * pucBuffer,`
	`92`	`+ size_t uxLength );`
`92`	`93`	`#endif`
`93`	`94`
`94`	`95`	`/*`
`@@ -405,9 +406,10 @@ static BaseType_t xGMACWaitLS( TickType_t xMaxTime )`
`405`	`406`
`406`	`407`	`/#if( ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM == 1 ) && ( ipconfigHAS_TX_CRC_OFFLOADING == 0 ) /`
`407`	`408`
`408`		`-void vGMACGenerateChecksum( uint8_t * apBuffer )`
	`409`	`+void vGMACGenerateChecksum( uint8_t * pucBuffer,`
	`410`	`+ size_t uxLength )`
`409`	`411`	`{`
`410`		`- ProtocolPacket_t * xProtPacket = ( ProtocolPacket_t * ) apBuffer;`
	`412`	`+ ProtocolPacket_t * xProtPacket = ( ProtocolPacket_t * ) pucBuffer;`
`411`	`413`
`412`	`414`	`if( xProtPacket->xTCPPacket.xEthernetHeader.usFrameType == ipIPv4_FRAME_TYPE )`
`413`	`415`	`{`
`@@ -419,7 +421,7 @@ void vGMACGenerateChecksum( uint8_t * apBuffer )`
`419`	`421`	`pxIPHeader->usHeaderChecksum = ~FreeRTOS_htons( pxIPHeader->usHeaderChecksum );`
`420`	`422`
`421`	`423`	`/* Calculate the TCP checksum for an outgoing packet. */`
`422`		`- usGenerateProtocolChecksum( ( uint8_t * ) apBuffer, pdTRUE );`
	`424`	`+ usGenerateProtocolChecksum( ( uint8_t * ) pucBuffer, uxLength, pdTRUE );`
`423`	`425`	`}`
`424`	`426`	`}`
`425`	`427`
Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,8 @@ uint32_t gmac_dev_read( gmac_device_t * p_gmac_dev,`
`642`	`642`	`}`
`643`	`643`
`644`	`644`
`645`		`-extern void vGMACGenerateChecksum( uint8_t * apBuffer );`
	`645`	`+extern void vGMACGenerateChecksum( uint8_t * pucBuffer,`
	`646`	`+ size_t uxLength );`
`646`	`647`
`647`	`648`	`/**`
`648`	`649`	`* \brief Send ulLength bytes from pcFrom. This copies the buffer to one of the`
`@@ -715,7 +716,7 @@ uint32_t gmac_dev_write( gmac_device_t * p_gmac_dev,`
`715`	`716`	`memcpy( ( void * ) p_tx_td->addr, p_buffer, ul_size );`
`716`	`717`	`}`
`717`	`718`	`#endif /* ipconfigZERO_COPY_TX_DRIVER */`
`718`		`- vGMACGenerateChecksum( ( uint8_t * ) p_tx_td->addr );`
	`719`	`+ vGMACGenerateChecksum( ( uint8_t * ) p_tx_td->addr, ( size_t ) ul_size );`
`719`	`720`	`}`
`720`	`721`
`721`	`722`	`#if ( GMAC_USES_TX_CALLBACK != 0 )`
Original file line number	Diff line number	Diff line change
`@@ -134,23 +134,23 @@ static BaseType_t prvLoopback_Output( NetworkInterface_t * pxInterface,`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`{`
`137`		`- MACAddress_t xMACAddress;`
	`137`	`+ const MACAddress_t * pxMACAddress = &( pxDescriptor->pxEndPoint->xMACAddress );`
`138`	`138`
`139`	`139`	`if( pxDescriptor->pxEndPoint->bits.bIPv6 != 0 )`
`140`	`140`	`{`
`141`	`141`	`#if ( ipconfigUSE_IPv6 != 0 )`
`142`		`- if( xIsIPv6Loopback( &( pxDescriptor->xIPAddress ) ) != pdFALSE )`
	`142`	`+ if( xIsIPv6Loopback( &( pxDescriptor->xIPAddress.xIP_IPv6 ) ) != pdFALSE )`
`143`	`143`	`{`
`144`		`- vNDRefreshCacheEntry( &xMACAddress, &( pxDescriptor->xIPAddress.xIP_IPv6 ), pxDescriptor->pxEndPoint );`
	`144`	`+ vNDRefreshCacheEntry( pxMACAddress, &( pxDescriptor->xIPAddress.xIP_IPv6 ), pxDescriptor->pxEndPoint );`
`145`	`145`	`}`
`146`	`146`	`#endif`
`147`	`147`	`}`
`148`	`148`	`else`
`149`	`149`	`{`
`150`	`150`	`#if ( ipconfigUSE_IPv4 != 0 )`
`151`		`- if( xIsIPv4Loopback( pxDescriptor->xIPAddress.ulIP_IPv4 ) )`
	`151`	`+ if( xIsIPv4Loopback( pxDescriptor->xIPAddress.ulIP_IPv4 ) != pdFALSE )`
`152`	`152`	`{`
`153`		`- vARPRefreshCacheEntry( &xMACAddress, pxDescriptor->xIPAddress.ulIP_IPv4, pxDescriptor->pxEndPoint );`
	`153`	`+ vARPRefreshCacheEntry( pxMACAddress, pxDescriptor->xIPAddress.ulIP_IPv4, pxDescriptor->pxEndPoint );`
`154`	`154`	`}`
`155`	`155`	`#endif`
`156`	`156`	`}`
`@@ -170,11 +170,21 @@ static BaseType_t prvLoopback_Output( NetworkInterface_t * pxInterface,`
`170`	`170`	`xRxEvent.eEventType = eNetworkRxEvent;`
`171`	`171`	`xRxEvent.pvData = ( void * ) pxDescriptor;`
`172`	`172`
`173`		`- if( xSendEventStructToIPTask( &xRxEvent, 0u ) != pdTRUE )`
	`173`	`+ pxDescriptor->pxInterface = xLoopbackInterface;`
	`174`	`+ pxDescriptor->pxEndPoint = FreeRTOS_MatchingEndpoint( xLoopbackInterface, pxDescriptor->pucEthernetBuffer );`
	`175`	`+`
	`176`	`+ if( pxDescriptor->pxEndPoint == NULL )`
	`177`	`+ {`
	`178`	`+ vReleaseNetworkBufferAndDescriptor( pxDescriptor );`
	`179`	`+ iptraceETHERNET_RX_EVENT_LOST();`
	`180`	`+ FreeRTOS_printf( ( "prvLoopback_Output: Can not find a proper endpoint\n" ) );`
	`181`	`+ }`
	`182`	`+ else if( xSendEventStructToIPTask( &xRxEvent, 0u ) != pdTRUE )`
`174`	`183`	`{`
	`184`	`+ /* Sending failed, release the descriptor. */`
`175`	`185`	`vReleaseNetworkBufferAndDescriptor( pxDescriptor );`
`176`	`186`	`iptraceETHERNET_RX_EVENT_LOST();`
`177`		`- FreeRTOS_printf( ( "prvEMACRxPoll: Can not queue return packet!\n" ) );`
	`187`	`+ FreeRTOS_printf( ( "prvLoopback_Output: Can not queue return packet!\n" ) );`
`178`	`188`	`}`
`179`	`189`	`}`
`180`	`190`