diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-07-05 15:43:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-05 15:43:05 +0000 |
| commit | 0d066c327cf771ede337900128788dcd78dd02ff (patch) | |
| tree | c35ef37749a2d41bfbadd5096050bebd6bf6ad72 | |
| parent | 58deca5b10b6246dfa1babe8ec4a27230f41f8ac (diff) | |
| parent | 2e84b63ba7d8d0801344a432c1c22902d3bdaf9e (diff) | |
| download | nix-0d066c327cf771ede337900128788dcd78dd02ff.zip | |
Merge #1457
1457: Add TcpUserTimeout socket option r=asomers a=nox
Co-authored-by: Anthony Ramine <nox@nox.paris>
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/sys/socket/sockopt.rs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7898d42d..488a9e84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ This project adheres to [Semantic Versioning](https://semver.org/). (#[1447](https://github.com/nix-rust/nix/pull/1447)) - Added `IpFreebind` socket option (sockopt) on Linux, Fuchsia and Android. (#[1456](https://github.com/nix-rust/nix/pull/1456)) +- Added `TcpUserTimeout` socket option (sockopt) on Linux and Fuchsia. + (#[1457](https://github.com/nix-rust/nix/pull/1457)) ### Changed ### Fixed diff --git a/src/sys/socket/sockopt.rs b/src/sys/socket/sockopt.rs index a9764f6f..3397a966 100644 --- a/src/sys/socket/sockopt.rs +++ b/src/sys/socket/sockopt.rs @@ -261,6 +261,8 @@ sockopt_impl!(Both, TcpKeepIdle, libc::IPPROTO_TCP, libc::TCP_KEEPIDLE, u32); sockopt_impl!(Both, TcpKeepCount, libc::IPPROTO_TCP, libc::TCP_KEEPCNT, 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"))] +sockopt_impl!(Both, TcpUserTimeout, libc::IPPROTO_TCP, libc::TCP_USER_TIMEOUT, u32); sockopt_impl!(Both, RcvBuf, libc::SOL_SOCKET, libc::SO_RCVBUF, usize); sockopt_impl!(Both, SndBuf, libc::SOL_SOCKET, libc::SO_SNDBUF, usize); #[cfg(any(target_os = "android", target_os = "linux"))] |