-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Add MSG_WAITFORONE
to freebsd and openbsd
#3224
Conversation
r? @JohnTitor (rustbot has picked a reviewer for you, use r? to override) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As noted, this constant should not be defined for illumos.
src/unix/solarish/illumos.rs
Outdated
@@ -33,6 +33,8 @@ pub const TCP_KEEPCNT: ::c_int = 35; | |||
pub const TCP_KEEPINTVL: ::c_int = 36; | |||
pub const TCP_CONGESTION: ::c_int = 37; | |||
|
|||
pub const MSG_WAITFORONE: ::c_int = 0x80000; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The illumos source contains copies of numerous FreeBSD headers, owing to our use of their bootloader. That is why you found MSG_WAITFORONE
in our source tree. That being said, it is not exposed by our libc or its shipped headers. This should not be added here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay I'll remove it. Thanks!
MSG_WAITFORONE
to freebsd, openbsd, and illumosMSG_WAITFORONE
to freebsd and openbsd
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM for openbsd part. thanks.
Thanks for the PR and reviewing! @bors r+ |
Add `MSG_WAITFORONE` to freebsd and openbsd Adds `MSG_WAITFORONE` to freebsd, openbsd, and ~illumos~, as requested in nix-rust/nix#2014. I got the values from: - freebsd: http://fxr.watson.org/fxr/source/sys/socket.h#L473 - openbsd: https://github.com/openbsd/src/blob/2852e11abfc574a216ce741308fb0c6968d9617a/sys/sys/socket.h#L512 - illumos: https://github.com/illumos/illumos-gate/blob/717646f7112314de3f464bc0b75f034f009c861e/usr/src/boot/sys/sys/socket.h#L434 This flag is also supposedly supported on [solaris](https://docs.oracle.com/cd/E88353_01/html/E37843/recvmmsg-3c.html), but I don't know how to find the value. If anyone knows what it is, I'll add it to the PR.
💔 Test failed - checks-actions |
Not sure I'll have permission for this: @bors retry |
@stevenengler: 🔑 Insufficient privileges: not in try users |
@bors retry |
Add `MSG_WAITFORONE` to freebsd and openbsd Adds `MSG_WAITFORONE` to freebsd, openbsd, and ~illumos~, as requested in nix-rust/nix#2014. I got the values from: - freebsd: http://fxr.watson.org/fxr/source/sys/socket.h#L473 - openbsd: https://github.com/openbsd/src/blob/2852e11abfc574a216ce741308fb0c6968d9617a/sys/sys/socket.h#L512 - illumos: https://github.com/illumos/illumos-gate/blob/717646f7112314de3f464bc0b75f034f009c861e/usr/src/boot/sys/sys/socket.h#L434 This flag is also supposedly supported on [solaris](https://docs.oracle.com/cd/E88353_01/html/E37843/recvmmsg-3c.html), but I don't know how to find the value. If anyone knows what it is, I'll add it to the PR.
💔 Test failed - checks-actions |
@bors retry |
☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14 |
1 similar comment
☀️ Test successful - checks-actions, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13, checks-cirrus-freebsd-14 |
👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request. |
Adds
MSG_WAITFORONE
to freebsd, openbsd, andillumos, as requested in nix-rust/nix#2014.I got the values from:
This flag is also supposedly supported on solaris, but I don't know how to find the value. If anyone knows what it is, I'll add it to the PR.