Add CMSG macros for unix/bsd and unix/notbsd #1098
Merged
Conversation
This file contains hidden or 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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
Any feedback? |
|
Thanks for the PR and sorry for the delay! These look good to me though, thanks! @bors: r+ |
|
📌 Commit 2701f62 has been approved by |
bors
added a commit
that referenced
this pull request
Oct 29, 2018
Add CMSG macros for unix/bsd and unix/notbsd This adds the ["Ancillary Data Object Macros" from RFC 2292](https://tools.ietf.org/html/rfc2292#section-4.3). My C's weak but I think I've translated them faithfully. Tested on macOS and Linux/glibc.
gnzlbg
reviewed
Oct 29, 2018
| if (*mhdr).msg_controllen as usize >= mem::size_of::<cmsghdr>() { | ||
| (*mhdr).msg_control as *mut cmsghdr | ||
| } else { | ||
| 0 as *mut cmsghdr |
There was a problem hiding this comment.
nitpick: use ptr::null() here
There was a problem hiding this comment.
I assumed the crate's convention was to not use that (it's not used anywhere that I've seen)
There was a problem hiding this comment.
duh, indeed, libc might predate https://rust-lang-nursery.github.io/rust-clippy/v0.0.212/index.html#zero_ptr we can always do a cargo fix for these later
|
💥 Test timed out |
|
@bors: r+ |
|
@gnzlbg: 🔑 Insufficient privileges: Not in reviewers |
|
r? me |
|
@bors: retry |
bors
added a commit
that referenced
this pull request
Oct 29, 2018
Add CMSG macros for unix/bsd and unix/notbsd This adds the ["Ancillary Data Object Macros" from RFC 2292](https://tools.ietf.org/html/rfc2292#section-4.3). My C's weak but I think I've translated them faithfully. Tested on macOS and Linux/glibc.
|
☀️ Test successful - status-appveyor, status-travis |
|
@alexcrichton thanks! |
asomers
added a commit
to asomers/libc
that referenced
this pull request
Jan 15, 2019
PR rust-lang#1098 added the CMSG_DATA(3) family of functions into libc. Because they're defined as macros in C, they had to be rewritten as Rust functions for libc. Also, they can't be tested in CI for the same reason. But that PR erroneously used the same definitions in BSD as in Linux. This commit corrects the definitions for OSX, FreeBSD, DragonflyBSD, OpenBSD, and NetBSD. I renamed a few variables and collapsed a few macros in order to combine the definitions where possible. Fixes rust-lang#1210
asomers
added a commit
to asomers/libc
that referenced
this pull request
Jan 16, 2019
PR rust-lang#1098 added the CMSG_DATA(3) family of functions into libc. Because they're defined as macros in C, they had to be rewritten as Rust functions for libc. Also, they can't be tested in CI for the same reason. But that PR erroneously used the same definitions in BSD as in Linux. This commit corrects the definitions for OSX, FreeBSD, DragonflyBSD, OpenBSD, and NetBSD. I renamed a few variables and collapsed a few macros in order to combine the definitions where possible. Fixes rust-lang#1210
bors
added a commit
that referenced
this pull request
Jan 17, 2019
Fix CMSG_DATA(3) and friends on BSD PR #1098 added the CMSG_DATA(3) family of functions into libc. Because they're defined as macros in C, they had to be rewritten as Rust functions for libc. Also, they can't be tested in CI for the same reason. But that PR erroneously used the same definitions in BSD as in Linux. This commit corrects the definitions for OSX, FreeBSD, DragonflyBSD, OpenBSD, and NetBSD. I renamed a few variables and collapsed a few macros in order to combine the definitions where possible. Fixes #1210
asomers
added a commit
to asomers/libc
that referenced
this pull request
Jan 31, 2019
This is an error from PR rust-lang#1098. The wrong definition coincidentally works on Linux/glibc, but it fails on Linux/musl.
asomers
added a commit
to asomers/libc
that referenced
this pull request
Jan 31, 2019
This is an error from PR rust-lang#1098. The wrong definitions coincidentally work on Linux/glibc, but fail on Linux/musl. fixup
asomers
added a commit
to asomers/libc
that referenced
this pull request
Jan 31, 2019
This is an error from PR rust-lang#1098. The wrong definitions coincidentally work on Linux/glibc, but fail on Linux/musl.
asomers
added a commit
to asomers/libc
that referenced
this pull request
Feb 1, 2019
This is an error from PR rust-lang#1098. The wrong definitions coincidentally work on Linux/glibc, but fail on Linux/musl.
asomers
added a commit
to asomers/libc
that referenced
this pull request
Feb 1, 2019
This is an error from PR rust-lang#1098. The wrong definitions coincidentally work on Linux/glibc, but fail on Linux/musl.
asomers
added a commit
to asomers/libc
that referenced
this pull request
Feb 5, 2019
This is an error from PR rust-lang#1098. The wrong definitions coincidentally work on Linux/glibc, but fail on Linux/musl.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
This adds the "Ancillary Data Object Macros" from RFC 2292. My C's weak but I think I've translated them faithfully. Tested on macOS and Linux/glibc.