From 9a88c9fb375387a733c7f1579a24ab0964461358 Mon Sep 17 00:00:00 2001 From: Tony Josi Date: Mon, 24 Jun 2024 14:14:08 +0530 Subject: [PATCH] [v4.2.0] Update version number and kernel version (#1160) * Update version number and kernel version * Fix unit test with latst kernel * Fix formatting * Update manifest * Revert kernel update * Revert "Fix formatting" This reverts commit d1e3585a133ef658f30c6d0985226da1ac8736d1. * Revert "Fix unit test with latst kernel" This reverts commit 0158df5be0013147e80f7270e62be8f1ef1db3aa. * Revert "Update manifest" This reverts commit 28405b2507613d5fe6b67b4a5fd1e8af71aed97f. * Reduce DNS CBMC proof packet size * Revert "Revert kernel update" This reverts commit 02df5d5441fc19b9484589e0841894fb234b6c2f. * Revert "Revert "Fix unit test with latst kernel"" This reverts commit 0f36ae6f271a7ebe62cb99c0a2863a02fb0acbf9. * Revert "Revert "Update manifest"" This reverts commit 7496148d7978691643717fbccdb6f450b75a5d85. * Revert "Revert "Fix formatting"" This reverts commit 5f6663d9b1c6482ec67c4e72e9e8e3b71cb03d92. --- docs/doxygen/config.doxyfile | 2 +- manifest.yml | 4 ++-- test/FreeRTOS-Kernel | 2 +- test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json | 6 +++--- test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_stubs.c | 4 ++-- .../FreeRTOS_ARP_DataLenLessThanMinPacket_stubs.c | 4 ++-- test/unit-test/FreeRTOS_DHCP/FreeRTOS_DHCP_stubs.c | 4 ++-- test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_stubs.c | 4 ++-- test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_stubs.c | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile index 76b46aedec..9f406bd078 100644 --- a/docs/doxygen/config.doxyfile +++ b/docs/doxygen/config.doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = FreeRTOS-Plus-TCP # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = V4.1.0 +PROJECT_NUMBER = V4.2.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/manifest.yml b/manifest.yml index 503347f619..5f19b66e96 100644 --- a/manifest.yml +++ b/manifest.yml @@ -1,12 +1,12 @@ name: "FreeRTOS-Plus-TCP" -version: "V4.1.0" +version: "V4.2.0" description: "Thread safe FreeRTOS TCP/IP stack working on top of the FreeRTOS-Kernel to implement the TCP/IP protocol. Suitable for microcontrollers." license: "MIT" dependencies: - name: "FreeRTOS-Kernel" - version: "V11.0.1" + version: "V11.1.0" license: "MIT" repository: type: "git" diff --git a/test/FreeRTOS-Kernel b/test/FreeRTOS-Kernel index 0240cd55f2..dbf70559b2 160000 --- a/test/FreeRTOS-Kernel +++ b/test/FreeRTOS-Kernel @@ -1 +1 @@ -Subproject commit 0240cd55f20be7100439b606086709b74a105cb1 +Subproject commit dbf70559b27d39c1fdb68dfb9a32140b6a6777a0 diff --git a/test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json b/test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json index d228156514..80f783f4cd 100644 --- a/test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json +++ b/test/cbmc/proofs/DNS_ParseDNSReply/Configurations.json @@ -1,8 +1,8 @@ { "ENTRY": "DNS_ParseDNSReply", - "TEST_PAYLOAD_SIZE": 5, - "TEST_IPV4_PACKET_SIZE": 59, - "TEST_IPV6_PACKET_SIZE": 79, + "TEST_PAYLOAD_SIZE": 2, + "TEST_IPV4_PACKET_SIZE": 29, + "TEST_IPV6_PACKET_SIZE": 49, "CBMCFLAGS": [ "--unwind 1", diff --git a/test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_stubs.c b/test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_stubs.c index 829eaa17e7..4bb309b72f 100644 --- a/test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_stubs.c +++ b/test/unit-test/FreeRTOS_ARP/FreeRTOS_ARP_stubs.c @@ -78,7 +78,7 @@ void vApplicationDaemonTaskStartupHook( void ) } void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer, StackType_t ** ppxTimerTaskStackBuffer, - uint32_t * pulTimerTaskStackSize ) + configSTACK_DEPTH_TYPE * puxTimerTaskStackSize ) { } void vPortDeleteThread( void * pvTaskToDelete ) @@ -125,7 +125,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete, } void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer, StackType_t ** ppxIdleTaskStackBuffer, - uint32_t * pulIdleTaskStackSize ) + configSTACK_DEPTH_TYPE * puxIdleTaskStackSize ) { } void vConfigureTimerForRunTimeStats( void ) diff --git a/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/FreeRTOS_ARP_DataLenLessThanMinPacket_stubs.c b/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/FreeRTOS_ARP_DataLenLessThanMinPacket_stubs.c index a8f3bca4e7..3b5e529963 100644 --- a/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/FreeRTOS_ARP_DataLenLessThanMinPacket_stubs.c +++ b/test/unit-test/FreeRTOS_ARP_DataLenLessThanMinPacket/FreeRTOS_ARP_DataLenLessThanMinPacket_stubs.c @@ -74,7 +74,7 @@ void vApplicationDaemonTaskStartupHook( void ) } void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer, StackType_t ** ppxTimerTaskStackBuffer, - uint32_t * pulTimerTaskStackSize ) + configSTACK_DEPTH_TYPE * puxTimerTaskStackSize ) { } void vPortDeleteThread( void * pvTaskToDelete ) @@ -121,7 +121,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete, } void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer, StackType_t ** ppxIdleTaskStackBuffer, - uint32_t * pulIdleTaskStackSize ) + configSTACK_DEPTH_TYPE * puxIdleTaskStackSize ) { } void vConfigureTimerForRunTimeStats( void ) diff --git a/test/unit-test/FreeRTOS_DHCP/FreeRTOS_DHCP_stubs.c b/test/unit-test/FreeRTOS_DHCP/FreeRTOS_DHCP_stubs.c index 350372d895..c3a2dd4e83 100644 --- a/test/unit-test/FreeRTOS_DHCP/FreeRTOS_DHCP_stubs.c +++ b/test/unit-test/FreeRTOS_DHCP/FreeRTOS_DHCP_stubs.c @@ -134,7 +134,7 @@ void vApplicationDaemonTaskStartupHook( void ) } void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer, StackType_t ** ppxTimerTaskStackBuffer, - uint32_t * pulTimerTaskStackSize ) + configSTACK_DEPTH_TYPE * puxTimerTaskStackSize ) { } void vPortDeleteThread( void * pvTaskToDelete ) @@ -181,7 +181,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete, } void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer, StackType_t ** ppxIdleTaskStackBuffer, - uint32_t * pulIdleTaskStackSize ) + configSTACK_DEPTH_TYPE * puxIdleTaskStackSize ) { } void vConfigureTimerForRunTimeStats( void ) diff --git a/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_stubs.c b/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_stubs.c index 1177c3d519..ac2ce0f751 100644 --- a/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_stubs.c +++ b/test/unit-test/FreeRTOS_TCP_WIN/FreeRTOS_TCP_WIN_stubs.c @@ -95,7 +95,7 @@ void vApplicationDaemonTaskStartupHook( void ) void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer, StackType_t ** ppxTimerTaskStackBuffer, - uint32_t * pulTimerTaskStackSize ) + configSTACK_DEPTH_TYPE * puxTimerTaskStackSize ) { } @@ -144,7 +144,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete, void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer, StackType_t ** ppxIdleTaskStackBuffer, - uint32_t * pulIdleTaskStackSize ) + configSTACK_DEPTH_TYPE * puxIdleTaskStackSize ) { } diff --git a/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_stubs.c b/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_stubs.c index 13f0ee5351..d0b303547b 100644 --- a/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_stubs.c +++ b/test/unit-test/FreeRTOS_Tiny_TCP/FreeRTOS_Tiny_TCP_stubs.c @@ -88,7 +88,7 @@ void vApplicationDaemonTaskStartupHook( void ) } void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer, StackType_t ** ppxTimerTaskStackBuffer, - uint32_t * pulTimerTaskStackSize ) + configSTACK_DEPTH_TYPE * puxTimerTaskStackSize ) { } void vPortDeleteThread( void * pvTaskToDelete ) @@ -135,7 +135,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete, } void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer, StackType_t ** ppxIdleTaskStackBuffer, - uint32_t * pulIdleTaskStackSize ) + configSTACK_DEPTH_TYPE * puxIdleTaskStackSize ) { } void vConfigureTimerForRunTimeStats( void )