FreeRTOS
diff --git a/‎.github/lexicon.txt‎
Lines changed: 6 additions & 0 deletions b/‎.github/lexicon.txt‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎.github/workflows/ci.yml‎
Lines changed: 4 additions & 10 deletions b/‎.github/workflows/ci.yml‎
Lines changed: 4 additions & 10 deletions
diff --git a/‎FreeRTOS_ARP.c‎
Lines changed: 1 addition & 0 deletions b/‎FreeRTOS_ARP.c‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎include/FreeRTOS_DNS.h‎
Lines changed: 1 addition & 0 deletions b/‎include/FreeRTOS_DNS.h‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎include/FreeRTOS_Sockets.h‎
Lines changed: 1 addition & 0 deletions b/‎include/FreeRTOS_Sockets.h‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎test/unit-test/CMakeLists.txt‎
Lines changed: 96 additions & 18 deletions b/‎test/unit-test/CMakeLists.txt‎
Lines changed: 96 additions & 18 deletions
diff --git a/‎test/unit-test/ConfigFiles/FreeRTOSConfig.h‎
Lines changed: 3 additions & 5 deletions b/‎test/unit-test/ConfigFiles/FreeRTOSConfig.h‎
Lines changed: 3 additions & 5 deletions
diff --git a/‎test/unit-test/ConfigFiles/FreeRTOSIPConfig.h‎
Lines changed: 12 additions & 8 deletions b/‎test/unit-test/ConfigFiles/FreeRTOSIPConfig.h‎
Lines changed: 12 additions & 8 deletions
@@ -89,6 +89,7 @@ bwinscaling
 bytecount
 callbacklist
 calloc
+cambridge
 camen
 carriersense
 castingmacrofunctions
@@ -184,6 +185,7 @@ eagain
 eapplicationprocesscustomframehook
 earpcachehit
 earpcachemiss
+earpgetcacheentry
 earptimerevent
 ec
 ecantsendpacket
@@ -387,6 +389,7 @@ isdhcpsocket
 isn
 isp
 isr
+isrs
 iss
 itemvalue
 jd
@@ -427,6 +430,7 @@ lmaxlength
 lminlength
 lnetlength
 loffset
+longjmp
 loopback
 loopbackmode
 loptionname
@@ -743,6 +747,7 @@ pxdestinationaddress
 pxdnsmessageheader
 pxduplicatenetworkbufferwithdescriptor
 pxevent
+pxgetnetworkbuffer
 pxgetnetworkbufferwithdescriptor
 pxhandleconnected
 pxhandlereceive
@@ -917,6 +922,7 @@ srdbl
 srtt
 ss
 starttx
+stderr
 stmicroelectronics
 strcmp
 streambuffer
 
@@ -22,10 +22,8 @@ jobs:
           git submodule update --init vendor/unity
           cd ../..
           sudo apt-get install -y lcov
-          cmake -S test/unit-test -B test/unit-test/build/ \
-          -G "Unix Makefiles" \
-          -DCMAKE_BUILD_TYPE=Debug \
-          -DCMAKE_C_FLAGS='--coverage -Wall -Wextra -DNDEBUG'
+          sudo apt-get install -y unifdef
+          cmake -S test/unit-test -B test/unit-test/build/
           make -C test/unit-test/build/ all
       - name: Test
         run: |
@@ -35,11 +33,7 @@ jobs:
       - name: Coverage
         run: |
           make -C test/unit-test/build/ coverage
-          lcov --rc lcov_branch_coverage=1 --remove test/unit-test/build/coverage.info '*test*' --output-file test/unit-test/build/coverage.info
-          lcov --rc lcov_branch_coverage=1 --remove test/unit-test/build/coverage.info '*CMakeCCompilerId*' --output-file test/unit-test/build/coverage.info
-          lcov --rc lcov_branch_coverage=1 --remove test/unit-test/build/coverage.info '*third-party*' --output-file test/unit-test/build/coverage.info
-          lcov --rc lcov_branch_coverage=1 --remove test/unit-test/build/coverage.info '*mocks*' --output-file test/unit-test/build/coverage.info
-          lcov --list test/unit-test/build/coverage.info
+          lcov --list --rc lcov_branch_coverage=1 test/unit-test/build/coverage.info
 
   spell-check:
     runs-on: ubuntu-latest
@@ -81,7 +75,7 @@ jobs:
       - name: Run Uncrustify
         run: |
           uncrustify --version
