Fix nix on FreeBSD (rebased on master) #397
Conversation
Rules for generic types were located above rules for specific types, so the rules for specific types never got matched. This caused the sys::socket::sockopt::test::can_get_listen_on_tcp_socket test to fail on FreeBSD. The solution is to put all of the generic rules at the bottom.
On Linux, the cmsg_len field of struct cmsghdr has type size_t, but it has size socklen_t on POSIX-compliant operating systems. So on POSIX-compliant 64-bit operating systems, struct cmsghdr has padding gaps that aren't present on Linux. Most of the issues fixed by this commit related to those gaps. src/sys/socket/ffi.rs Fix the type of the cmsg_data field so the struct layout will be correct. src/sys/socket/mod.rs In CmsgIterator.next, only return a single file descriptor. sendmsg(2) can only stuff a single file descriptor into each cmsg. In cmsg_align, fix the rounding calculation, and eliminate a division instruction. Add a missing cmsg_align call in ControlMessage.len In ControlMessage.encode_into, add any necessary padding bytes between the cmsghdr and the data. In sendmsg, fix some len<->capacity confusion.
|
@posborne could you have a look at the build failures. Given that the failing builds, fail due to some problems with docker images you created, you probably know what the problem is. |
Strange. I'll try to figure out what is going on. Thanks for the rebase. |
|
Update: Looks like there was a change to remove the |
|
📌 Commit 077d979 has been approved by |
Fix nix on FreeBSD (rebased on master)
|
☀️ Test successful - status |
|
As an FYI, I'm taking a fresh look at some of the docker stuff to see if I can come up with some kind of circus act in order to get some BSD builds into the mix. |
No description provided.