Improve socket API coverage #1248
Conversation
This beings `OrigDstAddrV4` and `OrigDstAddrV6` `recvmsg` messages and associated socket options `RecvOrigDstAddrV4` and `RecvOrigDstAddrV6`. Should close nix-rust#1023.
| @@ -529,6 +529,17 @@ pub enum ControlMessageOwned { | |||
| #[cfg(target_os = "linux")] | |||
| UdpGroSegments(u16), | |||
|
|
|||
| #[cfg(any( | |||
There was a problem hiding this comment.
You should also enable the ORIGDSTADDR stuff for FreeBSD.
| /// is overwritten by [`TPROXY`][1], which in turn may be used to | ||
| /// make a transparent proxy server. | ||
| /// | ||
| /// [1]:https://www.kernel.org/doc/Documentation/networking/tproxy.txt |
There was a problem hiding this comment.
This is the wrong man page link. I can't find the correct man page for Linux, but here's the link for FreeBSD: ip(4) (note that the section for IP_ORIGDSTADDR has some typos; I just fixed them upstream and in time the link target will be rebuilt).
| /// is overwritten by [`TPROXY`][1], which in turn may be used to | ||
| /// make a transparent proxy server. | ||
| /// | ||
| /// [1]:https://www.kernel.org/doc/Documentation/networking/tproxy.txt |
There was a problem hiding this comment.
Also not a useful man page. I can't find any documentation on this control message type. Best not to include any man page link, then.
| @@ -677,6 +698,52 @@ pub enum ControlMessage<'a> { | |||
| #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] | |||
| ScmCreds, | |||
|
|
|||
| /// A message of type `IP_ORIGDSTADDR` which is triggered by setting | |||
| /// `RecvOrigDstAddrV4` socket option and is used to get original IPv4 | |||
| /// UDP or TCP destination address when actual destination address | |||
There was a problem hiding this comment.
Are you sure it works for TCP? In FreeBSD at least, it's only for UDP.
| target_os = "macos", | ||
| target_os = "netbsd", | ||
| ))] | ||
| Ipv4PacketInfo(&'a libc::in_pktinfo), |
There was a problem hiding this comment.
Could you please add doc comments here?
| target_os = "openbsd", | ||
| target_os = "netbsd", | ||
| ))] | ||
| Ipv6PacketInfo(&'a libc::in6_pktinfo), |
| target_os = "linux", | ||
| target_os = "android", | ||
| ))] | ||
| OrigDstAddrV4(&'a libc::sockaddr_in), |
There was a problem hiding this comment.
There is no point in defining ControlMessage::OrigDstAddrV[46]. ControlMessage is for use with sendmsg only. recvmsg uses ControlMessageOwned instead.
Hi guys!
I've been playing around with writing a transparent proxy in Rust and found that the advanced networking API support for Linux is a bit lacking. This includes the original changes submitted for TPROXY support in #1025 (rebased on a more recent version of master), as well as changes to potentially close out #1064.
I'm new to rust, so any feedback is appreciated!
Thanks!