Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(network): fixes a macro name conflict warning #11068

Merged
merged 3 commits into from
Mar 10, 2025
Merged

fix(network): fixes a macro name conflict warning #11068

merged 3 commits into from
Mar 10, 2025

Conversation

SuGlider
Copy link
Collaborator

@SuGlider SuGlider commented Mar 10, 2025 •
edited
Loading

Description of Change

Fixes a simple macro name conflict warning message:

IDF 5.3+ declares:

#define IN6_IS_ADDR_V4MAPPED(a)     ip6_addr_isipv4mappedipv6((ip6_addr_t*)(a))
#define ip6_addr_isipv4mappedipv6(ip6addr) (((ip6addr)->addr[0] == 0) && ((ip6addr)->addr[1] == 0) && (((ip6addr)->addr[2]) == PP_HTONL(0x0000FFFFUL)))

libraries/Network/src/NetworkClient.cpp declares:

#define _IN6_IS_ADDR_V4MAPPED(a) ((((__const uint32_t *)(a))[0] == 0) && (((__const uint32_t *)(a))[1] == 0) && (((__const uint32_t *)(a))[2] == htonl(0xffff)))

Therefore, both should be the same.

Warning message:

\libraries\Network\src\NetworkClient.cpp:26:9: warning: "IN6_IS_ADDR_V4MAPPED" redefined
   26 | #define IN6_IS_ADDR_V4MAPPED(a) ((((__const uint32_t *)(a))[0] == 0) && (((__const uint32_t *)(a))[1] == 0) && (((__const uint32_t *)(a))[2] == htonl(0xffff)))
      |         ^~~~~~~~~~~~~~~~~~~~
In file included from \tools\esp32-arduino-libs\esp32/include/lwip/lwip/src/include/lwip/sockets.h:53,
                 from \tools\esp32-arduino-libs\esp32/include/lwip/include/lwip/sockets.h:8,
                 from \libraries\Network\src\NetworkClient.cpp:22:
\tools\esp32-arduino-libs\esp32/include/lwip/lwip/src/include/lwip/inet.h:133:9: note: this is the location of the previous definition
  133 | #define IN6_IS_ADDR_V4MAPPED(a)     ip6_addr_isipv4mappedipv6((ip6_addr_t*)(a))
      |         ^~~~~~~~~~~~~~~~~~~~

Tests scenarios

CI only

Related links

None

@SuGlider SuGlider added this to the 3.2.0 milestone Mar 10, 2025
@SuGlider SuGlider self-assigned this Mar 10, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 10, 2025 •
edited
Loading

Messages
📖 🎉 Good Job! All checks are passing!

👋 Hello SuGlider, we appreciate your contribution to this project!

📘 Please review the project's Contributions Guide for key guidelines on code, documentation, testing, and more.
🖊️ Please also make sure you have read and signed the Contributor License Agreement for this project.
Click to see more instructions ...


This automated output is generated by the PR linter DangerJS, which checks if your Pull Request meets the project's requirements and helps you fix potential issues.

DangerJS is triggered with each push event to a Pull Request and modify the contents of this comment.

Please consider the following:
- Danger mainly focuses on the PR structure and formatting and can't understand the meaning behind your code or changes.
- Danger is not a substitute for human code reviews; it's still important to request a code review from your colleagues.
- To manually retry these Danger checks, please navigate to the Actions tab and re-run last Danger workflow.

Review and merge process you can expect ...


We do welcome contributions in the form of bug reports, feature requests and pull requests.

1. An internal issue has been created for the PR, we assign it to the relevant engineer.
2. They review the PR and either approve it or ask you for changes or clarifications.
3. Once the GitHub PR is approved we do the final review, collect approvals from core owners and make sure all the automated tests are passing.
- At this point we may do some adjustments to the proposed change, or extend it by adding tests or documentation.
4. If the change is approved and passes the tests it is merged into the default branch.

Generated by 🚫 dangerJS against 3ccd8ed

@SuGlider
Copy link
Collaborator Author

