diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-14 01:06:17 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-14 01:06:17 +0000 |
| commit | ff5b71fb759df9a3863a430675500a09bb99cfb1 (patch) | |
| tree | 42c63d3c7f2dabaa187e9fcaf0afa7f51e18d349 | |
| parent | 5fdee95645269e4992a3a5b2da5941922cd9c3f2 (diff) | |
| parent | 5956c3fc7febb443a202efdd689f5daa19334ca1 (diff) | |
| download | libc-android13-tests-release.tar.gz | |
Snap for 8451755 from 5956c3fc7febb443a202efdd689f5daa19334ca1 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-release
Change-Id: I0c68d378e4fb1a6faf7ba1cfc30317be4185dbf4
| -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/ |