-          find . -iname "*.[hc]" -exec uncrustify --check -c tools/uncrustify.cfg {} +
+          find . -not -path '.*catch_assert.h' -iname "*.[hc]" -exec uncrustify --check -c tools/uncrustify.cfg {} +
       - name: Check For Trailing Whitespace
         run: |
           set +e
 
@@ -808,6 +808,7 @@ BaseType_t xARPWaitResolution( uint32_t ulIPAddress,
                 break;
             }
 
+            /* Decrement the count. */
             uxSendCount--;
         }
     }
 
@@ -32,6 +32,7 @@
 
 /* Application level configuration options. */
     #include "FreeRTOSIPConfig.h"
+    #include "FreeRTOSIPConfigDefaults.h"
     #include "IPTraceMacroDefaults.h"
 
 
 
@@ -35,6 +35,7 @@
 
 /* FreeRTOS includes. */
     #include "FreeRTOS.h"
+    #include "task.h"
 
 /* Application level configuration options. */
     #include "FreeRTOSIPConfig.h"
 
@@ -1,13 +1,16 @@
-cmake_minimum_required ( VERSION 3.13.0 )
-project ( "FreeRTOS-Plus-TCP test"
-          VERSION 1.0.0
-          LANGUAGES C )
+# Set the required version.
+cmake_minimum_required( VERSION 3.13.0 )
+
+# Set the unit-test project.
+project( "FreeRTOS-Plus-TCP test"
+         VERSION 1.0.0
+         LANGUAGES C )
 
 # Allow the project to be organized into folders.
 set_property( GLOBAL PROPERTY USE_FOLDERS ON )
 
 # Use C90.
-set( CMAKE_C_STANDARD 90 )
+set( CMAKE_C_STANDARD 99 )
 set( CMAKE_C_STANDARD_REQUIRED ON )
 
 # Do not allow in-source build.
@@ -16,8 +19,26 @@ if( ${PROJECT_SOURCE_DIR} STREQUAL ${PROJECT_BINARY_DIR} )
 endif()
 
 # Set global path variables.
