CMake changes from main branch [PR: #557, PR: #742] #803

tony-josi-aws · 2023-03-20T10:51:04Z

Description

This PR updates the cmake changes added to the main branch to the dev/IPv6_integration branch and related fix for warnings and build errors.

PRs:

#557
#742

Checklist:

I have tested my changes. No regression in existing tests.
I have modified and/or added unit-tests to cover the code changes in this Pull Request.

Related Issue

Updating dev/IPv6_integration branch wrt. main.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

…ectly from network packets

…k as they are not defined in kernel

tony-josi-aws · 2023-03-20T11:36:55Z

/bot run uncrustify

tony-josi-aws · 2023-03-20T11:55:31Z

/bot run uncrustify

tony-josi-aws · 2023-03-20T15:30:06Z

/bot run uncrustify

.github/workflows/ci.yml

source/FreeRTOS_DHCPv6.c

source/FreeRTOS_ND.c

tony-josi-aws · 2023-03-22T06:36:13Z

/bot run uncrustify

htibosch

Thank you Tony for this PR.
I only have some minor comments, mostly about printf() formats for logging and some casts.

source/FreeRTOS_DHCPv6.c

source/FreeRTOS_IP_Utils.c

source/include/FreeRTOS_Sockets.h

source/FreeRTOS_DNS_Parser.c

source/FreeRTOS_RA.c

source/FreeRTOS_IPv6.c

source/FreeRTOS_Routing.c

source/FreeRTOS_TCP_Transmission.c

tony-josi-aws · 2023-03-24T09:06:34Z

/bot run uncrustify

aggarg · 2023-03-24T11:22:09Z

source/FreeRTOS_DHCPv6.c

@@ -325,7 +325,7 @@ void vDHCPv6Process( BaseType_t xReset,
            }
            else
            {
-                FreeRTOS_printf( ( "vDHCPv6Process: malloc failed %u byt4es\n", sizeof( *pxEndPoint->pxDHCPMessage ) ) );
+                FreeRTOS_printf( ( "vDHCPv6Process: malloc failed %u bytes\n", ( unsigned ) sizeof( *pxEndPoint->pxDHCPMessage ) ) );


Just for consistency -

Suggested change

FreeRTOS_printf( ( "vDHCPv6Process: malloc failed %u bytes\n", ( unsigned ) sizeof( *pxEndPoint->pxDHCPMessage ) ) );

FreeRTOS_printf( ( "vDHCPv6Process: malloc failed %u bytes\n", ( unsigned int ) sizeof( *pxEndPoint->pxDHCPMessage ) ) );

aggarg · 2023-03-24T11:23:33Z

source/FreeRTOS_DNS_Parser.c

@@ -313,10 +313,9 @@
        xSet.usPortNumber = usPort;
        xSet.ppxLastAddress = &( xSet.pxLastAddress );

-        #if ( ipconfigUSE_LLMNR == 1 )


Would the right change be to replace #ifndef _lint with #if ( ipconfigUSE_LLMNR == 1 )?

aggarg · 2023-03-24T11:23:59Z

source/FreeRTOS_DNS_Parser.c

@@ -1043,6 +1045,11 @@
            NetworkEndPoint_t xEndPoint;
            BaseType_t xMustReply = pdFALSE;

+            /* Not used for now */
+            ( void ) uxBufferLength;
+            ( void ) uxBytesNeeded;


We can remove the local variables if they are not used.

aggarg · 2023-03-24T11:31:25Z

source/FreeRTOS_TCP_Utils_IPV6.c

@@ -56,6 +56,11 @@
    void prvSocketSetMSS_IPV6( FreeRTOS_Socket_t * pxSocket )
    {
        uint32_t ulMSS = ipconfigTCP_MSS;
+
+        #if ( ipconfigHAS_DEBUG_PRINTF == 1 )
+            char cBuffer[ 40 ];


Would cIPv6Address be a better name?

aggarg · 2023-03-24T11:35:25Z

source/include/FreeRTOS_IPv6.h

-
-#endif
-
+extern const struct xIPv6_Address FreeRTOS_in6addr_any;


aggarg · 2023-03-26T07:20:23Z

test/build-combination/Common/main.c

@@ -223,6 +232,17 @@ void vAssertCalled( const char * pcFile,
 }
 /*-----------------------------------------------------------*/

+void vLoggingPrintf( const char * pcFormat,


Is this still needed as configPRINTF is defined to empty?

aggarg · 2023-03-26T07:20:58Z

test/build-combination/Common/main.c

 void vAssertCalled( const char * pcFile,
-                    uint32_t ulLine )
+                    unsigned long ulLine )


Is this function needed given the configASEERT is not defined?

tony-josi-aws · 2023-03-26T08:52:11Z

/bot run uncrustify

…reeRTOS#803) * 556 Initial Cmake Module definition. FreeRTOS#557 * renaming variables that have conflicting names with MSC and *nix headers * fix build issue for posix port * Fix warning: -Waddress-of-packed-member when calculating checksum directly from network packets * fix warnings with prvInitialiseTCPFields declaration * removing macros that hides the structure fields * Updating build check enable all config to enable all config macros * CMake: Fix GIT_REPOSITORY and GIT_TAG (FreeRTOS#742) * moving ipTRUE_BOOL and ipFALSE_BOOL out of #ifndef pdTRUE_SIGNED check as they are not defined in kernel * minor fix to the cmake files and main file * Uncrustify: triggered by comment. * adding doxygen comments to new functions * Uncrustify: triggered by comment * Add more warnings check and fix warnings * Uncrustify: triggered by comment * fix review feedback and more debug printf warnings fix * more warnings fix * fix misra issues * Uncrustify: triggered by comment * replace sin_addr with sin_address.ulIP_IPv4 in +TCP demos * replace sin_addr6 with sin_address.xIP_IPv6 in +TCP demos * replace freertos_sockaddr6 with freertos_sockaddr in +TCP demos * review feedback changes * removing duplicate def for prvStreamBufferAdd from winpcap * fix more warnings from MSVC * Uncrustify: triggered by comment * review feedback changes * Uncrustify: triggered by comment --------- Co-authored-by: phelter <[email protected]> Co-authored-by: Nikhil Kamath <[email protected]> Co-authored-by: GitHub Action <[email protected]>

phelter and others added 7 commits March 20, 2023 16:09

556 Initial Cmake Module definition. FreeRTOS#557

990c0f8

renaming variables that have conflicting names with MSC and *nix headers

5bf02aa

fix build issue for posix port

6ae9519

Fix warning: -Waddress-of-packed-member when calculating checksum dir…

21018cc

…ectly from network packets

fix warnings with prvInitialiseTCPFields declaration

28b91b7

removing macros that hides the structure fields

c9305da

Updating build check enable all config to enable all config macros

6020036

tony-josi-aws requested a review from a team as a code owner March 20, 2023 10:51

CMake: Fix GIT_REPOSITORY and GIT_TAG (FreeRTOS#742)

12256f0

tony-josi-aws force-pushed the cpick_main_cmake_changes_v3 branch from 6625e59 to 12256f0 Compare March 20, 2023 11:03

tony-josi-aws added 2 commits March 20, 2023 16:46

moving ipTRUE_BOOL and ipFALSE_BOOL out of #ifndef pdTRUE_SIGNED chec…

26cc247

…k as they are not defined in kernel

minor fix to the cmake files and main file

4f2344d

actions-user and others added 2 commits March 20, 2023 11:37

Uncrustify: triggered by comment.

702d44a

adding doxygen comments to new functions

58c18fa

Uncrustify: triggered by comment

edec1c9

tony-josi-aws force-pushed the cpick_main_cmake_changes_v3 branch from 8bbe140 to edec1c9 Compare March 20, 2023 11:56

Add more warnings check and fix warnings

a98682b

Uncrustify: triggered by comment

65d7121

tony-josi-aws force-pushed the cpick_main_cmake_changes_v3 branch from b22c45c to 65d7121 Compare March 20, 2023 15:33

ActoryOu requested changes Mar 22, 2023

View reviewed changes

.github/workflows/ci.yml Show resolved Hide resolved

source/FreeRTOS_DHCPv6.c Outdated Show resolved Hide resolved

source/FreeRTOS_ND.c Outdated Show resolved Hide resolved

tony-josi-aws added 3 commits March 22, 2023 11:02

fix review feedback and more debug printf warnings fix

9fa03fd

more warnings fix

de51dc4

fix misra issues

958e3d4

Uncrustify: triggered by comment

e0b9162

tony-josi-aws force-pushed the cpick_main_cmake_changes_v3 branch from 07f3255 to e0b9162 Compare March 22, 2023 06:38

replace sin_addr with sin_address.ulIP_IPv4 in +TCP demos

d44c846

tony-josi-aws added 2 commits March 23, 2023 12:08

replace sin_addr6 with sin_address.xIP_IPv6 in +TCP demos

0180c4b

replace freertos_sockaddr6 with freertos_sockaddr in +TCP demos

fb91aa5

ActoryOu approved these changes Mar 23, 2023

View reviewed changes

htibosch approved these changes Mar 23, 2023

View reviewed changes

tony-josi-aws added 3 commits March 23, 2023 17:59

review feedback changes

68b1dc2

removing duplicate def for prvStreamBufferAdd from winpcap

f34c139

fix more warnings from MSVC

38ad56c

Uncrustify: triggered by comment

c5dc60d

tony-josi-aws force-pushed the cpick_main_cmake_changes_v3 branch from a4f9a46 to c5dc60d Compare March 24, 2023 09:08

aggarg reviewed Mar 26, 2023

View reviewed changes

review feedback changes

ce53662

Uncrustify: triggered by comment

6e056ee

tony-josi-aws force-pushed the cpick_main_cmake_changes_v3 branch from 7417153 to 6e056ee Compare March 26, 2023 08:56

aggarg approved these changes Mar 27, 2023

View reviewed changes

tony-josi-aws merged commit 8926945 into FreeRTOS:dev/IPv6_integration Mar 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CMake changes from main branch [PR: #557, PR: #742] #803

CMake changes from main branch [PR: #557, PR: #742] #803

tony-josi-aws commented Mar 20, 2023 •

edited

Loading

tony-josi-aws commented Mar 20, 2023

tony-josi-aws commented Mar 20, 2023

tony-josi-aws commented Mar 20, 2023

tony-josi-aws commented Mar 22, 2023

htibosch left a comment •

edited

Loading

tony-josi-aws commented Mar 24, 2023

aggarg Mar 24, 2023

aggarg Mar 24, 2023

aggarg Mar 24, 2023

aggarg Mar 24, 2023

aggarg Mar 24, 2023

aggarg Mar 26, 2023

aggarg Mar 26, 2023

tony-josi-aws commented Mar 26, 2023

	FreeRTOS_printf( ( "vDHCPv6Process: malloc failed %u bytes\n", ( unsigned ) sizeof( *pxEndPoint->pxDHCPMessage ) ) );
	FreeRTOS_printf( ( "vDHCPv6Process: malloc failed %u bytes\n", ( unsigned int ) sizeof( *pxEndPoint->pxDHCPMessage ) ) );


		#endif

		extern const struct xIPv6_Address FreeRTOS_in6addr_any;

CMake changes from main branch [PR: #557, PR: #742] #803

CMake changes from main branch [PR: #557, PR: #742] #803

Conversation

tony-josi-aws commented Mar 20, 2023 • edited Loading

Description

Checklist:

Related Issue

tony-josi-aws commented Mar 20, 2023

tony-josi-aws commented Mar 20, 2023

tony-josi-aws commented Mar 20, 2023

tony-josi-aws commented Mar 22, 2023

htibosch left a comment • edited Loading

Choose a reason for hiding this comment

tony-josi-aws commented Mar 24, 2023

aggarg Mar 24, 2023

Choose a reason for hiding this comment

aggarg Mar 24, 2023

Choose a reason for hiding this comment

aggarg Mar 24, 2023

Choose a reason for hiding this comment

aggarg Mar 24, 2023

Choose a reason for hiding this comment

aggarg Mar 24, 2023

Choose a reason for hiding this comment

aggarg Mar 26, 2023

Choose a reason for hiding this comment

aggarg Mar 26, 2023

Choose a reason for hiding this comment

tony-josi-aws commented Mar 26, 2023

tony-josi-aws commented Mar 20, 2023 •

edited

Loading

htibosch left a comment •

edited

Loading