Add routing socket type on macOS #1867
Conversation
|
There's no reason to Having used this for a bit, it seems that there are also some |
|
I now realize that these changes might also be relevant for FreeBSD and friends - but I don't have a FreeBSD VM handy to test my changes. |
pinkisemils
force-pushed
the
add-pf-route-socket
branch
from
9eabdf0
to
7d4bc14
Compare
|
It looks to me like you should enable this for macos, ios, freebsd, dragonfly, openbsd, netbsd, linux, android, illumos, haiku, and fuchsia. In fact, it's everywhere but Redox. But on Linux and Android, it's an alias for AF_NETLINK. Why don't you try enabling it for all of those, and let CI test it for you? We have full testing in CI for FreeBSD, OSX, and Linux. |
pinkisemils
force-pushed
the
add-pf-route-socket
branch
2 times, most recently
from
158da17
to
14e6451
Compare
|
It seems that it does just work on most OS'es. I elected to not define it on Linux, since the same value is already used for netlink sockets (and they are kind of the same kind of a thing). Should I remove the test that tries to open the routing socket, or should that stay? I think it doesn't really test any logic, just that a socket of this type can be opened. |
|
I think it's ok to leave the test. It helps us validate which platforms have routing sockets. I'll create another PR to fix the clippy failure. |
|
Merge conflict. |
pinkisemils
force-pushed
the
add-pf-route-socket
branch
from
14e6451
to
6a62210
Compare
|
I've rebased and it passes all the checks now. |
CHANGELOG.md
Outdated
| @@ -22,6 +22,9 @@ This project adheres to [Semantic Versioning](https://semver.org/). | |||
| - Added `MntFlags` and `unmount` on all of the BSDs. | |||
| - Added `any()` and `all()` to `poll::PollFd`. | |||
| ([#1877](https://github.com/nix-rust/nix/pull/1877)) | |||
| - Add `PF_ROUTE` to `SockType` on macOS. | |||
| - Add `PF_ROUTE` to `SockType` on macOS, all of the BSDs and Linux. | |||
There was a problem hiding this comment.
This is incorrect, because you didn't add it to Linux.
There was a problem hiding this comment.
Ah, you are right. I've updated it now and I do apologize for the sloppy push.
pinkisemils
force-pushed
the
add-pf-route-socket
branch
from
6a62210
to
03ec537
Compare
CHANGELOG.md
Outdated
| @@ -22,6 +22,8 @@ This project adheres to [Semantic Versioning](https://semver.org/). | |||
| - Added `MntFlags` and `unmount` on all of the BSDs. | |||
| - Added `any()` and `all()` to `poll::PollFd`. | |||
| ([#1877](https://github.com/nix-rust/nix/pull/1877)) | |||
| - Add `PF_ROUTE` to `SockType` on macOS, all of the BSDs. | |||
There was a problem hiding this comment.
| - Add `PF_ROUTE` to `SockType` on macOS, all of the BSDs. | |
| - Add `PF_ROUTE` to `SockType` on macOS and the BSDs. |
There was a problem hiding this comment.
But isn't this still inaccurate? Because you also added it for iOS, illumos, Haiku, and Fuchsia, I believe.
There was a problem hiding this comment.
You are correct, I also moved the entry up the changelog, since these changes have not been released anywhere yet.
pinkisemils
force-pushed
the
add-pf-route-socket
branch
from
03ec537
to
1a8e575
Compare
pinkisemils
force-pushed
the
add-pf-route-socket
branch
from
1a8e575
to
d08d4e2
Compare
|
@asomers Would you be able to cut a release that includes this patch? We're relying on it now but would like to get rid of the git dependency. |
This is a small change to add the routing socket type to the list of socket types one can open with
nix. I've added a smoke test to see that a socket of such type can actually be opened, but I'm not sure if such a test belongs in the codebase here.