Merge branch 'main' into fix_filter_IP_packets_to_use_ipv4_settings_with_EP_check

Author: tony-josi-aws

source/FreeRTOS_Stream_Buffer.c

@@ -293,15 +293,15 @@ size_t uxStreamBufferAdd( StreamBuffer_t * const pxBuffer,
             const size_t uxFirst = FreeRTOS_min_size_t( uxLength - uxNextHead, uxCount );
 
             /* Write as many bytes as can be written in the first write. */
-            ( void ) memcpy( &( pxBuffer->ucArray[ uxNextHead ] ), pucData, uxFirst );
+            ( void ) pvPortMemCpyStreamBuffer( &( pxBuffer->ucArray[ uxNextHead ] ), pucData, uxFirst );
 
             /* If the number of bytes written was less than the number that
              * could be written in the first write... */
             if( uxCount > uxFirst )
             {
                 /* ...then write the remaining bytes to the start of the
                  * buffer. */
-                ( void ) memcpy( pxBuffer->ucArray, &( pucData[ uxFirst ] ), uxCount - uxFirst );
+                ( void ) pvPortMemCpyStreamBuffer( pxBuffer->ucArray, &( pucData[ uxFirst ] ), uxCount - uxFirst );
             }
         }
 
@@ -394,14 +394,14 @@ size_t uxStreamBufferGet( StreamBuffer_t * const pxBuffer,
 
             /* Obtain the number of bytes it is possible to obtain in the first
              * read. */
-            ( void ) memcpy( pucData, &( pxBuffer->ucArray[ uxNextTail ] ), uxFirst );
+            ( void ) pvPortMemCpyStreamBuffer( pucData, &( pxBuffer->ucArray[ uxNextTail ] ), uxFirst );
 
             /* If the total number of wanted bytes is greater than the number
              * that could be read in the first read... */
             if( uxCount > uxFirst )
             {
                 /* ...then read the remaining bytes from the start of the buffer. */
-                ( void ) memcpy( &( pucData[ uxFirst ] ), pxBuffer->ucArray, uxCount - uxFirst );
+                ( void ) pvPortMemCpyStreamBuffer( &( pucData[ uxFirst ] ), pxBuffer->ucArray, uxCount - uxFirst );
             }
         }
 

source/include/FreeRTOSIPConfigDefaults.h

@@ -2151,10 +2151,33 @@ STATIC_ASSERT( ipconfigSOCK_DEFAULT_SEND_BLOCK_TIME <= portMAX_DELAY );
     #define vPortFreeSocket( ptr )    vPortFree( ptr )
 #endif
 
+/*===========================================================================*/
+/*                              SOCKET CONFIG                                */
+/*===========================================================================*/
+/*---------------------------------------------------------------------------*/
+/*===========================================================================*/
+/*---------------------------------------------------------------------------*/
+/*===========================================================================*/
+/*                          STREAM BUFFER CONFIG                             */
+/*===========================================================================*/
+
+/*---------------------------------------------------------------------------*/
+
+/*
+ * pvPortMemCpyStreamBuffer
+ *
+ * Function to copy data into the stream buffer when sending
+ * and copy data from the stream buffer when receiving.
+ */
+
+#ifndef pvPortMemCpyStreamBuffer
+    #define pvPortMemCpyStreamBuffer( dst, src, count )    memcpy( dst, src, count )
+#endif
+
 /*---------------------------------------------------------------------------*/
 
 /*===========================================================================*/
-/*                              SOCKET CONFIG                                */
+/*                          STREAM BUFFER CONFIG                             */
 /*===========================================================================*/
 /*---------------------------------------------------------------------------*/
 /*===========================================================================*/