@me-no-dev - I just researched about this macro. The IDF one seems to be the same. We could just remove the library declaration. Look at the edited PR description. Let me know what would be best.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 10, 2025 •
edited
Loading

Test Results

 76 files   76 suites   12m 40s ⏱️
 38 tests  38 ✅ 0 💤 0 ❌
241 runs  241 ✅ 0 💤 0 ❌

Results for commit 3ccd8ed.

♻️ This comment has been updated with latest results.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 10, 2025 •
edited
Loading

Memory usage test (comparing PR against master branch)

The table below shows the summary of memory usage change (decrease - increase) in bytes and percentage for each target.

MemoryFLASH [bytes]FLASH [%]RAM [bytes]RAM [%]
TargetDECINCDECINCDECINCDECINC
ESP32P40⚠️ +2860.00⚠️ +0.04000.000.00
ESP32S30⚠️ +5160.00⚠️ +0.05000.000.00
ESP32S20⚠️ +5400.00⚠️ +0.06000.000.00
ESP32C30⚠️ +4980.00⚠️ +0.05000.000.00
ESP32C60⚠️ +5320.00⚠️ +0.06000.000.00
ESP32H2000.000.00000.000.00
ESP320⚠️ +5720.00⚠️ +0.06000.000.00
Click to expand the detailed deltas report [usage change in BYTES]
TargetESP32P4ESP32S3ESP32S2ESP32C3ESP32C6ESP32H2ESP32
ExampleFLASHRAMFLASHRAMFLASHRAMFLASHRAMFLASHRAMFLASHRAMFLASHRAM
Ethernet/examples/ETH_TLK110⚠️ +40----------⚠️ +800
Ethernet/examples/ETH_W5500_Arduino_SPI00⚠️ +840⚠️ +840000000⚠️ +840
Ethernet/examples/ETH_W5500_IDF_SPI00⚠️ +840⚠️ +840000000⚠️ +840
Ethernet/examples/ETH_WIFI_BRIDGE⚠️ +2740⚠️ +5160⚠️ +5400⚠️ +4940⚠️ +5160--⚠️ +5720
NetworkClientSecure/examples/WiFiClientInsecure⚠️ +2740⚠️ +4280⚠️ +4520⚠️ +4940⚠️ +5160--⚠️ +4880
NetworkClientSecure/examples/WiFiClientPSK⚠️ +2740⚠️ +4280⚠️ +4640⚠️ +4940⚠️ +5160--⚠️ +4880
NetworkClientSecure/examples/WiFiClientSecure⚠️ +2740⚠️ +4320⚠️ +4520⚠️ +4940⚠️ +5160--⚠️ +4880
NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade⚠️ +2760⚠️ +3880⚠️ +4680⚠️ +4940⚠️ +5180--⚠️ +4960
NetworkClientSecure/examples/WiFiClientShowPeerCredentials⚠️ +2820⚠️ +4320⚠️ +4640⚠️ +4960⚠️ +5180--⚠️ +4960
NetworkClientSecure/examples/WiFiClientTrustOnFirstUse⚠️ +2820⚠️ +4320⚠️ +4520⚠️ +4940⚠️ +5200--⚠️ +4800
PPP/examples/PPP_Basic00000000000000
PPP/examples/PPP_WIFI_BRIDGE⚠️ +2740⚠️ +4480⚠️ +4360⚠️ +4940⚠️ +5160--⚠️ +4840
WebServer/examples/AdvancedWebServer⚠️ +2840⚠️ +4440⚠️ +4520⚠️ +4940⚠️ +5180--⚠️ +4800
WebServer/examples/FSBrowser⚠️ +2820⚠️ +4400⚠️ +4560⚠️ +4940⚠️ +5160--⚠️ +4800
WebServer/examples/Filters⚠️ +2820⚠️ +4640⚠️ +4560⚠️ +4940⚠️ +5160--⚠️ +4800
WebServer/examples/HelloServer⚠️ +2820⚠️ +4320⚠️ +4600⚠️ +4940⚠️ +5160--⚠️ +4840
WebServer/examples/HttpAdvancedAuth⚠️ +2760⚠️ +4080⚠️ +4640⚠️ +4960⚠️ +5160--⚠️ +4880
WebServer/examples/HttpAuthCallback⚠️ +2780⚠️ +4360⚠️ +4640⚠️ +4980⚠️ +5180--⚠️ +4880
WebServer/examples/HttpAuthCallbackInline⚠️ +2740⚠️ +4080⚠️ +4640⚠️ +4940⚠️ +5160--⚠️ +4880
WebServer/examples/HttpBasicAuth⚠️ +2760⚠️ +4400⚠️ +4800⚠️ +4960⚠️ +5160--⚠️ +4880
WebServer/examples/HttpBasicAuthSHA1⚠️ +2760⚠️ +4360⚠️ +4600⚠️ +4940⚠️ +5160--⚠️ +4840
WebServer/examples/HttpBasicAuthSHA1orBearerToken⚠️ +2740⚠️ +4200⚠️ +4560⚠️ +4940⚠️ +5160--⚠️ +4840
WebServer/examples/MultiHomedServers⚠️ +2860⚠️ +4400⚠️ +4080⚠️ +4960⚠️ +5220--⚠️ +4760
WebServer/examples/PathArgServer⚠️ +2820⚠️ +4240⚠️ +4520⚠️ +4940⚠️ +5320--⚠️ +4920
WebServer/examples/SDWebServer⚠️ +2820⚠️ +4440⚠️ +4640⚠️ +4940⚠️ +5160--⚠️ +4880
WebServer/examples/SimpleAuthentification⚠️ +2740⚠️ +4320⚠️ +4480⚠️ +4960⚠️ +5160--⚠️ +5160
WebServer/examples/UploadHugeFile⚠️ +2820⚠️ +4360⚠️ +4520⚠️ +4940⚠️ +5320--⚠️ +4880
WebServer/examples/WebServer⚠️ +2820⚠️ +4440⚠️ +4600⚠️ +4940⚠️ +5160--⚠️ +4880
WebServer/examples/WebUpdate⚠️ +2740⚠️ +4360⚠️ +4400⚠️ +4960⚠️ +5160--⚠️ +4960
WiFi/examples/FTM/FTM_Initiator⚠️ +2760⚠️ +4320⚠️ +4480⚠️ +4940⚠️ +5180--⚠️ +4720
WiFi/examples/FTM/FTM_Responder⚠️ +2800⚠️ +4480⚠️ +4440⚠️ +4960⚠️ +5180--⚠️ +4920
WiFi/examples/SimpleWiFiServer⚠️ +2760⚠️ +4320⚠️ +4480⚠️ +4940⚠️ +5160--⚠️ +4960
WiFi/examples/WiFiAccessPoint⚠️ +2740⚠️ +4320⚠️ +4480⚠️ +4940⚠️ +5180--⚠️ +4960
WiFi/examples/WiFiClient⚠️ +2740⚠️ +4360⚠️ +4640⚠️ +4980⚠️ +5200--⚠️ +4920
WiFi/examples/WiFiClientBasic⚠️ +2760⚠️ +3800⚠️ +4560⚠️ +4960⚠️ +5200--⚠️ +4800
WiFi/examples/WiFiClientConnect⚠️ +2800⚠️ +4400⚠️ +4600⚠️ +4980⚠️ +5180--⚠️ +4960
WiFi/examples/WiFiClientEvents⚠️ +2780⚠️ +4320⚠️ +4560⚠️ +4940⚠️ +5180--⚠️ +4880
WiFi/examples/WiFiClientStaticIP⚠️ +2760⚠️ +4280⚠️ +4520⚠️ +4980⚠️ +5160--⚠️ +4840
WiFi/examples/WiFiExtender⚠️ +2800⚠️ +4400⚠️ +4520⚠️ +4960⚠️ +5180--⚠️ +4920
WiFi/examples/WiFiIPv6⚠️ +2820⚠️ +4360⚠️ +4200⚠️ +4940⚠️ +5160--⚠️ +4960
WiFi/examples/WiFiMulti⚠️ +2740⚠️ +4120⚠️ +4480⚠️ +4940⚠️ +5160--⚠️ +4920
WiFi/examples/WiFiMultiAdvanced⚠️ +2760⚠️ +4320⚠️ +4320⚠️ +4960⚠️ +5180--⚠️ +4800
WiFi/examples/WiFiScan⚠️ +2780⚠️ +4240⚠️ +4320⚠️ +4980⚠️ +5200--⚠️ +4880
WiFi/examples/WiFiScanAsync⚠️ +2780⚠️ +4280⚠️ +4480⚠️ +4940⚠️ +5180--⚠️ +4920
WiFi/examples/WiFiScanDualAntenna⚠️ +2760⚠️ +4400⚠️ +4640⚠️ +4940⚠️ +5180--⚠️ +4840
WiFi/examples/WiFiScanTime⚠️ +2740⚠️ +4240⚠️ +4560⚠️ +4940⚠️ +5180--⚠️ +4880
WiFi/examples/WiFiTelnetToSerial⚠️ +2780⚠️ +4400⚠️ +4480⚠️ +4960⚠️ +5180--⚠️ +4840
WiFi/examples/WiFiUDPClient⚠️ +2820⚠️ +4280⚠️ +4520⚠️ +4940⚠️ +5160--⚠️ +4800
NetworkClientSecure/examples/WiFiClientSecureEnterprise--⚠️ +4880⚠️ +4600⚠️ +4960⚠️ +5200--⚠️ +4880
WebServer/examples/Middleware--⚠️ +4440⚠️ +4720⚠️ +4940⚠️ +5160--⚠️ +4960
WiFi/examples/WPS--⚠️ +4240⚠️ +4600⚠️ +4940⚠️ +5180--⚠️ +4880
WiFi/examples/WiFiBlueToothSwitch--⚠️ +4320--⚠️ +4940⚠️ +5200--⚠️ +5040
WiFi/examples/WiFiClientEnterprise--⚠️ +4360⚠️ +4600⚠️ +4960⚠️ +5180--⚠️ +4880
WiFi/examples/WiFiSmartConfig--⚠️ +4400⚠️ +4560⚠️ +4940⚠️ +5200--⚠️ +4840
Ethernet/examples/ETH_LAN8720------------⚠️ +800

