Skip to content

Commit 2a212c8

Browse files
linux: Add definitions for Multipath TCP
We leave IPPROTO_MAX as is for the time being. However, in recent kernel releases IPPROTO_MAX is actually higher and reflects the addition of IPPROTO_MPTCP.
1 parent a410c35 commit 2a212c8

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

libc-test/build.rs

+4
Original file line numberDiff line numberDiff line change
@@ -2649,6 +2649,10 @@ fn test_linux(target: &str) {
26492649
// Require Linux kernel 5.6:
26502650
"VMADDR_CID_LOCAL" => true,
26512651

2652+
// IPPROTO_MAX was increased in 5.6 for IPPROTO_MPTCP:
2653+
| "IPPROTO_MAX"
2654+
| "IPPROTO_MPTCP" => true,
2655+
26522656
// Defined in kernel headers but musl removes it; need musl 1.2 for definition in musl
26532657
// headers.
26542658
"P_PIDFD" => true,

src/unix/linux_like/android/mod.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,8 @@ pub const SOCK_SEQPACKET: ::c_int = 5;
10081008
pub const SOCK_DCCP: ::c_int = 6;
10091009
pub const SOCK_PACKET: ::c_int = 10;
10101010

1011+
pub const IPPROTO_MAX: ::c_int = 256;
1012+
10111013
pub const SOL_SOCKET: ::c_int = 1;
10121014
pub const SOL_SCTP: ::c_int = 132;
10131015
pub const SOL_IPX: ::c_int = 256;
@@ -1068,6 +1070,8 @@ pub const SO_RXQ_OVFL: ::c_int = 40;
10681070
pub const SO_PEEK_OFF: ::c_int = 42;
10691071
pub const SO_BUSY_POLL: ::c_int = 46;
10701072

1073+
pub const TCP_ULP: ::c_int = 31;
1074+
10711075
pub const IPTOS_ECN_NOTECT: u8 = 0x00;
10721076

10731077
pub const O_ACCMODE: ::c_int = 3;

src/unix/linux_like/emscripten/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1557,6 +1557,8 @@ pub const SOCK_STREAM: ::c_int = 1;
15571557
pub const SOCK_DGRAM: ::c_int = 2;
15581558
pub const SOCK_SEQPACKET: ::c_int = 5;
15591559

1560+
pub const IPPROTO_MAX: ::c_int = 256;
1561+
15601562
pub const SOL_SOCKET: ::c_int = 1;
15611563

15621564
pub const SO_REUSEADDR: ::c_int = 2;

src/unix/linux_like/linux/mod.rs

+10
Original file line numberDiff line numberDiff line change
@@ -1228,6 +1228,7 @@ pub const RTLD_NOW: ::c_int = 0x2;
12281228
pub const AT_EACCESS: ::c_int = 0x200;
12291229

12301230
pub const TCP_MD5SIG: ::c_int = 14;
1231+
pub const TCP_ULP: ::c_int = 31;
12311232

12321233
align_const! {
12331234
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
@@ -1262,6 +1263,15 @@ pub const SCHED_RESET_ON_FORK: ::c_int = 0x40000000;
12621263

12631264
// netinet/in.h
12641265
// NOTE: These are in addition to the constants defined in src/unix/mod.rs
1266+
1267+
/// Multipath TCP
1268+
pub const IPPROTO_MPTCP: ::c_int = 262;
1269+
#[deprecated(
1270+
since = "0.2.79",
1271+
note = "IPPROTO_MAX depends on the kernel version on the target system"
1272+
)]
1273+
pub const IPPROTO_MAX: ::c_int = 263;
1274+
12651275
pub const AF_IB: ::c_int = 27;
12661276
pub const AF_MPLS: ::c_int = 28;
12671277
pub const AF_NFC: ::c_int = 39;

src/unix/linux_like/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -869,7 +869,6 @@ pub const IPPROTO_UDPLITE: ::c_int = 136;
869869
pub const IPPROTO_MPLS: ::c_int = 137;
870870
/// raw IP packet
871871
pub const IPPROTO_RAW: ::c_int = 255;
872-
pub const IPPROTO_MAX: ::c_int = 256;
873872

874873
pub const MCAST_EXCLUDE: ::c_int = 0;
875874
pub const MCAST_INCLUDE: ::c_int = 1;

0 commit comments

Comments
 (0)