Limit maximum timeouts while receiving a packet.

Author: meqif

src/socket.rs

@@ -20,7 +20,7 @@ const INITIAL_CONGESTION_TIMEOUT: u64 = 1000; // one second
 const MIN_CONGESTION_TIMEOUT: u64 = 500; // 500 ms
 const MAX_CONGESTION_TIMEOUT: u64 = 60_000; // one minute
 const BASE_HISTORY: usize = 10; // base delays history size
-const MAX_CONNECT_TRIES: u16 = 5;
+const MAX_TIMEOUTS: u16 = 5;
 
 #[derive(Debug)]
 pub enum SocketError {
@@ -255,7 +255,7 @@ impl UtpSocket {
                 Ok((read, src)) => { socket.connected_to = src; len = read; break; },
                 Err(ref e) if (e.kind() == ErrorKind::WouldBlock ||
                                e.kind() == ErrorKind::TimedOut) => {
-                    if try == MAX_CONNECT_TRIES {
+                    if try == MAX_TIMEOUTS {
                         return Err(Error::from(SocketError::ConnectionTimedOut));
                     }
                     debug!("Timed out, retrying");
@@ -327,6 +327,7 @@ impl UtpSocket {
                 return Err(Error::from(SocketError::ConnectionReset));
             }
 
+            let mut timeouts = 0;
             loop {
                 // A closed socket with no pending data can only "read" 0 new bytes.
                 if self.state == SocketState::Closed {
@@ -336,6 +337,12 @@ impl UtpSocket {
                 match self.recv(buf) {
                     Ok((0, _src)) => continue,
                     Ok(x) => return Ok(x),
+                    Err(ref e) if e.kind() == ErrorKind::TimedOut => {
+                        timeouts += 1;
+                        if timeouts == MAX_TIMEOUTS {
+                            return Err(Error::from(SocketError::ConnectionTimedOut));
+                        }
+                    }
                     Err(e) => return Err(e)
                 }
             }
@@ -355,7 +362,7 @@ impl UtpSocket {
                 self.congestion_timeout = self.congestion_timeout * 2;
                 self.cwnd = MSS;
                 self.send_fast_resend_request();
-                return Ok((0, self.connected_to));
+                return Err(Error::from(SocketError::ConnectionTimedOut));
             },
             Ok(x) => x,
             Err(e) => return Err(e),