diff options
author | bors <bors@rust-lang.org> | 2021-10-15 22:46:42 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2021-10-15 22:46:42 +0000 |
commit | 47f6fec46424cc3aabaeac28ec38fce552f80944 (patch) | |
tree | 22f2a5cdc108cc5296b10aade4994d12af2cd4a3 | |
parent | bc4d6d62bdf7098acea493b6a7691ce80a5ab596 (diff) | |
parent | d8e549c120db65d75de6890c90d1ae6dd1bbc68d (diff) | |
download | rust-libc-47f6fec46424cc3aabaeac28ec38fce552f80944.tar.gz |
Auto merge of #2454 - tklauser:android-missing-netlink-consts, r=JohnTitor
Add missing NETLINK_* socket option constants on Android
These are all available on Android, see
https://android.googlesource.com/platform/bionic/+/05667cd66a3ea0e75611f1bec36a67098ac92179/libc/kernel/uapi/linux/netlink.h#112
-rw-r--r-- | libc-test/semver/android.txt | 5 | ||||
-rw-r--r-- | src/unix/linux_like/android/mod.rs | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt index cf8fa6f75c..9bbe6b10e1 100644 --- a/libc-test/semver/android.txt +++ b/libc-test/semver/android.txt @@ -1130,18 +1130,23 @@ NCP_SUPER_MAGIC NETLINK_ADD_MEMBERSHIP NETLINK_AUDIT NETLINK_BROADCAST_ERROR +NETLINK_CAP_ACK NETLINK_CONNECTOR NETLINK_CRYPTO NETLINK_DNRTMSG NETLINK_DROP_MEMBERSHIP NETLINK_ECRYPTFS +NETLINK_EXT_ACK NETLINK_FIB_LOOKUP NETLINK_FIREWALL NETLINK_GENERIC +NETLINK_GET_STRICT_CHK NETLINK_INET_DIAG NETLINK_IP6_FW NETLINK_ISCSI NETLINK_KOBJECT_UEVENT +NETLINK_LISTEN_ALL_NSID +NETLINK_LIST_MEMBERSHIPS NETLINK_NETFILTER NETLINK_NFLOG NETLINK_NO_ENOBUFS diff --git a/src/unix/linux_like/android/mod.rs b/src/unix/linux_like/android/mod.rs index 038c502451..6faadb9b88 100644 --- a/src/unix/linux_like/android/mod.rs +++ b/src/unix/linux_like/android/mod.rs @@ -1784,6 +1784,11 @@ pub const NETLINK_BROADCAST_ERROR: ::c_int = 4; pub const NETLINK_NO_ENOBUFS: ::c_int = 5; pub const NETLINK_RX_RING: ::c_int = 6; pub const NETLINK_TX_RING: ::c_int = 7; +pub const NETLINK_LISTEN_ALL_NSID: ::c_int = 8; +pub const NETLINK_LIST_MEMBERSHIPS: ::c_int = 9; +pub const NETLINK_CAP_ACK: ::c_int = 10; +pub const NETLINK_EXT_ACK: ::c_int = 11; +pub const NETLINK_GET_STRICT_CHK: ::c_int = 12; pub const GRND_NONBLOCK: ::c_uint = 0x0001; pub const GRND_RANDOM: ::c_uint = 0x0002; |