From bf1a10c9a72269f0fd94f659e1489813b6a3ab08 Mon Sep 17 00:00:00 2001 From: E1int <110526002+E1int@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:40:30 +0100 Subject: [PATCH 1/2] Fix device serial number parsing --- alvr/adb/src/parse.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/alvr/adb/src/parse.rs b/alvr/adb/src/parse.rs index 126c789066..125cbef757 100644 --- a/alvr/adb/src/parse.rs +++ b/alvr/adb/src/parse.rs @@ -85,9 +85,7 @@ pub fn parse_device(line: &str) -> Option { return None; } let (left, right) = line.split_at(SERIAL_NUMBER_COLUMN_LENGTH); - let serial = left - .contains("(no serial number)") - .then(|| left.trim().to_owned()); + let serial = (!left.contains("(no serial number)")).then(|| left.trim().to_owned()); let mut remaining = right.trim(); let connection_state = if remaining.starts_with("no permissions") { From d12330963837b5871d72ac6728b9e2bf19294abd Mon Sep 17 00:00:00 2001 From: E1int <110526002+E1int@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:41:16 +0100 Subject: [PATCH 2/2] Force stream protocol to TCP when wired --- alvr/server_core/src/connection.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/alvr/server_core/src/connection.rs b/alvr/server_core/src/connection.rs index 9dee3c8a2c..f12342b4a7 100644 --- a/alvr/server_core/src/connection.rs +++ b/alvr/server_core/src/connection.rs @@ -25,7 +25,7 @@ use alvr_packets::{ }; use alvr_session::{ BodyTrackingSinkConfig, CodecType, ControllersEmulationMode, FrameSize, H264Profile, - OpenvrConfig, SessionConfig, + OpenvrConfig, SessionConfig, SocketProtocol, }; use alvr_sockets::{ PeerType, ProtoControlSocket, StreamSocketBuilder, CONTROL_PORT, KEEPALIVE_INTERVAL, @@ -810,12 +810,18 @@ fn connection_pipeline( *ctx.bitrate_manager.lock() = BitrateManager::new(initial_settings.video.bitrate.history_size, fps); + let stream_protocol = if wired { + SocketProtocol::Tcp + } else { + initial_settings.connection.stream_protocol + }; + dbg_connection!("connection_pipeline: StreamSocket connect_to_client"); let mut stream_socket = StreamSocketBuilder::connect_to_client( HANDSHAKE_ACTION_TIMEOUT, client_ip, initial_settings.connection.stream_port, - initial_settings.connection.stream_protocol, + stream_protocol, initial_settings.connection.dscp, initial_settings.connection.server_send_buffer_bytes, initial_settings.connection.server_recv_buffer_bytes,