OpenE2K/libc-rs
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #916 - LuoZijun:patch-1, r=alexcrichton

Browse Source 
Add `IFF_*` constants  to linux, android and fuchsia

Add constants to android and fuchsia:

*    IFF_TUN
*    IFF_TAP
*    IFF_NO_PI

Type problem: https://github.com/rust-lang/libc/issues/915

so change constants type `libc::c_short` to `libc::c_int` :

*    IFF_*
This commit is contained in:
bors 2018-02-07 03:48:57 +00:00
commit bbda50d209
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc-test/build.rs
View File

@ -265,7 +265,7 @@ fn main() {
cfg.header("sys/fsuid.h");
cfg.header("linux/seccomp.h");
cfg.header("linux/if_ether.h");
cfg.header("linux/if_tun.h");
// DCCP support
if !uclibc && !musl && !emscripten {
cfg.header("linux/dccp.h");
@ -280,7 +280,6 @@ fn main() {
cfg.header("linux/random.h");
cfg.header("elf.h");
cfg.header("link.h");
cfg.header("linux/if_tun.h");
cfg.header("spawn.h");
}

3
src/fuchsia/mod.rs
View File

@ -1351,6 +1351,9 @@ pub const IFF_MULTICAST: ::c_int = 0x1000;
pub const IFF_PORTSEL: ::c_int = 0x2000;
pub const IFF_AUTOMEDIA: ::c_int = 0x4000;
pub const IFF_DYNAMIC: ::c_int = 0x8000;
pub const IFF_TUN: ::c_int = 0x0001;
pub const IFF_TAP: ::c_int = 0x0002;
pub const IFF_NO_PI: ::c_int = 0x1000;
pub const SOL_IP: ::c_int = 0;
pub const SOL_TCP: ::c_int = 6;

4
src/unix/notbsd/android/mod.rs
View File

@ -978,6 +978,10 @@ pub const NFT_MSG_DELOBJ: ::c_int = 20;
pub const NFT_MSG_GETOBJ_RESET: ::c_int = 21;
pub const NFT_MSG_MAX: ::c_int = 22;
pub const IFF_TUN: ::c_int = 0x0001;
pub const IFF_TAP: ::c_int = 0x0002;
pub const IFF_NO_PI: ::c_int = 0x1000;
f! {
pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
for slot in cpuset.__bits.iter_mut() {

11
src/unix/notbsd/linux/mod.rs
View File

@ -756,16 +756,15 @@ pub const IFF_DORMANT: ::c_int = 0x20000;
pub const IFF_ECHO: ::c_int = 0x40000;
// linux/if_tun.h
pub const IFF_TUN: ::c_short = 0x0001;
pub const IFF_TAP: ::c_short = 0x0002;
pub const IFF_NO_PI: ::c_short = 0x1000;
// Read queue size
pub const TUN_READQ_SIZE: ::c_short = 500;
// TUN device type flags: deprecated. Use IFF_TUN/IFF_TAP instead.
pub const TUN_TUN_DEV: ::c_short = IFF_TUN;
pub const TUN_TAP_DEV: ::c_short = IFF_TAP;
pub const TUN_TUN_DEV: ::c_short = ::IFF_TUN;
pub const TUN_TAP_DEV: ::c_short = ::IFF_TAP;
pub const TUN_TYPE_MASK: ::c_short = 0x000f;
// TUNSETIFF ifr flags
pub const IFF_TUN: ::c_short = 0x0001;
pub const IFF_TAP: ::c_short = 0x0002;
pub const IFF_NO_PI: ::c_short = 0x1000;
// This flag has no real effect
pub const IFF_ONE_QUEUE: ::c_short = 0x2000;
pub const IFF_VNET_HDR: ::c_short = 0x4000;