-get_filename_component(__MODULE_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
-set(MODULE_ROOT_DIR ${__MODULE_ROOT_DIR} CACHE INTERNAL "FreeRTOS-Plus-TCP repository root.")
+get_filename_component( __MODULE_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE )
+set( MODULE_ROOT_DIR ${__MODULE_ROOT_DIR} CACHE INTERNAL "FreeRTOS-Plus-TCP repository root." )
+
+# Set the unit-test directory.
+set( UNIT_TEST_DIR ${MODULE_ROOT_DIR}/test/unit-test CACHE INTERNAL "Unit-test directory." )
+
+set( KERNEL_DIRECTORY ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel )
+
+# See if FreRTOS-Kernel is submoduled
+if( NOT EXISTS ${KERNEL_DIRECTORY}/include )
+    # Inform the user of the actions
+    message( STATUS "FreeRTOS-Kernel is required for this build. Submoduling it..." )
+    execute_process( COMMAND git submodule update --init --checkout ${KERNEL_DIRECTORY}
+                     WORKING_DIRECTORY ${MODULE_ROOT_DIR} )
+endif()
+
+# Set the include directories
+string( APPEND GLOBAL_INCLUDES "-I ${MODULE_ROOT_DIR}/include ")
+string( APPEND GLOBAL_INCLUDES "-I ${UNIT_TEST_DIR}/ConfigFiles " )
+string( APPEND GLOBAL_INCLUDES "-I ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include " )
 
 # Configure options to always show in CMake GUI.
 option( BUILD_CLONE_SUBMODULES
@@ -29,17 +50,73 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
 
-# ===================================== Coverity Analysis Configuration =================================================
 
-# Include filepaths for source and include.
-include( ${MODULE_ROOT_DIR}/test/unit-test/TCPFilePaths.cmake )
+# Set TCP includes.
+set( TCP_INCLUDES "${MODULE_ROOT_DIR}/include/FreeRTOS_IP.h"
+                  "${MODULE_ROOT_DIR}/include/FreeRTOS_ARP.h"
+                  "${MODULE_ROOT_DIR}/include/FreeRTOS_Sockets.h"
+                  "${MODULE_ROOT_DIR}/include/FreeRTOS_IP_Private.h"
+                  "${MODULE_ROOT_DIR}/include/FreeRTOS_UDP_IP.h"
+                  "${MODULE_ROOT_DIR}/include/FreeRTOS_DHCP.h"
+                  "${MODULE_ROOT_DIR}/include/FreeRTOS_DNS.h"
+                  "${MODULE_ROOT_DIR}/include/FreeRTOS_TCP_IP.h"
+                  "${MODULE_ROOT_DIR}/include/FreeRTOS_TCP_WIN.h"
+                  "${MODULE_ROOT_DIR}/include/NetworkBufferManagement.h"
+                  "${MODULE_ROOT_DIR}/include/NetworkInterface.h" )
+
+# Create a directory for the modified files
+file( MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Annexed_TCP )
+# ===========================================================================
+
+# ===========================================================================
+# Preprocess the TCP include files as they will be mocked later.
+foreach( file ${TCP_INCLUDES} )
+    get_filename_component( MODIFIED_FILE ${file} NAME_WLE )
+
+    string(TOUPPER ${MODIFIED_FILE} Guard)
+
+    if(${MODIFIED_FILE} STREQUAL "NetworkBufferManagement" )
+        set( Guard "NETWORK_BUFFER_MANAGEMENT_H" )
+    else()
+        set( Guard ${Guard}_H )
+    endif()
+
+    # Remove IPConfigDefaults from the file
+    execute_process( COMMAND sed "s,#include \"FreeRTOSIPConfigDefaults.h\",,g" ${file}
+                     OUTPUT_FILE ${CMAKE_BINARY_DIR}/Annexed_TCP/${MODIFIED_FILE}_tmp1.h )
+
+    # Add the FreeRTOSIPConfig file to each directory
+    execute_process( COMMAND sed "1 i\#include \"FreeRTOSIPConfig.h\"" ${CMAKE_BINARY_DIR}/Annexed_TCP/${MODIFIED_FILE}_tmp1.h
+                     OUTPUT_FILE ${CMAKE_BINARY_DIR}/Annexed_TCP/${MODIFIED_FILE}_tmp.h )
 
-# Target for Coverity analysis that builds the library.
-#add_library( coverity_analysis
-#             ${MQTT_SOURCES}
-#             ${MQTT_SERIALIZER_SOURCES} )
+    # Use this tool to process all conditional declarations.
+    execute_process( COMMAND unifdefall -U${Guard} -I ${MODULE_ROOT_DIR}/tools/CMock/vendor/unity/src
+                                                   -I ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/include
+                                                   -I ${UNIT_TEST_DIR}/ConfigFiles
+                                                   -I ${MODULE_ROOT_DIR}/include
+                                                   -I ${MODULE_ROOT_DIR}/test/FreeRTOS-Kernel/portable/ThirdParty/GCC/Posix
+                                                   ${CMAKE_BINARY_DIR}/Annexed_TCP/${MODIFIED_FILE}_tmp.h
+                     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                     OUTPUT_FILE ${CMAKE_BINARY_DIR}/Annexed_TCP/${MODIFIED_FILE}.h
+                     OUTPUT_QUIET )
 
-#  ====================================  Test Configuration ========================================
+    # Add the guards back to the files
+    execute_process( COMMAND sed -i "1 i\#ifndef ${Guard}" ${CMAKE_BINARY_DIR}/Annexed_TCP/${MODIFIED_FILE}.h )
+    execute_process( COMMAND sed -i -e "$ a\#endif" ${CMAKE_BINARY_DIR}/Annexed_TCP/${MODIFIED_FILE}.h )
+
+    execute_process( COMMAND sed -i -E "s,[ ]*extern ipDECL_CAST_.*,,g" ${CMAKE_BINARY_DIR}/Annexed_TCP/${MODIFIED_FILE}.h )
+
+endforeach()
+# ===========================================================================
+
+
+
+# ===================================== Include the cmake configurations =================================================
+
+# Include filepaths for source and include.
+include( ${UNIT_TEST_DIR}/TCPFilePaths.cmake )
+
+#  ==================================== Test Configuration ========================================
 
 # Define a CMock resource path.
 set( CMOCK_DIR ${MODULE_ROOT_DIR}/tools/CMock CACHE INTERNAL "CMock library source directory." )
@@ -71,15 +148,16 @@ add_cmock_targets()
 # Add function to enable CMock based tests and coverage.
 include( ${MODULE_ROOT_DIR}/test/unit-test/cmock/create_test.cmake )
 
+set(FILE_UNDER_TEST FreeRTOS_ARP)
+
 # Include unit-test build configuration
-include( unit_test_build.cmake )
+include( ${UNIT_TEST_DIR}/FreeRTOS_ARP/ut.cmake )
 
 #  ==================================== Coverage Analysis configuration ========================================
 
 # Add a target for running coverage on tests.
 add_custom_target( coverage
     COMMAND ${CMAKE_COMMAND} -P ${MODULE_ROOT_DIR}/test/unit-test/cmock/coverage.cmake
-    DEPENDS cmock unity FreeRTOS_TCP_Unit_test
+    DEPENDS cmock unity FreeRTOS_ARP_utest
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
-
 
@@ -29,7 +29,7 @@
 #ifndef FREERTOS_CONFIG_H
 #define FREERTOS_CONFIG_H
 
-#include <unity.h>
+#include <assert.h>
 
 /*-----------------------------------------------------------
 * Application specific definitions.
@@ -79,9 +79,7 @@
 /* Run time stats gathering configuration options. */
 unsigned long ulGetRunTimeCounterValue( void ); /* Prototype of function that returns run time counter. */
 void vConfigureTimerForRunTimeStats( void );    /* Prototype of function that initialises the run time counter. */
-#define configGENERATE_RUN_TIME_STATS    1
-#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS()    vConfigureTimerForRunTimeStats()
-#define portGET_RUN_TIME_COUNTER_VALUE()            ulGetRunTimeCounterValue()
+#define configGENERATE_RUN_TIME_STATS             1
 
 /* Co-routine related configuration options. */
 #define configUSE_CO_ROUTINES                     1
@@ -117,7 +115,7 @@ void vConfigureTimerForRunTimeStats( void );    /* Prototype of function that in
  * uses the same semantics as the standard C assert() macro. */
 extern void vAssertCalled( unsigned long ulLine,
                            const char * const pcFileName );
-#define configASSERT( x )    if( x == 0 ) TEST_ABORT()
+#define configASSERT( x )    assert( x )
 
 #define configINCLUDE_MESSAGE_BUFFER_AMP_DEMO    0
 #if ( configINCLUDE_MESSAGE_BUFFER_AMP_DEMO == 1 )
 
@@ -32,13 +32,10 @@
 
 #define _static
 
-#define ipconfigUSE_ARP_REMOVE_ENTRY       1
-#define ipconfigUSE_ARP_REVERSED_LOOKUP    1
-
 /* Set to 1 to print out debug messages.  If ipconfigHAS_DEBUG_PRINTF is set to
  * 1 then FreeRTOS_debug_printf should be defined to the function used to print
  * out the debugging messages. */
-#define ipconfigHAS_DEBUG_PRINTF           0
+#define ipconfigHAS_DEBUG_PRINTF    0
 #if ( ipconfigHAS_DEBUG_PRINTF == 1 )
     #define FreeRTOS_debug_printf( X )    configPRINTF( X )
 #endif
@@ -300,11 +297,18 @@ extern uint32_t ulRand();
 #define ipconfigSOCKET_HAS_USER_WAKE_CALLBACK    ( 1 )
 #define ipconfigUSE_CALLBACKS                    ( 0 )
 
+#define ipconfigUSE_NBNS                         ( 1 )
+
+#define ipconfigUSE_LLMNR                        ( 1 )
+
+#define ipconfigDNS_USE_CALLBACKS                1
+#define ipconfigUSE_ARP_REMOVE_ENTRY             1
+#define ipconfigUSE_ARP_REVERSED_LOOKUP          1
+
+#define ipconfigETHERNET_MINIMUM_PACKET_BYTES    ( 200 )
 
-#define portINLINE
+#define ipconfigARP_STORES_REMOTE_ADDRESSES      ( 1 )
 
-void vApplicationMQTTGetKeys( const char ** ppcRootCA,
-                              const char ** ppcClientCert,
-                              const char ** ppcClientPrivateKey );
+#define ipconfigARP_USE_CLASH_DETECTION          ( 1 )
 
 #endif /* FREERTOS_IP_CONFIG_H */
Original file line number	Diff line number	Diff line change
`@@ -808,6 +808,7 @@ BaseType_t xARPWaitResolution( uint32_t ulIPAddress,`
`808`	`808`	`break;`
`809`	`809`	`}`
`810`	`810`
	`811`	`+ /* Decrement the count. */`
`811`	`812`	`uxSendCount--;`
`812`	`813`	`}`
`813`	`814`	`}`