@SuGlider SuGlider added the Status: Review needed Issue or PR is awaiting review label Mar 10, 2025
@me-no-dev me-no-dev added Status: Pending Merge Pull Request is ready to be merged and removed Status: Review needed Issue or PR is awaiting review Status: Pending Merge Pull Request is ready to be merged labels Mar 10, 2025
@SuGlider SuGlider added the Status: Review needed Issue or PR is awaiting review label Mar 10, 2025
@SuGlider SuGlider requested a review from me-no-dev March 10, 2025 19:44
@me-no-dev me-no-dev added Status: Pending Merge Pull Request is ready to be merged and removed Status: Review needed Issue or PR is awaiting review labels Mar 10, 2025
@me-no-dev me-no-dev merged commit e8a243c into master Mar 10, 2025
71 checks passed
@me-no-dev me-no-dev deleted the fix/network_warning branch March 10, 2025 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@me-no-dev me-no-dev me-no-dev approved these changes

@P-R-O-C-H-Y P-R-O-C-H-Y P-R-O-C-H-Y approved these changes

@lucasssvaz lucasssvaz Awaiting requested review from lucasssvaz

Assignees

@SuGlider SuGlider

Labels
Status: Pending Merge Pull Request is ready to be merged
Projects
Arduino ESP32 Core Project Roadmap
Status: Done
Milestone
3.2.0
Development

Successfully merging this pull request may close these issues.
3 participants
@SuGlider @me-no-dev @P-R-O-C-H-Y