Skip to content

Add additional Linux AF_PACKET options #3530

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
Merged
merged 1 commit into from
Jan 11, 2024
Merged

Add additional Linux AF_PACKET options #3530

merged 1 commit into from
Jan 11, 2024

Conversation

nathaniel-bennett
Copy link
Contributor

Added socket options, structs and other miscellaneous constants that make memory-mapped packet sockets possible in Linux (PACKET_TX_RING, PACKET_RX_RING, etc.).

@rustbot
Copy link
Collaborator

rustbot commented Jan 8, 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) soon.

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

JohnTitor
JohnTitor reviewed Jan 9, 2024
View reviewed changes
src/unix/linux_like/linux/mod.rs Outdated
Comment on lines 257 to 259
#[cfg(libc_union)]
pub hv1: ::__c_anonymous_hdr_variant,
#[cfg(not(libc_union))]
Copy link
Member

Choose a reason for hiding this comment

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

libc_union no longer exists and should be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed this now

@JohnTitor
Copy link
Member

Thanks a lot! @bors r+

@bors
Copy link
Contributor

bors commented Jan 10, 2024

📌 Commit 1f18657 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 10, 2024

⌛ Testing commit 1f18657 with merge 4d95ec0...

bors added a commit that referenced this pull request Jan 10, 2024
@bors
Auto merge of #3530 - nathaniel-bennett:main, r=JohnTitor
4d95ec0 
Add additional Linux AF_PACKET options

Added socket options, structs and other miscellaneous constants that make memory-mapped packet sockets possible in Linux (PACKET_TX_RING, PACKET_RX_RING, etc.).
@bors
Copy link
Contributor

bors commented Jan 10, 2024

💔 Test failed - checks-actions

@nathaniel-bennett
Copy link
Contributor Author

nathaniel-bennett commented Jan 10, 2024 •
edited
Loading

For some reason, musl would throw compiler errors because struct fanout_args was missing. I've added a check that skips this and a FIXME; I presume the issue is that musl CI has old headers (mentioned in other seccomp structs as well).

@JohnTitor
Copy link
Member

Yeah, we use musl 1.1.24. A PR to update it has been submitted but it's still WIP.
@bors r+

@bors
Copy link
Contributor

bors commented Jan 11, 2024

📌 Commit 4430955 has been approved by JohnTitor

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jan 11, 2024

⌛ Testing commit 4430955 with merge 294cc80...

bors added a commit that referenced this pull request Jan 11, 2024
@bors
Auto merge of #3530 - nathaniel-bennett:main, r=JohnTitor
294cc80 
Add additional Linux AF_PACKET options

Added socket options, structs and other miscellaneous constants that make memory-mapped packet sockets possible in Linux (PACKET_TX_RING, PACKET_RX_RING, etc.).
@bors
Copy link
Contributor

bors commented Jan 11, 2024

☀️ Test successful - checks-actions, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 294cc80 to main...

@bors
Copy link
Contributor

bors commented Jan 11, 2024

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through the merge queue

@JohnTitor
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Jan 11, 2024

⌛ Testing commit 4430955 with merge 20b9a18...

bors added a commit that referenced this pull request Jan 11, 2024
@bors
Auto merge of #3530 - nathaniel-bennett:main, r=JohnTitor
20b9a18 
Add additional Linux AF_PACKET options

Added socket options, structs and other miscellaneous constants that make memory-mapped packet sockets possible in Linux (PACKET_TX_RING, PACKET_RX_RING, etc.).
@bors
Copy link
Contributor

bors commented Jan 11, 2024

☀️ Test successful - checks-actions, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14
Approved by: JohnTitor
Pushing 20b9a18 to main...

@bors
Copy link
Contributor

bors commented Jan 11, 2024

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through the merge queue

@JohnTitor JohnTitor added this pull request to the merge queue Jan 11, 2024
Merged via the queue into rust-lang:main with commit fbdf2c1 Jan 11, 2024
@bors bors mentioned this pull request Jan 11, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnTitor JohnTitor JohnTitor approved these changes

Assignees

@JohnTitor JohnTitor

Labels
S-waiting-on-bors
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nathaniel-bennett @rustbot @JohnTitor @bors