diff options
author | psykose <alice@ayaya.dev> | 2023-03-03 22:28:07 +0000 |
---|---|---|
committer | psykose <alice@ayaya.dev> | 2023-03-03 23:28:07 +0100 |
commit | b5c207ae66e020075ab7eccd5de8f4b2c14a0927 (patch) | |
tree | 4f54dc62e89999dfd5929f91c139c9f586d71301 | |
parent | 2bafdcf631478f8ac4bbe7934852731685f52cc9 (diff) | |
download | rust-libc-b5c207ae66e020075ab7eccd5de8f4b2c14a0927.tar.gz |
linux: move DCCP_ constants from linux/gnu to linux
closes #3132
these constants come from linux headers, so they should be exposed for
"linux", not just glibc.
this change exposes them for linux/musl and linux/uclibc.
of note, android contains these same constants, but moving it to
linux-like would also expose them on emscripten, which does not have it.
-rw-r--r-- | libc-test/semver/linux-gnu.txt | 17 | ||||
-rw-r--r-- | libc-test/semver/linux.txt | 17 | ||||
-rw-r--r-- | src/unix/linux_like/linux/gnu/mod.rs | 21 | ||||
-rw-r--r-- | src/unix/linux_like/linux/mod.rs | 21 |
4 files changed, 38 insertions, 38 deletions
diff --git a/libc-test/semver/linux-gnu.txt b/libc-test/semver/linux-gnu.txt index f34e0681c3..1f2721fa0f 100644 --- a/libc-test/semver/linux-gnu.txt +++ b/libc-test/semver/linux-gnu.txt @@ -33,23 +33,6 @@ CGROUP2_SUPER_MAGIC CGROUP_SUPER_MAGIC CODA_SUPER_MAGIC CRAMFS_MAGIC -DCCP_SERVICE_LIST_MAX_LEN -DCCP_SOCKOPT_AVAILABLE_CCIDS -DCCP_SOCKOPT_CCID -DCCP_SOCKOPT_CCID_RX_INFO -DCCP_SOCKOPT_CCID_TX_INFO -DCCP_SOCKOPT_CHANGE_L -DCCP_SOCKOPT_CHANGE_R -DCCP_SOCKOPT_GET_CUR_MPS -DCCP_SOCKOPT_PACKET_SIZE -DCCP_SOCKOPT_QPOLICY_ID -DCCP_SOCKOPT_QPOLICY_TXQLEN -DCCP_SOCKOPT_RECV_CSCOV -DCCP_SOCKOPT_RX_CCID -DCCP_SOCKOPT_SEND_CSCOV -DCCP_SOCKOPT_SERVER_TIMEWAIT -DCCP_SOCKOPT_SERVICE -DCCP_SOCKOPT_TX_CCID DEAD_PROCESS DEBUGFS_MAGIC DEVPTS_SUPER_MAGIC diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index daccc3c38d..1b17b62d96 100644 --- a/libc-test/semver/linux.txt +++ b/libc-test/semver/linux.txt @@ -334,6 +334,23 @@ DAY_4 DAY_5 DAY_6 DAY_7 +DCCP_SERVICE_LIST_MAX_LEN +DCCP_SOCKOPT_AVAILABLE_CCIDS +DCCP_SOCKOPT_CCID +DCCP_SOCKOPT_CCID_RX_INFO +DCCP_SOCKOPT_CCID_TX_INFO +DCCP_SOCKOPT_CHANGE_L +DCCP_SOCKOPT_CHANGE_R +DCCP_SOCKOPT_GET_CUR_MPS +DCCP_SOCKOPT_PACKET_SIZE +DCCP_SOCKOPT_QPOLICY_ID +DCCP_SOCKOPT_QPOLICY_TXQLEN +DCCP_SOCKOPT_RECV_CSCOV +DCCP_SOCKOPT_RX_CCID +DCCP_SOCKOPT_SEND_CSCOV +DCCP_SOCKOPT_SERVER_TIMEWAIT +DCCP_SOCKOPT_SERVICE +DCCP_SOCKOPT_TX_CCID DT_UNKNOWN D_FMT D_T_FMT diff --git a/src/unix/linux_like/linux/gnu/mod.rs b/src/unix/linux_like/linux/gnu/mod.rs index 2d84ec662d..1ee1ec70d0 100644 --- a/src/unix/linux_like/linux/gnu/mod.rs +++ b/src/unix/linux_like/linux/gnu/mod.rs @@ -730,27 +730,6 @@ pub const PF_NFC: ::c_int = AF_NFC; pub const PF_VSOCK: ::c_int = AF_VSOCK; pub const PF_XDP: ::c_int = AF_XDP; -/* DCCP socket options */ -pub const DCCP_SOCKOPT_PACKET_SIZE: ::c_int = 1; -pub const DCCP_SOCKOPT_SERVICE: ::c_int = 2; -pub const DCCP_SOCKOPT_CHANGE_L: ::c_int = 3; -pub const DCCP_SOCKOPT_CHANGE_R: ::c_int = 4; -pub const DCCP_SOCKOPT_GET_CUR_MPS: ::c_int = 5; -pub const DCCP_SOCKOPT_SERVER_TIMEWAIT: ::c_int = 6; -pub const DCCP_SOCKOPT_SEND_CSCOV: ::c_int = 10; -pub const DCCP_SOCKOPT_RECV_CSCOV: ::c_int = 11; -pub const DCCP_SOCKOPT_AVAILABLE_CCIDS: ::c_int = 12; -pub const DCCP_SOCKOPT_CCID: ::c_int = 13; -pub const DCCP_SOCKOPT_TX_CCID: ::c_int = 14; -pub const DCCP_SOCKOPT_RX_CCID: ::c_int = 15; -pub const DCCP_SOCKOPT_QPOLICY_ID: ::c_int = 16; -pub const DCCP_SOCKOPT_QPOLICY_TXQLEN: ::c_int = 17; -pub const DCCP_SOCKOPT_CCID_RX_INFO: ::c_int = 128; -pub const DCCP_SOCKOPT_CCID_TX_INFO: ::c_int = 192; - -/// maximum number of services provided on the same listening port -pub const DCCP_SERVICE_LIST_MAX_LEN: ::c_int = 32; - pub const SIGEV_THREAD_ID: ::c_int = 4; pub const BUFSIZ: ::c_uint = 8192; diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index be12190b45..b2246300fd 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -3788,6 +3788,27 @@ pub const SCTP_PR_SCTP_ALL: ::c_int = 1 << 7; pub const SCTP_NOTIFICATION: ::c_int = MSG_NOTIFICATION; pub const SCTP_EOF: ::c_int = ::MSG_FIN; +/* DCCP socket options */ +pub const DCCP_SOCKOPT_PACKET_SIZE: ::c_int = 1; +pub const DCCP_SOCKOPT_SERVICE: ::c_int = 2; +pub const DCCP_SOCKOPT_CHANGE_L: ::c_int = 3; +pub const DCCP_SOCKOPT_CHANGE_R: ::c_int = 4; +pub const DCCP_SOCKOPT_GET_CUR_MPS: ::c_int = 5; +pub const DCCP_SOCKOPT_SERVER_TIMEWAIT: ::c_int = 6; +pub const DCCP_SOCKOPT_SEND_CSCOV: ::c_int = 10; +pub const DCCP_SOCKOPT_RECV_CSCOV: ::c_int = 11; +pub const DCCP_SOCKOPT_AVAILABLE_CCIDS: ::c_int = 12; +pub const DCCP_SOCKOPT_CCID: ::c_int = 13; +pub const DCCP_SOCKOPT_TX_CCID: ::c_int = 14; +pub const DCCP_SOCKOPT_RX_CCID: ::c_int = 15; +pub const DCCP_SOCKOPT_QPOLICY_ID: ::c_int = 16; +pub const DCCP_SOCKOPT_QPOLICY_TXQLEN: ::c_int = 17; +pub const DCCP_SOCKOPT_CCID_RX_INFO: ::c_int = 128; +pub const DCCP_SOCKOPT_CCID_TX_INFO: ::c_int = 192; + +/// maximum number of services provided on the same listening port +pub const DCCP_SERVICE_LIST_MAX_LEN: ::c_int = 32; + f! { pub fn NLA_ALIGN(len: ::c_int) -> ::c_int { return ((len) + NLA_ALIGNTO - 1) & !(NLA_ALIGNTO - 1) |