Merge pull request #23 from ssrlive/main

timeout and shutdown

examples/tun2.rs

@@ -5,11 +5,12 @@
 //!
 //! This example must be run as root or administrator privileges.
 //! ```
-//! sudo target/debug/examples/tun --server-addr 127.0.0.1:8080 # Linux or macOS
+//! sudo target/debug/examples/tun2 --server-addr 127.0.0.1:8080 # Linux or macOS
 //! ```
 //! Then please run the `echo` example server, which listens on TCP & UDP ports 127.0.0.1:8080.
 //! ```
-//! target/debug/examples/echo 127.0.0.1:8080
+//! cargo install socks5-impl --example echo-server
+//! echo-server --listen-addr 127.0.0.1:8080 --tcp-timeout 600
 //! ```
 //! To route traffic to the tun interface, run the following command with root or administrator privileges:
 //! ```

src/stream/tcp.rs

@@ -483,10 +483,7 @@ impl AsyncWrite for IpStackTcpStream {
         cx: &mut std::task::Context<'_>,
     ) -> std::task::Poll<Result<(), std::io::Error>> {
         let notified = self.shutdown.get_or_insert(Notify::new()).notified();
-        match Pin::new(&mut Box::pin(notified)).poll(cx) {
-            std::task::Poll::Ready(_) => std::task::Poll::Ready(Ok(())),
-            std::task::Poll::Pending => std::task::Poll::Pending,
-        }
+        Pin::new(&mut Box::pin(notified)).poll(cx).map(Ok)
     }
 }
 

src/stream/udp.rs

@@ -133,7 +133,7 @@ impl AsyncRead for IpStackUdpStream {
             return std::task::Poll::Ready(Ok(()));
         }
         if matches!(self.timeout.as_mut().poll(cx), std::task::Poll::Ready(_)) {
-            return std::task::Poll::Ready(Ok(())); // todo: return timeout error
+            return std::task::Poll::Ready(Err(std::io::Error::from(std::io::ErrorKind::TimedOut)));
         }
 
         self.reset_timeout();