[v4.2.0] Update version number and kernel version (#1160)

tony-josi-aws · web-flow · commit 9a88c9fb3753 · 2024-06-24T14:14:08.000+05:30
* 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 d1e3585. * Revert "Fix unit test with latst kernel" This reverts commit 0158df5. * Revert "Update manifest" This reverts commit 28405b2. * Reduce DNS CBMC proof packet size * Revert "Revert kernel update" This reverts commit 02df5d5. * Revert "Revert "Fix unit test with latst kernel"" This reverts commit 0f36ae6. * Revert "Revert "Update manifest"" This reverts commit 7496148. * Revert "Revert "Fix formatting"" This reverts commit 5f6663d.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 )

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"ENTRY": "DNS_ParseDNSReply",`
`3`		`- "TEST_PAYLOAD_SIZE": 5,`
`4`		`- "TEST_IPV4_PACKET_SIZE": 59,`
`5`		`- "TEST_IPV6_PACKET_SIZE": 79,`
	`3`	`+ "TEST_PAYLOAD_SIZE": 2,`
	`4`	`+ "TEST_IPV4_PACKET_SIZE": 29,`
	`5`	`+ "TEST_IPV6_PACKET_SIZE": 49,`
`6`	`6`	`"CBMCFLAGS":`
`7`	`7`	`[`
`8`	`8`	`"--unwind 1",`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ void vApplicationDaemonTaskStartupHook( void )`
`78`	`78`	`}`
`79`	`79`	`void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,`
`80`	`80`	`StackType_t ** ppxTimerTaskStackBuffer,`
`81`		`- uint32_t * pulTimerTaskStackSize )`
	`81`	`+ configSTACK_DEPTH_TYPE * puxTimerTaskStackSize )`
`82`	`82`	`{`
`83`	`83`	`}`
`84`	`84`	`void vPortDeleteThread( void * pvTaskToDelete )`
`@@ -125,7 +125,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete,`
`125`	`125`	`}`
`126`	`126`	`void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,`
`127`	`127`	`StackType_t ** ppxIdleTaskStackBuffer,`
`128`		`- uint32_t * pulIdleTaskStackSize )`
	`128`	`+ configSTACK_DEPTH_TYPE * puxIdleTaskStackSize )`
`129`	`129`	`{`
`130`	`130`	`}`
`131`	`131`	`void vConfigureTimerForRunTimeStats( void )`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ void vApplicationDaemonTaskStartupHook( void )`
`74`	`74`	`}`
`75`	`75`	`void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,`
`76`	`76`	`StackType_t ** ppxTimerTaskStackBuffer,`
`77`		`- uint32_t * pulTimerTaskStackSize )`
	`77`	`+ configSTACK_DEPTH_TYPE * puxTimerTaskStackSize )`
`78`	`78`	`{`
`79`	`79`	`}`
`80`	`80`	`void vPortDeleteThread( void * pvTaskToDelete )`
`@@ -121,7 +121,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete,`
`121`	`121`	`}`
`122`	`122`	`void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,`
`123`	`123`	`StackType_t ** ppxIdleTaskStackBuffer,`
`124`		`- uint32_t * pulIdleTaskStackSize )`
	`124`	`+ configSTACK_DEPTH_TYPE * puxIdleTaskStackSize )`
`125`	`125`	`{`
`126`	`126`	`}`
`127`	`127`	`void vConfigureTimerForRunTimeStats( void )`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ void vApplicationDaemonTaskStartupHook( void )`
`134`	`134`	`}`
`135`	`135`	`void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,`
`136`	`136`	`StackType_t ** ppxTimerTaskStackBuffer,`
`137`		`- uint32_t * pulTimerTaskStackSize )`
	`137`	`+ configSTACK_DEPTH_TYPE * puxTimerTaskStackSize )`
`138`	`138`	`{`
`139`	`139`	`}`
`140`	`140`	`void vPortDeleteThread( void * pvTaskToDelete )`
`@@ -181,7 +181,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete,`
`181`	`181`	`}`
`182`	`182`	`void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,`
`183`	`183`	`StackType_t ** ppxIdleTaskStackBuffer,`
`184`		`- uint32_t * pulIdleTaskStackSize )`
	`184`	`+ configSTACK_DEPTH_TYPE * puxIdleTaskStackSize )`
`185`	`185`	`{`
`186`	`186`	`}`
`187`	`187`	`void vConfigureTimerForRunTimeStats( void )`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void vApplicationDaemonTaskStartupHook( void )`
`95`	`95`
`96`	`96`	`void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,`
`97`	`97`	`StackType_t ** ppxTimerTaskStackBuffer,`
`98`		`- uint32_t * pulTimerTaskStackSize )`
	`98`	`+ configSTACK_DEPTH_TYPE * puxTimerTaskStackSize )`
`99`	`99`	`{`
`100`	`100`	`}`
`101`	`101`
`@@ -144,7 +144,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete,`
`144`	`144`
`145`	`145`	`void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,`
`146`	`146`	`StackType_t ** ppxIdleTaskStackBuffer,`
`147`		`- uint32_t * pulIdleTaskStackSize )`
	`147`	`+ configSTACK_DEPTH_TYPE * puxIdleTaskStackSize )`
`148`	`148`	`{`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ void vApplicationDaemonTaskStartupHook( void )`
`88`	`88`	`}`
`89`	`89`	`void vApplicationGetTimerTaskMemory( StaticTask_t ** ppxTimerTaskTCBBuffer,`
`90`	`90`	`StackType_t ** ppxTimerTaskStackBuffer,`
`91`		`- uint32_t * pulTimerTaskStackSize )`
	`91`	`+ configSTACK_DEPTH_TYPE * puxTimerTaskStackSize )`
`92`	`92`	`{`
`93`	`93`	`}`
`94`	`94`	`void vPortDeleteThread( void * pvTaskToDelete )`
`@@ -135,7 +135,7 @@ void vPortCloseRunningThread( void * pvTaskToDelete,`
`135`	`135`	`}`
`136`	`136`	`void vApplicationGetIdleTaskMemory( StaticTask_t ** ppxIdleTaskTCBBuffer,`
`137`	`137`	`StackType_t ** ppxIdleTaskStackBuffer,`
`138`		`- uint32_t * pulIdleTaskStackSize )`
	`138`	`+ configSTACK_DEPTH_TYPE * puxIdleTaskStackSize )`
`139`	`139`	`{`
`140`	`140`	`}`
`141`	`141`	`void vConfigureTimerForRunTimeStats( void )`