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.

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

Make netfilter constants available for musl Linux targets #2152

Merged
merged 2 commits into from
Apr 30, 2021

Conversation

pulsastrix
Copy link
Contributor

The netfilter constants added in #911 and #926 are currently only available for Linux targets using glibc because they weren't available in the musl-sanitized kernel headers at the time these PRs were made.

With current versions of the sanitized headers, these constants are available, and this PR moves them to unix/linux_like/linux/mod.rs so that they can be used on targets using musl libc.

The kernel header version currently set in ci/install_musl.sh already supports these constants, but has different values for e.g. NFT_TABLE_MAXNAMELEN than the ones that were already defined for glibc. It seems like the maximum name length for various netfilter objects has been changed in the kernel (the respective commits are 1 2 3 and 4). To match these values with the ones that were already defined, this PR also updates the used kernel header version in ci/install_musl.sh.

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Amanieu (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@JohnTitor
Copy link
Member

Any reason to mark this PR as WIP?

@pulsastrix
Copy link
Contributor Author

Not really, I'll mark it as ready.

@pulsastrix pulsastrix marked this pull request as ready for review April 30, 2021 06:43
@JohnTitor
Copy link
Member

Thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Apr 30, 2021

📌 Commit bf8378b has been approved by JohnTitor

@bors
Copy link
Contributor

bors commented Apr 30, 2021

⌛ Testing commit bf8378b with merge 802f327...

@bors
Copy link
Contributor

bors commented Apr 30, 2021

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: JohnTitor
Pushing 802f327 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants