Skip to content

Commit 4c9a1ed

Browse files
committed
Fix rebase error
1 parent 52db446 commit 4c9a1ed

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

alvr/server_core/src/connection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ pub fn contruct_openvr_config(session: &SessionConfig) -> OpenvrConfig {
246246
pub fn handshake_loop(ctx: Arc<ConnectionContext>, lifecycle_state: Arc<RwLock<LifecycleState>>) {
247247
dbg_connection!("handshake_loop: Begin");
248248

249-
let welcome_socket = match WelcomeSocket::new() {
249+
let mut welcome_socket = match WelcomeSocket::new() {
250250
Ok(socket) => socket,
251251
Err(e) => {
252252
error!("Failed to create discovery socket: {e:?}");

alvr/server_core/src/sockets.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl WelcomeSocket {
3232
}
3333

3434
// Returns: client IP, client hostname
35-
pub fn recv_all(&self) -> Result<HashMap<String, IpAddr>> {
35+
pub fn recv_all(&mut self) -> Result<HashMap<String, IpAddr>> {
3636
let mut clients = HashMap::new();
3737

3838
loop {

0 commit comments

Comments
 (0)