Add io::Result::io_to_con()

alvr-org · Aug 8, 2023 · 25c5a9e · 25c5a9e
1 parent f3e7ef1
commit 25c5a9e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 13 deletions.
diff --git a/alvr/common/src/connection_result.rs b/alvr/common/src/connection_result.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use std::{error::Error, fmt::Display};
+use std::{error::Error, fmt::Display, io};
 
 pub enum ConnectionError {
     TryAgain,
@@ -29,6 +29,7 @@ macro_rules! con_bail {
 }
 
 pub trait ToCon<T> {
+    /// Convert result to ConResult. The error is always mapped to `Other()`
     fn to_con(self) -> ConResult<T>;
 }
 
@@ -62,3 +63,22 @@ impl<T> AnyhowToCon<T> for Result<T, anyhow::Error> {
         }
     }
 }
+
+pub trait IOToCon<T> {
+    fn io_to_con(self) -> ConResult<T>;
+}
+
+impl<T> IOToCon<T> for io::Result<T> {
+    fn io_to_con(self) -> ConResult<T> {
+        match self {
+            Ok(value) => Ok(value),
+            Err(e) => {
+                if e.kind() == io::ErrorKind::TimedOut || e.kind() == io::ErrorKind::WouldBlock {
+                    Err(ConnectionError::TryAgain)
+                } else {
+                    Err(ConnectionError::Other(e.into()))
+                }
+            }
+        }
+    }
+}
diff --git a/alvr/server/src/sockets.rs b/alvr/server/src/sockets.rs
@@ -1,7 +1,6 @@
-use alvr_common::{anyhow::Result, con_bail, ConResult, ToCon, ALVR_NAME};
+use alvr_common::{anyhow::Result, con_bail, ConResult, IOToCon, ToCon, ALVR_NAME};
 use alvr_sockets::{CONTROL_PORT, HANDSHAKE_PACKET_SIZE_BYTES, LOCAL_IP};
 use std::{
-    io::ErrorKind,
     net::{IpAddr, UdpSocket},
     time::Duration,
 };
@@ -24,16 +23,7 @@ impl WelcomeSocket {
 
     // Returns: client IP, client hostname
     pub fn recv(&mut self) -> ConResult<(String, IpAddr)> {
-        let (size, address) = match self.socket.recv_from(&mut self.buffer) {
-            Ok(pair) => pair,
-            Err(e) => {
-                if matches!(e.kind(), ErrorKind::TimedOut | ErrorKind::WouldBlock) {
-                    return alvr_common::try_again();
-                } else {
-                    con_bail!("{e}");
-                }
-            }
-        };
+        let (size, address) = self.socket.recv_from(&mut self.buffer).io_to_con()?;
 
         if size == HANDSHAKE_PACKET_SIZE_BYTES
             && &self.buffer[..ALVR_NAME.len()] == ALVR_NAME.as_bytes()