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

feat: add missing netfilter consts #3734

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Conversation

my4ng
Copy link
Contributor

@my4ng my4ng commented Jun 5, 2024

This PR adds some missing netfilter constants from:

  • linux/netfilter.h
  • linux/netfilter_arp.h
  • linux/netfilter_bridge.h
  • linux/netfilter_ipv4.h
  • linux/netfilter_ipv6.h

Unresolved questions:

  • NF_NETDEV_NUMHOOKS and NF_NETDEV_INGRESS were not moved from semver/linux-gnu.txt to semver/linux.txt during Make netfilter constants available for musl Linux targets #2152. Should that be rectified now?
  • NF_NETDEV_NUMHOOKS value was changed from 1 to 2 in linux kernel 5.16 (torvalds/linux@42df6e1) and hence some workaround was added to libc_test/build.rs:
    | "NF_NETDEV_NUMHOOKS"
    "NF_NETDEV_NUMHOOKS" => true,
    Is it OK to chnage them to 2 now and remove those lines or do we have to maintain some level of backwards-compatibility?
  • Similarly, what about new constants introduced later, e.g. NF_IP_PRI_RAW_BEFORE_DEFRAG introduced in 5.10?

@rustbot
Copy link
Collaborator

rustbot commented Jun 5, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@my4ng my4ng force-pushed the netfilter branch 2 times, most recently from 4cf7257 to 7ab2bdf Compare June 5, 2024 09:48
@JohnTitor JohnTitor added this pull request to the merge queue Jun 8, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jun 8, 2024
@my4ng my4ng requested a review from JohnTitor June 19, 2024 16:08
@tgross35 tgross35 added this pull request to the merge queue Aug 12, 2024
Merged via the queue into rust-lang:main with commit d1df54e Aug 12, 2024
41 checks passed
@tgross35 tgross35 added stable-nominated This PR should be considered for cherry-pick to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Aug 12, 2024
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Nov 17, 2024
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
(backport <rust-lang#3734>)
(cherry picked from commit 7000471)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
(backport <rust-lang#3734>)
(cherry picked from commit 7000471)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Nov 17, 2024
(backport <rust-lang#3734>)
(cherry picked from commit 7000471)
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Nov 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants