Skip to content

Workaround XNU bug in getifaddrs netmasks#1788

Merged
bors[bot] merged 2 commits intonix-rust:masterfrom
roblabla:workaround-xnu-bug-getifaddrs
Nov 29, 2022
Merged

Workaround XNU bug in getifaddrs netmasks#1788
bors[bot] merged 2 commits intonix-rust:masterfrom
roblabla:workaround-xnu-bug-getifaddrs

Conversation

@roblabla
Copy link
Copy Markdown
Contributor

@roblabla roblabla commented Aug 10, 2022

Fixes #1709

@roblabla roblabla force-pushed the workaround-xnu-bug-getifaddrs branch from c785f03 to c680f93 Compare August 10, 2022 15:07
poliorcetics
poliorcetics reviewed Aug 10, 2022
View reviewed changes
Comment thread src/ifaddrs.rs Outdated
Comment thread src/ifaddrs.rs Outdated
Comment thread src/ifaddrs.rs Outdated
Comment thread src/ifaddrs.rs Outdated
@roblabla
Copy link
Copy Markdown
Contributor Author

roblabla commented Aug 10, 2022

CI breakage seems unrelated to my MR (looks like the latest serde release broke compatibility with the version of rustc/cargo used by CI).

@roblabla roblabla force-pushed the workaround-xnu-bug-getifaddrs branch from c680f93 to 8689956 Compare August 10, 2022 15:20
poliorcetics
poliorcetics reviewed Aug 10, 2022
View reviewed changes
Comment thread src/ifaddrs.rs Outdated
@roblabla roblabla force-pushed the workaround-xnu-bug-getifaddrs branch from 8689956 to fd0a878 Compare August 10, 2022 15:49
@asomers
Copy link
Copy Markdown
Member

asomers commented Aug 11, 2022

CI breakage seems unrelated to my MR (looks like the latest serde release broke compatibility with the version of rustc/cargo used by CI).

The CI breakage was due to a Cargo bug that has since been fixed. However, serde needs to yank their most recent release and publish a new one before things will work again. serde-rs/serde#2255 .

asomers
asomers requested changes Aug 11, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

It really sticks in my craw that we have to do this, but I guess we do. We can't fix OSX. Don't forget to add a CHANGELOG entry.

Comment thread src/ifaddrs.rs Outdated
Comment thread src/ifaddrs.rs Outdated
Comment thread src/ifaddrs.rs Outdated
Comment thread src/ifaddrs.rs
Comment thread src/ifaddrs.rs
@asomers
Copy link
Copy Markdown
Member

asomers commented Aug 12, 2022

Rebasing will fix ci

@roblabla roblabla force-pushed the workaround-xnu-bug-getifaddrs branch 2 times, most recently from 8d0ad34 to 9a05de5 Compare September 7, 2022 11:47
@roblabla
Copy link
Copy Markdown
Contributor Author

roblabla commented Sep 7, 2022

I rewrote the workaround to be safer - at least, I think it's safer. It now copies the data to a new zeroed sockaddr_storage.

@roblabla roblabla force-pushed the workaround-xnu-bug-getifaddrs branch from 9a05de5 to b017f1c Compare September 7, 2022 13:19
@roblabla
Copy link
Copy Markdown
Contributor Author

roblabla commented Oct 20, 2022

Bump. This has been used in prod for a little while, and is, as far as I can tell, sound.

@asomers
Copy link
Copy Markdown
Member

asomers commented Nov 19, 2022

@roblabla you still need to rebase this, both to fix CI and to fix the conflict.

@roblabla roblabla force-pushed the workaround-xnu-bug-getifaddrs branch 3 times, most recently from b0c1eb6 to 2accd76 Compare November 20, 2022 13:03
@roblabla roblabla requested a review from asomers November 20, 2022 15:05
@asomers
Copy link
Copy Markdown
Member

asomers commented Nov 20, 2022

Looks good, but still needs a CHANGELOG entry.

@roblabla roblabla force-pushed the workaround-xnu-bug-getifaddrs branch from 2accd76 to 16f8ff9 Compare November 20, 2022 16:16
asomers
asomers requested changes Nov 20, 2022
View reviewed changes
Comment thread CHANGELOG.md Outdated
asomers
asomers approved these changes Nov 29, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

bors r+

@bors
Copy link
Copy Markdown
Contributor

bors bot commented Nov 29, 2022

Build succeeded:

@bors bors bot merged commit 5db5581 into nix-rust:master Nov 29, 2022
@asomers asomers mentioned this pull request Nov 29, 2022
Merged
@rtzoeller rtzoeller mentioned this pull request Nov 29, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@asomers asomers asomers approved these changes

+1 more reviewer

@poliorcetics poliorcetics poliorcetics left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

SockaddrStorage::as_sockaddr_in incorrectly returns None sometime

3 participants

@roblabla @asomers @poliorcetics
⚡