Skip to content

Commit 895bf0d

Browse files
committed
Auto merge of #2141 - zonyitoo:master, r=JohnTitor
Unified Linux TCP socket options https://github.com/torvalds/linux/blob/master/include/uapi/linux/tcp.h
2 parents d3ca6a7 + 0ff814a commit 895bf0d

File tree

6 files changed

+37
-41
lines changed

6 files changed

+37
-41
lines changed

src/unix/linux_like/android/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,8 +1153,6 @@ pub const SO_RXQ_OVFL: ::c_int = 40;
11531153
pub const SO_PEEK_OFF: ::c_int = 42;
11541154
pub const SO_BUSY_POLL: ::c_int = 46;
11551155

1156-
pub const TCP_ULP: ::c_int = 31;
1157-
11581156
pub const IPTOS_ECN_NOTECT: u8 = 0x00;
11591157

11601158
pub const O_ACCMODE: ::c_int = 3;

src/unix/linux_like/emscripten/mod.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -899,8 +899,6 @@ pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void;
899899
pub const RTLD_NODELETE: ::c_int = 0x1000;
900900
pub const RTLD_NOW: ::c_int = 0x2;
901901

902-
pub const TCP_MD5SIG: ::c_int = 14;
903-
904902
align_const! {
905903
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
906904
size: [0; __SIZEOF_PTHREAD_MUTEX_T],
@@ -1341,16 +1339,6 @@ pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;
13411339

13421340
pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
13431341

1344-
pub const TCP_THIN_LINEAR_TIMEOUTS: ::c_int = 16;
1345-
pub const TCP_THIN_DUPACK: ::c_int = 17;
1346-
pub const TCP_USER_TIMEOUT: ::c_int = 18;
1347-
pub const TCP_REPAIR: ::c_int = 19;
1348-
pub const TCP_REPAIR_QUEUE: ::c_int = 20;
1349-
pub const TCP_QUEUE_SEQ: ::c_int = 21;
1350-
pub const TCP_REPAIR_OPTIONS: ::c_int = 22;
1351-
pub const TCP_FASTOPEN: ::c_int = 23;
1352-
pub const TCP_TIMESTAMP: ::c_int = 24;
1353-
13541342
#[doc(hidden)]
13551343
#[deprecated(since = "0.2.55", note = "Use SIGSYS instead")]
13561344
pub const SIGUNUSED: ::c_int = ::SIGSYS;

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -622,18 +622,6 @@ pub const SOCK_SEQPACKET: ::c_int = 5;
622622
pub const SOCK_DCCP: ::c_int = 6;
623623
pub const SOCK_PACKET: ::c_int = 10;
624624

625-
pub const TCP_COOKIE_TRANSACTIONS: ::c_int = 15;
626-
pub const TCP_THIN_LINEAR_TIMEOUTS: ::c_int = 16;
627-
pub const TCP_THIN_DUPACK: ::c_int = 17;
628-
pub const TCP_USER_TIMEOUT: ::c_int = 18;
629-
pub const TCP_REPAIR: ::c_int = 19;
630-
pub const TCP_REPAIR_QUEUE: ::c_int = 20;
631-
pub const TCP_QUEUE_SEQ: ::c_int = 21;
632-
pub const TCP_REPAIR_OPTIONS: ::c_int = 22;
633-
pub const TCP_FASTOPEN: ::c_int = 23;
634-
pub const TCP_TIMESTAMP: ::c_int = 24;
635-
pub const TCP_FASTOPEN_CONNECT: ::c_int = 30;
636-
637625
pub const FAN_MARK_INODE: ::c_uint = 0x0000_0000;
638626
pub const FAN_MARK_MOUNT: ::c_uint = 0x0000_0010;
639627
// NOTE: FAN_MARK_FILESYSTEM requires Linux Kernel >= 4.20.0

src/unix/linux_like/linux/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,8 +1423,6 @@ pub const RTLD_NOW: ::c_int = 0x2;
14231423

14241424
pub const AT_EACCESS: ::c_int = 0x200;
14251425

1426-
pub const TCP_MD5SIG: ::c_int = 14;
1427-
14281426
align_const! {
14291427
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t {
14301428
size: [0; __SIZEOF_PTHREAD_MUTEX_T],
@@ -1565,7 +1563,6 @@ cfg_if! {
15651563
pub const LIO_WAIT: ::c_int = 0;
15661564
pub const LIO_NOWAIT: ::c_int = 1;
15671565
pub const RUSAGE_THREAD: ::c_int = 1;
1568-
pub const TCP_ULP: ::c_int = 31;
15691566
pub const MSG_COPY: ::c_int = 0o40000;
15701567
pub const SHM_EXEC: ::c_int = 0o100000;
15711568
pub const IPV6_MULTICAST_ALL: ::c_int = 29;

src/unix/linux_like/linux/musl/mod.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -516,18 +516,6 @@ pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
516516
pub const SOCK_DCCP: ::c_int = 6;
517517
pub const SOCK_PACKET: ::c_int = 10;
518518

519-
pub const TCP_COOKIE_TRANSACTIONS: ::c_int = 15;
520-
pub const TCP_THIN_LINEAR_TIMEOUTS: ::c_int = 16;
521-
pub const TCP_THIN_DUPACK: ::c_int = 17;
522-
pub const TCP_USER_TIMEOUT: ::c_int = 18;
523-
pub const TCP_REPAIR: ::c_int = 19;
524-
pub const TCP_REPAIR_QUEUE: ::c_int = 20;
525-
pub const TCP_QUEUE_SEQ: ::c_int = 21;
526-
pub const TCP_REPAIR_OPTIONS: ::c_int = 22;
527-
pub const TCP_FASTOPEN: ::c_int = 23;
528-
pub const TCP_TIMESTAMP: ::c_int = 24;
529-
pub const TCP_FASTOPEN_CONNECT: ::c_int = 30;
530-
531519
#[deprecated(since = "0.2.55", note = "Use SIGSYS instead")]
532520
pub const SIGUNUSED: ::c_int = ::SIGSYS;
533521

src/unix/linux_like/mod.rs

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,43 @@ pub const TCP_WINDOW_CLAMP: ::c_int = 10;
957957
pub const TCP_INFO: ::c_int = 11;
958958
pub const TCP_QUICKACK: ::c_int = 12;
959959
pub const TCP_CONGESTION: ::c_int = 13;
960+
pub const TCP_MD5SIG: ::c_int = 14;
961+
cfg_if! {
962+
if #[cfg(all(target_os = "linux", any(target_env = "gnu", target_env = "musl")))] {
963+
// WARN: deprecated
964+
pub const TCP_COOKIE_TRANSACTIONS: ::c_int = 15;
965+
}
966+
}
967+
pub const TCP_THIN_LINEAR_TIMEOUTS: ::c_int = 16;
968+
pub const TCP_THIN_DUPACK: ::c_int = 17;
969+
pub const TCP_USER_TIMEOUT: ::c_int = 18;
970+
pub const TCP_REPAIR: ::c_int = 19;
971+
pub const TCP_REPAIR_QUEUE: ::c_int = 20;
972+
pub const TCP_QUEUE_SEQ: ::c_int = 21;
973+
pub const TCP_REPAIR_OPTIONS: ::c_int = 22;
974+
pub const TCP_FASTOPEN: ::c_int = 23;
975+
pub const TCP_TIMESTAMP: ::c_int = 24;
976+
pub const TCP_NOTSENT_LOWAT: ::c_int = 25;
977+
pub const TCP_CC_INFO: ::c_int = 26;
978+
pub const TCP_SAVE_SYN: ::c_int = 27;
979+
pub const TCP_SAVED_SYN: ::c_int = 28;
980+
cfg_if! {
981+
if #[cfg(not(target_os = "emscripten"))] {
982+
// NOTE: emscripten doesn't support these options yet.
983+
984+
pub const TCP_REPAIR_WINDOW: ::c_int = 29;
985+
pub const TCP_FASTOPEN_CONNECT: ::c_int = 30;
986+
pub const TCP_ULP: ::c_int = 31;
987+
pub const TCP_MD5SIG_EXT: ::c_int = 32;
988+
pub const TCP_FASTOPEN_KEY: ::c_int = 33;
989+
pub const TCP_FASTOPEN_NO_COOKIE: ::c_int = 34;
990+
pub const TCP_ZEROCOPY_RECEIVE: ::c_int = 35;
991+
pub const TCP_INQ: ::c_int = 36;
992+
pub const TCP_CM_INQ: ::c_int = TCP_INQ;
993+
// NOTE: Some CI images doesn't have this option yet.
994+
// pub const TCP_TX_DELAY: ::c_int = 37;
995+
}
996+
}
960997

961998
pub const SO_DEBUG: ::c_int = 1;
962999

0 commit comments

Comments
 (0)