diff options
| author | Frederick Mayle <fmayle@google.com> | 2022-04-13 01:22:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-13 01:22:24 +0000 |
| commit | 96fea2120b2a65c6cfd30ff2a60812accd444fbe (patch) | |
| tree | 42c63d3c7f2dabaa187e9fcaf0afa7f51e18d349 | |
| parent | 8d166794b79967675bca11eb796f2f6f9a16b0b9 (diff) | |
| parent | 5956c3fc7febb443a202efdd689f5daa19334ca1 (diff) | |
| download | libc-96fea2120b2a65c6cfd30ff2a60812accd444fbe.tar.gz | |
Add more if_tun.h constants am: fab7930dc5 am: c0ddd187d1 am: 0efe46eaf7 am: 5956c3fc7f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libc/+/2062567
Change-Id: I74186eb75a1a336c1b24011e39986dc674baa802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/if_tun.diff | 25 | ||||
| -rw-r--r-- | src/unix/linux_like/android/mod.rs | 11 |
2 files changed, 36 insertions, 0 deletions
diff --git a/patches/if_tun.diff b/patches/if_tun.diff new file mode 100644 index 00000000..1e790763 --- /dev/null +++ b/patches/if_tun.diff @@ -0,0 +1,25 @@ +diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs +index 236f57a4..fe2d2096 100644 +--- a/src/unix/linux_like/android/mod.rs ++++ b/src/unix/linux_like/android/mod.rs +@@ -2168,9 +2168,20 @@ pub const NFT_TRACETYPE_RULE: ::c_int = 3; + pub const NFT_NG_INCREMENTAL: ::c_int = 0; + pub const NFT_NG_RANDOM: ::c_int = 1; + ++// bionic/libc/kernel/uapi/linux/if_tun.h + pub const IFF_TUN: ::c_int = 0x0001; + pub const IFF_TAP: ::c_int = 0x0002; ++pub const IFF_NAPI: ::c_int = 0x0010; ++pub const IFF_NAPI_FRAGS: ::c_int = 0x0020; + pub const IFF_NO_PI: ::c_int = 0x1000; ++pub const IFF_ONE_QUEUE: ::c_int = 0x2000; ++pub const IFF_VNET_HDR: ::c_int = 0x4000; ++pub const IFF_TUN_EXCL: ::c_int = 0x8000; ++pub const IFF_MULTI_QUEUE: ::c_int = 0x0100; ++pub const IFF_ATTACH_QUEUE: ::c_int = 0x0200; ++pub const IFF_DETACH_QUEUE: ::c_int = 0x0400; ++pub const IFF_PERSIST: ::c_int = 0x0800; ++pub const IFF_NOFILTER: ::c_int = 0x1000; + + // start android/platform/bionic/libc/kernel/uapi/linux/if_ether.h + // from https://android.googlesource.com/ diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index 236f57a4..fe2d2096 100644 --- a/src/unix/linux_like/android/mod.rs +++ b/src/unix/linux_like/android/mod.rs @@ -2168,9 +2168,20 @@ pub const NFT_TRACETYPE_RULE: ::c_int = 3; pub const NFT_NG_INCREMENTAL: ::c_int = 0; pub const NFT_NG_RANDOM: ::c_int = 1; +// bionic/libc/kernel/uapi/linux/if_tun.h pub const IFF_TUN: ::c_int = 0x0001; pub const IFF_TAP: ::c_int = 0x0002; +pub const IFF_NAPI: ::c_int = 0x0010; +pub const IFF_NAPI_FRAGS: ::c_int = 0x0020; pub const IFF_NO_PI: ::c_int = 0x1000; +pub const IFF_ONE_QUEUE: ::c_int = 0x2000; +pub const IFF_VNET_HDR: ::c_int = 0x4000; +pub const IFF_TUN_EXCL: ::c_int = 0x8000; +pub const IFF_MULTI_QUEUE: ::c_int = 0x0100; +pub const IFF_ATTACH_QUEUE: ::c_int = 0x0200; +pub const IFF_DETACH_QUEUE: ::c_int = 0x0400; +pub const IFF_PERSIST: ::c_int = 0x0800; +pub const IFF_NOFILTER: ::c_int = 0x1000; // start android/platform/bionic/libc/kernel/uapi/linux/if_ether.h // from https://android.googlesource.com/ |