diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-07-04 22:10:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 22:10:10 +0000 |
| commit | 58deca5b10b6246dfa1babe8ec4a27230f41f8ac (patch) | |
| tree | e43c3d13f98a2c4b2a50e5fc5aaf8ff3d6ef6b58 | |
| parent | 7317e0a3871c58ce3e29de8ee26ead10bdcb979e (diff) | |
| parent | c916e5274e49cc51ebfa1d0c10fd6c60a5d0683f (diff) | |
| download | nix-58deca5b10b6246dfa1babe8ec4a27230f41f8ac.zip | |
Merge #1456
1456: Add IpFreebind 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 0e04f020..7898d42d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ This project adheres to [Semantic Versioning](https://semver.org/). - Added `if_nameindex` (#[1445](https://github.com/nix-rust/nix/pull/1445)) - Added `nmount` for FreeBSD. (#[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)) ### Changed ### Fixed diff --git a/src/sys/socket/sockopt.rs b/src/sys/socket/sockopt.rs index fe17395f..a9764f6f 100644 --- a/src/sys/socket/sockopt.rs +++ b/src/sys/socket/sockopt.rs @@ -238,6 +238,8 @@ cfg_if! { } sockopt_impl!(Both, IpMulticastTtl, libc::IPPROTO_IP, libc::IP_MULTICAST_TTL, u8); sockopt_impl!(Both, IpMulticastLoop, libc::IPPROTO_IP, libc::IP_MULTICAST_LOOP, bool); +#[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))] +sockopt_impl!(Both, IpFreebind, libc::IPPROTO_IP, libc::IP_FREEBIND, bool); sockopt_impl!(Both, ReceiveTimeout, libc::SOL_SOCKET, libc::SO_RCVTIMEO, TimeVal); sockopt_impl!(Both, SendTimeout, libc::SOL_SOCKET, libc::SO_SNDTIMEO, TimeVal); sockopt_impl!(Both, Broadcast, libc::SOL_SOCKET, libc::SO_BROADCAST, bool); |