Conditionally include linux/udp.h #2894
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Motivation: To enable access to `UDP_MAX_SEGMENTS` we switched from including `netinet/udp.h` to including `linux/udp.h` however the latter isn't available in MUSL. Modifications: if `linux/udp.h` is available then import it in favor of `netinet/udp.h`. If we fall back to the latter then `UDP_MAX_SEGMENTS` won't be defined but that will be caught by the existing paths which account for this case. Result: NIO should be able to build against a static MUSL SDK again.
Lukasa
approved these changes
Sep 20, 2024
|
This should help with part of #2893 |
|
Confirmed... |
cgrindel-self-hosted-renovate bot
referenced
this pull request
in cgrindel/rules_swift_package_manager
Sep 25, 2024
This PR contains the following updates: | Package | Update | Change | |---|---|---| | [apple/swift-nio](https://github.com/apple/swift-nio) | minor | `2.72.0` -> `2.73.0` | --- ### Release Notes <details> <summary>apple/swift-nio (apple/swift-nio)</summary> ### [`v2.73.0`](https://github.com/apple/swift-nio/releases/tag/2.73.0) [Compare Source](https://github.com/apple/swift-nio/compare/2.72.0...2.73.0) <!-- Release notes generated using configuration in .github/release.yml at main --> #### What's Changed ##### SemVer Minor - Make `ByteBuffer`'s description more useful by [@​supersonicbyte](https://github.com/supersonicbyte) in [https://github.com/apple/swift-nio/pull/2864](https://github.com/apple/swift-nio/pull/2864) - Expose `UDP_MAX_SEGMENTS` via System by [@​rnro](https://github.com/rnro) in [https://github.com/apple/swift-nio/pull/2891](https://github.com/apple/swift-nio/pull/2891) - Add new `ChannelOption` to get the amount of buffered outbound data in the Channel by [@​johnnzhou](https://github.com/johnnzhou) in [https://github.com/apple/swift-nio/pull/2849](https://github.com/apple/swift-nio/pull/2849) - Add an `AcceptBackoffHandler` to the async server bootstraps by [@​FranzBusch](https://github.com/FranzBusch) in [https://github.com/apple/swift-nio/pull/2782](https://github.com/apple/swift-nio/pull/2782) ##### SemVer Patch - Adding a nicer description for `WebSocketFrame` by [@​supersonicbyte](https://github.com/supersonicbyte) in [https://github.com/apple/swift-nio/pull/2862](https://github.com/apple/swift-nio/pull/2862) - Improving `description` and adding `debugDescription` to `NIOAny` by [@​supersonicbyte](https://github.com/supersonicbyte) in [https://github.com/apple/swift-nio/pull/2866](https://github.com/apple/swift-nio/pull/2866) - Make FileChunk sendable by [@​ali-ahsan-ali](https://github.com/ali-ahsan-ali) in [https://github.com/apple/swift-nio/pull/2871](https://github.com/apple/swift-nio/pull/2871) - Make `ByteBuffer.debugDescription` suitable for structural display by [@​dnadoba](https://github.com/dnadoba) in [https://github.com/apple/swift-nio/pull/2495](https://github.com/apple/swift-nio/pull/2495) - Add support for WASILibc by [@​MaxDesiatov](https://github.com/MaxDesiatov) in [https://github.com/apple/swift-nio/pull/2671](https://github.com/apple/swift-nio/pull/2671) - `NIOSingleStepByteToMessageDecoder` reentrancy safety by [@​rnro](https://github.com/rnro) in [https://github.com/apple/swift-nio/pull/2881](https://github.com/apple/swift-nio/pull/2881) - Adopt `NIOThrowingAsyncSequenceProducer` by [@​rnro](https://github.com/rnro) in [https://github.com/apple/swift-nio/pull/2879](https://github.com/apple/swift-nio/pull/2879) - Clamp buffer to maximum upon large write operation by [@​ali-ahsan-ali](https://github.com/ali-ahsan-ali) in [https://github.com/apple/swift-nio/pull/2745](https://github.com/apple/swift-nio/pull/2745) - Revert "Adopt `NIOThrowingAsyncSequenceProducer` ([#​2879](https://github.com/apple/swift-nio/issues/2879))" by [@​rnro](https://github.com/rnro) in [https://github.com/apple/swift-nio/pull/2892](https://github.com/apple/swift-nio/pull/2892) - Add concrete description for `EmbeddedEventLoop` by [@​aryan-25](https://github.com/aryan-25) in [https://github.com/apple/swift-nio/pull/2890](https://github.com/apple/swift-nio/pull/2890) - Conditionally include linux/udp.h by [@​rnro](https://github.com/rnro) in [https://github.com/apple/swift-nio/pull/2894](https://github.com/apple/swift-nio/pull/2894) - Work around a type checking error when using the Static Linux SDK by [@​euanh](https://github.com/euanh) in [https://github.com/apple/swift-nio/pull/2898](https://github.com/apple/swift-nio/pull/2898) ##### Other Changes - \[CI] Run tests on push to main by [@​FranzBusch](https://github.com/FranzBusch) in [https://github.com/apple/swift-nio/pull/2868](https://github.com/apple/swift-nio/pull/2868) - \[CI] License header support `.in` and `.cmake` files by [@​FranzBusch](https://github.com/FranzBusch) in [https://github.com/apple/swift-nio/pull/2870](https://github.com/apple/swift-nio/pull/2870) - Include nanoseconds in assertion of timestamp for NIOFileSystem tests by [@​gjcairo](https://github.com/gjcairo) in [https://github.com/apple/swift-nio/pull/2869](https://github.com/apple/swift-nio/pull/2869) - Correct the link of sswg-security at SECURITY.md by [@​lamtrinhdev](https://github.com/lamtrinhdev) in [https://github.com/apple/swift-nio/pull/2872](https://github.com/apple/swift-nio/pull/2872) - Speculative fix for flakey AsyncTestingEventLoop test by [@​simonjbeaumont](https://github.com/simonjbeaumont) in [https://github.com/apple/swift-nio/pull/2873](https://github.com/apple/swift-nio/pull/2873) - ci: Install shellcheck if not present in CI runner by [@​simonjbeaumont](https://github.com/simonjbeaumont) in [https://github.com/apple/swift-nio/pull/2882](https://github.com/apple/swift-nio/pull/2882) - ci: Use ${GITHUB_BASE_REF} as treeish for checking API break by [@​simonjbeaumont](https://github.com/simonjbeaumont) in [https://github.com/apple/swift-nio/pull/2883](https://github.com/apple/swift-nio/pull/2883) - ci: Refer to nested reusable workflows using remote variant by [@​simonjbeaumont](https://github.com/simonjbeaumont) in [https://github.com/apple/swift-nio/pull/2884](https://github.com/apple/swift-nio/pull/2884) - \[CI] Fix pull request label workflow by [@​FranzBusch](https://github.com/FranzBusch) in [https://github.com/apple/swift-nio/pull/2885](https://github.com/apple/swift-nio/pull/2885) #### New Contributors - [@​ali-ahsan-ali](https://github.com/ali-ahsan-ali) made their first contribution in [https://github.com/apple/swift-nio/pull/2871](https://github.com/apple/swift-nio/pull/2871) - [@​aryan-25](https://github.com/aryan-25) made their first contribution in [https://github.com/apple/swift-nio/pull/2890](https://github.com/apple/swift-nio/pull/2890) - [@​johnnzhou](https://github.com/johnnzhou) made their first contribution in [https://github.com/apple/swift-nio/pull/2849](https://github.com/apple/swift-nio/pull/2849) - [@​euanh](https://github.com/euanh) made their first contribution in [https://github.com/apple/swift-nio/pull/2898](https://github.com/apple/swift-nio/pull/2898) **Full Changelog**: apple/swift-nio@2.72.0...2.73.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC45NC4xIiwidXBkYXRlZEluVmVyIjoiMzguOTQuMSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Co-authored-by: cgrindel-self-hosted-renovate[bot] <139595543+cgrindel-self-hosted-renovate[bot]@users.noreply.github.com>
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
To enable access to
UDP_MAX_SEGMENTSwe switched from includingnetinet/udp.hto includinglinux/udp.hhowever the latter isn't available in MUSL.Modifications:
if
linux/udp.his available then import it in favor ofnetinet/udp.h. If we fall back to the latter thenUDP_MAX_SEGMENTSwon't be defined but that will be caught by the existing paths which account for this case.Result:
NIO should be able to build against a static MUSL SDK again.