Skip to content

Commit

Permalink
Merge #853
Browse files Browse the repository at this point in the history
853: Update `InterfaceFlags` r=Susurrus a=LuoZijun

Add Flags: `IFF_NO_PI`, `IFF_TUN`, `IFF_TAP`.
  • Loading branch information
bors[bot] committed Feb 8, 2018
2 parents 0a128f0 + c755da8 commit dab0a5e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added
- Added `getsid` in `::nix::unistd`
([#850](https://github.com/nix-rust/nix/pull/850))

- Added `alarm`. ([#830](https://github.com/nix-rust/nix/pull/830))
- Added interface flags `IFF_NO_PI, IFF_TUN, IFF_TAP` on linux-like systems.
([#853](https://github.com/nix-rust/nix/pull/853))

### Changed
- Display and Debug for SysControlAddr now includes all fields.
Expand Down
9 changes: 9 additions & 0 deletions src/net/if_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,15 @@ libc_bitflags!(
/// Don't exchange routing info.
#[cfg(any(target_os = "solaris"))]
IFF_NORTEXCH;
/// Do not provide packet information
#[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
IFF_NO_PI as libc::c_int;
/// TUN device (no Ethernet headers)
#[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
IFF_TUN as libc::c_int;
/// TAP device
#[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
IFF_TAP as libc::c_int;
/// IPv4 interface.
#[cfg(any(target_os = "solaris"))]
IFF_IPV4;
Expand Down

0 comments on commit dab0a5e

Please sign in to comment.