diff options
| author | eaon <eaon@posteo.net> | 2021-09-04 22:53:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-04 22:53:24 -0400 |
| commit | 67b487283efdddd66906a03045d918795bc79107 (patch) | |
| tree | 2df65cc22d3540562aaa0e417d640f582dee6b44 /src/sys/socket | |
| parent | 76fe409f4b83573d3c706b530e4b0f937cc0b513 (diff) | |
| parent | aaec2143867b64b4164985284ca21be54781e835 (diff) | |
| download | nix-67b487283efdddd66906a03045d918795bc79107.zip | |
Merge branch 'master' into socket-mss
Diffstat (limited to 'src/sys/socket')
| -rw-r--r-- | src/sys/socket/mod.rs | 11 | ||||
| -rw-r--r-- | src/sys/socket/sockopt.rs | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs index f701a731..33585bb9 100644 --- a/src/sys/socket/mod.rs +++ b/src/sys/socket/mod.rs @@ -526,15 +526,12 @@ impl<'a> Iterator for CmsgIterator<'a> { #[derive(Clone, Debug, Eq, PartialEq)] #[non_exhaustive] pub enum ControlMessageOwned { - /// Received version of - /// [`ControlMessage::ScmRights`][#enum.ControlMessage.html#variant.ScmRights] + /// Received version of [`ControlMessage::ScmRights`] ScmRights(Vec<RawFd>), - /// Received version of - /// [`ControlMessage::ScmCredentials`][#enum.ControlMessage.html#variant.ScmCredentials] + /// Received version of [`ControlMessage::ScmCredentials`] #[cfg(any(target_os = "android", target_os = "linux"))] ScmCredentials(UnixCredentials), - /// Received version of - /// [`ControlMessage::ScmCreds`][#enum.ControlMessage.html#variant.ScmCreds] + /// Received version of [`ControlMessage::ScmCreds`] #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] ScmCreds(UnixCredentials), /// A message of type `SCM_TIMESTAMP`, containing the time the @@ -808,7 +805,7 @@ pub enum ControlMessage<'a> { /// /// Credentials are always overwritten by the kernel, so this variant does have /// any data, unlike the receive-side - /// [`ControlMessageOwned::ScmCreds`][#enum.ControlMessageOwned.html#variant.ScmCreds]. + /// [`ControlMessageOwned::ScmCreds`]. /// /// For further information, please refer to the /// [`unix(4)`](https://www.freebsd.org/cgi/man.cgi?query=unix) man page. diff --git a/src/sys/socket/sockopt.rs b/src/sys/socket/sockopt.rs index 90f3cb3d..67f5f71e 100644 --- a/src/sys/socket/sockopt.rs +++ b/src/sys/socket/sockopt.rs @@ -274,6 +274,10 @@ cfg_if! { } #[cfg(not(target_os = "openbsd"))] sockopt_impl!(Both, TcpKeepCount, libc::IPPROTO_TCP, libc::TCP_KEEPCNT, u32); +#[cfg(any(target_os = "android", + target_os = "fuchsia", + target_os = "linux"))] +sockopt_impl!(Both, TcpRepair, libc::IPPROTO_TCP, libc::TCP_REPAIR, u32); #[cfg(not(target_os = "openbsd"))] sockopt_impl!(Both, TcpKeepInterval, libc::IPPROTO_TCP, libc::TCP_KEEPINTVL, u32); #[cfg(any(target_os = "fuchsia", target_os = "linux"))] |