Skip to content

[common] move include of byteswap.hpp into source #2977

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

Irving-cl
Copy link
Contributor

This PR moves the include of byteswap.hpp from types.hpp to types.cpp.

Recently I met a build issue on CI on MacOS (with my code change): Failed Run

FAILED: [code=1] tests/gtest/CMakeFiles/otbr-gtest-telemetry.dir/__/__/src/host/telemetry_retriever_border_agent.cpp.o 
/Applications/Xcode_15.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -DOTBR_ENABLE_BORDER_ROUTING=1 -DOTBR_ENABLE_BORDER_ROUTING_COUNTERS=1 -DOTBR_ENABLE_DHCP6_PD=0 -DOTBR_ENABLE_DNSSD_PLAT=0 -DOTBR_ENABLE_EPSKC=1 -DOTBR_ENABLE_FEATURE_FLAGS=1 -DOTBR_ENABLE_LINK_METRICS_TELEMETRY=1 -DOTBR_ENABLE_NAT64=0 -DOTBR_ENABLE_NOTIFY_UPSTART=1 -DOTBR_ENABLE_POWER_CALIBRATION=1 -DOTBR_ENABLE_PUBLISH_MESHCOP_BA_ID=1 -DOTBR_ENABLE_REST_SERVER=1 -DOTBR_ENABLE_TELEMETRY_DATA_API=1 -DOTBR_ENABLE_UNSECURE_JOIN=1 -DOTBR_ENABLE_VENDOR_INFRA_LINK_SELECT=0 -DOTBR_MESHCOP_SERVICE_INSTANCE_NAME="\"OpenThread BorderRouter\"" -DOTBR_PACKAGE_NAME=\"OpenThread_BorderRouter\" -DOTBR_PACKAGE_VERSION=\"0.3.0-f4c013e\" -DOTBR_PRODUCT_NAME=\"BorderRouter\" -DOTBR_SYSLOG_FACILITY_ID=LOG_USER -DOTBR_VENDOR_NAME=\"OpenThread\" -I/Users/runner/work/ot-br-posix/ot-br-posix/include -I/Users/runner/work/ot-br-posix/ot-br-posix/src -I/Users/runner/work/ot-br-posix/ot-br-posix/third_party/openthread/repo/include -I/Users/runner/work/ot-br-posix/ot-br-posix/third_party/openthread/repo/tests/gtest -I/Users/runner/work/ot-br-posix/ot-br-posix/build/src -isystem /opt/homebrew/opt/protobuf@21/include -isystem /opt/homebrew/include -g -std=c++17 -arch arm64 -isysroot /Applications/Xcode_15.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.5.sdk -Wall -Wextra -Werror -Wfatal-errors -Wuninitialized -Wno-missing-braces -DOTBR_ENABLE_TELEMETRY_DATA_API=1 -DOTBR_ENABLE_BORDER_AGENT=1 -MD -MT tests/gtest/CMakeFiles/otbr-gtest-telemetry.dir/__/__/src/host/telemetry_retriever_border_agent.cpp.o -MF tests/gtest/CMakeFiles/otbr-gtest-telemetry.dir/__/__/src/host/telemetry_retriever_border_agent.cpp.o.d -o tests/gtest/CMakeFiles/otbr-gtest-telemetry.dir/__/__/src/host/telemetry_retriever_border_agent.cpp.o -c /Users/runner/work/ot-br-posix/ot-br-posix/src/host/telemetry_retriever_border_agent.cpp
In file included from /Users/runner/work/ot-br-posix/ot-br-posix/src/host/telemetry_retriever_border_agent.cpp:40:
In file included from /Users/runner/work/ot-br-posix/ot-br-posix/src/common/logging.hpp:47:
In file included from /Users/runner/work/ot-br-posix/ot-br-posix/src/common/types.hpp:48:
/Users/runner/work/ot-br-posix/ot-br-posix/src/common/byteswap.hpp:41:9: fatal error: 'bswap_16' macro redefined [-Wmacro-redefined]
#define bswap_16 OSSwapInt16
        ^
/opt/homebrew/opt/protobuf@21/include/google/protobuf/stubs/port.h:247:9: note: previous definition is here
#define bswap_16(x) OSSwapInt16(x)

The cause is that the protobuf header and byteswap.hpp has re-definition. types.hpp is widely included by sources in otbr-agent while byteswap.hpp is only used by some implementations of types.hpp. So we can move the usage of byteswap.hpp into types.cpp to solve this issue.

@Irving-cl Irving-cl requested a review from abtink July 30, 2025 11:55
Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Summary of Changes

Hello @Irving-cl, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a critical build failure on macOS CI environments, which stemmed from a macro redefinition conflict between the project's byteswap.hpp and the protobuf library. The primary solution involves optimizing header inclusion by relocating the byteswap.hpp include from a widely used header file (types.hpp) to its corresponding source file (types.cpp), where its functionality is actually implemented and required. This change not only resolves the compilation issue but also introduces a new utility method for Ip6Address within types.cpp.

Highlights

  • Build Fix & Header Optimization: I've resolved a bswap_16 macro redefinition error that was occurring on macOS CI environments. This was achieved by moving the #include "common/byteswap.hpp" directive from src/common/types.hpp to src/common/types.cpp. This ensures that byteswap.hpp is only included where its functions are directly used, preventing conflicts with other libraries like Protobuf that might define similar macros.
  • IPv6 Address Utility: I've added an IsLinkLocal method to the Ip6Address class within src/common/types.cpp. This new method allows for checking if an IPv6 address falls within the link-local prefix (fe80::/10).
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments or fill out our survey to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request moves the include of byteswap.hpp from types.hpp to types.cpp to resolve a macro redefinition issue on macOS. My feedback focuses on improving the clarity of the newly-exposed IsLinkLocal function by using a more idiomatic approach for endianness conversion and recommends adding unit tests to ensure its correctness.

@Irving-cl Irving-cl force-pushed the refine_common_types branch from 6ee6d63 to a9e88e5 Compare July 30, 2025 12:03
Copy link

codecov bot commented Jul 30, 2025

Codecov Report

❌ Patch coverage is 25.00000% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 42.00%. Comparing base (2b41187) to head (7b338c8).
⚠️ Report is 1165 commits behind head on main.

Files with missing lines Patch % Lines
src/common/types.cpp 25.00% 3 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##             main    #2977       +/-   ##
===========================================
- Coverage   55.77%   42.00%   -13.78%     
===========================================
  Files          87      115       +28     
  Lines        6890    14064     +7174     
  Branches        0      961      +961     
===========================================
+ Hits         3843     5907     +2064     
- Misses       3047     7859     +4812     
- Partials        0      298      +298     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@Irving-cl Irving-cl force-pushed the refine_common_types branch 2 times, most recently from 267537e to fa3ee87 Compare July 31, 2025 01:59
@Irving-cl Irving-cl force-pushed the refine_common_types branch from fa3ee87 to 7b338c8 Compare July 31, 2025 02:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant