Skip to content

fix(adb): fix device serial parsing and use TCP #2507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
The-personified-devil merged 2 commits into from
Nov 14, 2024
Merged

fix(adb): fix device serial parsing and use TCP #2507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf1a10c
Fix device serial number parsing
E1int Nov 14, 2024
d123309
Force stream protocol to TCP when wired
E1int Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions alvr/adb/src/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ pub fn parse_device(line: &str) -> Option<Device> {
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") {
Expand Down
10 changes: 8 additions & 2 deletions alvr/server_core/src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading