illumos fixups #1984
Merged
illumos fixups #1984
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
Depending on the compilation environment (e.g., whether the 3XNET or 3SOCKET version of these functions is in play, whether EXTENSIONS has been defined, etc) these functions may be declared to return either void or int. The return value is hard coded as zero, and can be ignored to better align with other platforms where these functions are always void.
The socket2 crate now depends on TCP_MAXSEG, and the rest of the options may as well come along for the ride.
|
r? @JohnTitor (rust-highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ |
|
📌 Commit 6b78ca9 has been approved by |
|
☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13 |
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.
I needed
TCP_MAXSEGfor use with 0.3.x of socket2, and while I was there I figured I would add the rest of the TCP socket options we have on illumos. Many of these are common with Solaris, but some are not; I have attempted to put them in the correct place so that they will only be active where they are valid.The other commit in this PR gags the test for
setservent()andendservent(), which on illumos have some complexity with respect to return types under different compilation conditions.I don't have an Oracle Solaris system on which to test, but on my relatively current illumos system the tests pass: