set socket tos-dscp EF flag

korejan · Jan 13, 2024 · 18aabd8 · 18aabd8
1 parent 73d44b5
commit 18aabd8
Show file tree

Hide file tree

Showing 26 changed files with 281 additions and 259 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/alvr/audio/Cargo.toml b/alvr/audio/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_audio"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "Riccardo Zaglia <riccardo.zaglia5@gmail.com>"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/client/Cargo.toml b/alvr/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_client"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "Riccardo Zaglia <riccardo.zaglia5@gmail.com>"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/commands/Cargo.toml b/alvr/commands/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_commands"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "Riccardo Zaglia <riccardo.zaglia5@gmail.com>"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/common/Cargo.toml b/alvr/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_common"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "Riccardo Zaglia <riccardo.zaglia5@gmail.com>"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/filesystem/Cargo.toml b/alvr/filesystem/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_filesystem"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "Patrick Nicolas <patricknicolas@laposte.net>"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/launcher/Cargo.toml b/alvr/launcher/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_launcher"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "Riccardo Zaglia <riccardo.zaglia5@gmail.com>"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/openxr-client/alxr-android-client/Cargo.toml b/alvr/openxr-client/alxr-android-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-android-client"
-version = "0.21.0"
+version = "0.22.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for android platorms"

diff --git a/alvr/openxr-client/alxr-android-client/lynx/Cargo.toml b/alvr/openxr-client/alxr-android-client/lynx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client-lynx"
-version = "0.21.0"
+version = "0.22.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for android platorms"

diff --git a/alvr/openxr-client/alxr-android-client/pico-v4/Cargo.toml b/alvr/openxr-client/alxr-android-client/pico-v4/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client-pico-v4"
-version = "0.21.0"
+version = "0.22.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for Pico 4/Neo 3, pre PUI v5.2.x"

diff --git a/alvr/openxr-client/alxr-android-client/pico/Cargo.toml b/alvr/openxr-client/alxr-android-client/pico/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client-pico"
-version = "0.21.0"
+version = "0.22.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for Pico 4/Neo 3, PUI >= v5.2.x"

diff --git a/alvr/openxr-client/alxr-android-client/quest/Cargo.toml b/alvr/openxr-client/alxr-android-client/quest/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client-quest"
-version = "0.21.0"
+version = "0.22.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for Oculus Quest 1/2"

diff --git a/alvr/openxr-client/alxr-client/Cargo.toml b/alvr/openxr-client/alxr-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client"
-version = "0.21.0"
+version = "0.22.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 description = "An OpenXR based ALVR client for non-android platorms"

diff --git a/alvr/openxr-client/alxr-client/uwp/Cargo.toml b/alvr/openxr-client/alxr-client/uwp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-client-uwp"
-version = "1.21.0"
+version = "1.22.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 build = ".build/main.rs"

diff --git a/alvr/openxr-client/alxr-common/Cargo.toml b/alvr/openxr-client/alxr-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-common"
-version = "0.21.0"
+version = "0.22.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 

diff --git a/alvr/openxr-client/alxr-engine-sys/Cargo.toml b/alvr/openxr-client/alxr-engine-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alxr-engine-sys"
-version = "0.21.0"
+version = "0.22.0"
 authors = ["korejan <64199710+korejan@users.noreply.github.com>"]
 edition = "2021"
 links = "alxr_engine"

diff --git a/alvr/server/Cargo.toml b/alvr/server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_server"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "polygraphene", "Valve Corporation"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/session/Cargo.toml b/alvr/session/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_session"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "Riccardo Zaglia <riccardo.zaglia5@gmail.com>"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/sockets/Cargo.toml b/alvr/sockets/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_sockets"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "Riccardo Zaglia <riccardo.zaglia5@gmail.com>"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/sockets/src/stream_socket/tcp.rs b/alvr/sockets/src/stream_socket/tcp.rs
@@ -17,6 +17,8 @@ use tokio_util::codec::Framed;
 pub type TcpStreamSendSocket = Arc<Mutex<SplitSink<Framed<TcpStream, Ldc>, Bytes>>>;
 pub type TcpStreamReceiveSocket = SplitStream<Framed<TcpStream, Ldc>>;
 
+const IPTOS_DSCP_EF: u32 = 0xb8;
+
 pub async fn bind(
     port: u16,
     send_buffer_bytes: SocketBufferSize,
@@ -27,6 +29,9 @@ pub async fn bind(
 
     super::set_socket_buffers(&socket, send_buffer_bytes, recv_buffer_bytes).ok();
 
+    socket.set_nodelay(true).ok();
+    socket.set_tos(IPTOS_DSCP_EF).ok();
+
     TcpListener::from_std(socket.into()).map_err(err!())
 }
 
@@ -60,8 +65,10 @@ pub async fn connect_to_client(
 
     super::set_socket_buffers(&socket, send_buffer_bytes, recv_buffer_bytes).ok();
 
+    socket.set_nodelay(true).ok();
+    socket.set_tos(IPTOS_DSCP_EF).ok();
+
     let socket = TcpStream::from_std(socket.into()).map_err(err!())?;
-    socket.set_nodelay(true).map_err(err!())?;
     let socket = Framed::new(socket, Ldc::new());
     let (send_socket, receive_socket) = socket.split();
 

diff --git a/alvr/sockets/src/stream_socket/udp.rs b/alvr/sockets/src/stream_socket/udp.rs
@@ -18,6 +18,8 @@ use tokio::{
 };
 use tokio_util::udp::UdpFramed;
 
+const IPTOS_DSCP_EF: u32 = 0xb8;
+
 #[allow(clippy::type_complexity)]
 #[derive(Clone)]
 pub struct UdpStreamSendSocket {
@@ -44,6 +46,8 @@ pub async fn bind(
 
     super::set_socket_buffers(&socket, send_buffer_bytes, recv_buffer_bytes).ok();
 
+    socket.set_tos(IPTOS_DSCP_EF).ok();
+
     UdpSocket::from_std(socket.into()).map_err(err!())
 }
 

diff --git a/alvr/vrcompositor-wrapper/Cargo.toml b/alvr/vrcompositor-wrapper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "vrcompositor-wrapper"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "Patrick Nicolas <patricknicolas@laposte.net>"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/vulkan-layer/Cargo.toml b/alvr/vulkan-layer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_vulkan-layer"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "ARM", "Patrick Nicolas <patricknicolas@laposte.net>"]
 license = "MIT"
 edition = "2021"

diff --git a/alvr/xtask/Cargo.toml b/alvr/xtask/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "alvr_xtask"
-version = "18.7.0"
+version = "18.8.0"
 authors = ["alvr-org", "Riccardo Zaglia <riccardo.zaglia5@gmail.com>"]
 license = "MIT"
 edition = "2021"

diff --git a/packaging/deb/control b/packaging/deb/control
@@ -34,7 +34,7 @@ Vcs-Browser: /~https://github.com/alvr-org/ALVR
 Vcs-Git: /~https://github.com/alvr-org/ALVR.git
 Rules-Requires-Root: no
 Package: alvr
-Version: 18.7.0
+Version: 18.8.0
 Architecture: amd64
 Recommends: steam
 Description: Stream VR games from your PC to your headset via Wi-Fi

diff --git a/packaging/rpm/alvr.spec b/packaging/rpm/alvr.spec
@@ -1,9 +1,9 @@
 Name: alvr
-Version: 18.7.0
+Version: 18.8.0
 Release: 1.0.0
 Summary: Stream VR games from your PC to your headset via Wi-Fi
 License: MIT
-Source: /~https://github.com/alvr-org/ALVR/archive/refs/tags/v18.7.0.tar.gz
+Source: /~https://github.com/alvr-org/ALVR/archive/refs/tags/v18.8.0.tar.gz
 URL: /~https://github.com/alvr-org/ALVR/
 ExclusiveArch: x86_64
 BuildRequires: alsa-lib-devel cairo-gobject-devel cargo clang-devel ffmpeg-devel gcc gcc-c++ cmake ImageMagick (jack-audio-connection-kit-devel or pipewire-jack-audio-connection-kit-devel) libunwind-devel openssl-devel rpmdevtools rust rust-atk-sys-devel rust-cairo-sys-rs-devel rust-gdk-sys-devel rust-glib-sys-devel rust-pango-sys-devel selinux-policy-devel vulkan-headers vulkan-loader-devel