Auto merge of #2849 - devnexen:socket_linux_update, r=JohnTitor

Few socket updates related for Linux.
rust-lang · Jul 21, 2022 · 8036869 · 8036869
2 parents 4238054 + 317b100
commit 8036869
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -1601,6 +1601,7 @@ fn test_android(target: &str) {
                 "linux/reboot.h",
                 "linux/seccomp.h",
                 "linux/sched.h",
+                "linux/sock_diag.h",
                 "linux/sockios.h",
                 "linux/vm_sockets.h",
                 "linux/wait.h",
@@ -2820,6 +2821,7 @@ fn test_linux(target: &str) {
         "linux/sched.h",
         "linux/seccomp.h",
         "linux/sched.h",
+        "linux/sock_diag.h",
         "linux/sockios.h",
         "linux/uinput.h",
         "linux/vm_sockets.h",

diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt
@@ -1181,6 +1181,7 @@ MSG_RST
 MSG_STAT
 MSG_SYN
 MSG_WAITFORONE
+MSG_ZEROCOPY
 MS_ACTIVE
 MS_BIND
 MS_DIRSYNC

diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
@@ -775,6 +775,11 @@ pub const MSG_ERRQUEUE: ::c_int = 0x2000;
 pub const MSG_NOSIGNAL: ::c_int = 0x4000;
 pub const MSG_MORE: ::c_int = 0x8000;
 pub const MSG_WAITFORONE: ::c_int = 0x10000;
+cfg_if! {
+    if #[cfg(not(target_os = "emscripten"))] {
+        pub const MSG_ZEROCOPY: ::c_int = 0x4000000;
+    }
+}
 pub const MSG_FASTOPEN: ::c_int = 0x20000000;
 pub const MSG_CMSG_CLOEXEC: ::c_int = 0x40000000;
 
@@ -1178,6 +1183,21 @@ pub const PTRACE_EVENT_VFORK_DONE: ::c_int = 5;
 pub const PTRACE_EVENT_EXIT: ::c_int = 6;
 pub const PTRACE_EVENT_SECCOMP: ::c_int = 7;
 
+cfg_if! {
+    if #[cfg(not(target_os = "emscripten"))] {
+        // SO_MEMINFO offsets
+        pub const SK_MEMINFO_RMEM_ALLOC: ::c_int = 0;
+        pub const SK_MEMINFO_RCVBUF: ::c_int = 1;
+        pub const SK_MEMINFO_WMEM_ALLOC: ::c_int = 2;
+        pub const SK_MEMINFO_SNDBUF: ::c_int = 3;
+        pub const SK_MEMINFO_FWD_ALLOC: ::c_int = 4;
+        pub const SK_MEMINFO_WMEM_QUEUED: ::c_int = 5;
+        pub const SK_MEMINFO_OPTMEM: ::c_int = 6;
+        pub const SK_MEMINFO_BACKLOG: ::c_int = 7;
+        pub const SK_MEMINFO_DROPS: ::c_int = 8;
+    }
+}
+
 pub const __WNOTHREAD: ::c_int = 0x20000000;
 pub const __WALL: ::c_int = 0x40000000;
 pub const __WCLONE: ::c_int = 0x80000000;