refactor: log error on thread exit

Author: ihciah

src/client.rs

@@ -9,15 +9,18 @@ use byteorder::{BigEndian, WriteBytesExt};
 use monoio::{
     buf::IoBufMut,
     io::{AsyncReadRent, AsyncReadRentExt, AsyncWriteRent, AsyncWriteRentExt, Splitable},
-    net::{TcpListener, TcpStream},
+    net::TcpStream,
 };
 use monoio_rustls_fork_shadow_tls::TlsConnector;
 use rand::{prelude::Distribution, seq::SliceRandom, Rng};
 use rustls_fork_shadow_tls::{OwnedTrustAnchor, RootCertStore, ServerName};
 
 use crate::{
     helper_v2::{copy_with_application_data, copy_without_application_data, HashedReadStream},
-    util::{kdf, mod_tcp_conn, prelude::*, verified_relay, xor_slice, Hmac, V3Mode},
+    util::{
+        bind_with_pretty_error, kdf, mod_tcp_conn, prelude::*, verified_relay, xor_slice, Hmac,
+        V3Mode,
+    },
 };
 
 const FAKE_REQUEST_LENGTH_RANGE: (usize, usize) = (16, 64);
@@ -156,8 +159,7 @@ impl<LA, TA> ShadowTlsClient<LA, TA> {
         LA: std::net::ToSocketAddrs + 'static,
         TA: std::net::ToSocketAddrs + 'static,
     {
-        let listener = TcpListener::bind(self.listen_addr.as_ref())
-            .map_err(|e| anyhow::anyhow!("bind failed, check if the port is used: {e}"))?;
+        let listener = bind_with_pretty_error(self.listen_addr.as_ref())?;
         let shared = Rc::new(self);
         loop {
             match listener.accept().await {

src/main.rs

@@ -270,15 +270,17 @@ fn main() {
                 .enable_timer()
                 .build()
                 .expect("unable to build monoio runtime(please refer to: https://github.com/ihciah/shadow-tls/wiki/How-to-Run#common-issues)");
-            let _ = rt.block_on(runnable_clone.serve());
+            rt.block_on(runnable_clone.serve())
         });
         threads.push(t);
     }
     if let Err(e) = ctrlc::set_handler(|| std::process::exit(0)) {
         tracing::error!("Unable to register signal handler: {e}");
     }
     threads.into_iter().for_each(|t| {
-        let _ = t.join();
+        if let Err(e) = t.join().expect("couldn't join on the associated thread") {
+            tracing::error!("Thread exit: {e}");
+        }
     });
 }
 

src/server.rs

@@ -16,7 +16,7 @@ use monoio::{
         AsyncReadRent, AsyncReadRentExt, AsyncWriteRent, AsyncWriteRentExt, PrefixedReadIo,
         Splitable,
     },
-    net::{TcpListener, TcpStream},
+    net::TcpStream,
 };
 
 use crate::{
@@ -25,8 +25,8 @@ use crate::{
         FutureOrOutput, HashedWriteStream, HmacHandler, HMAC_SIZE_V2,
     },
     util::{
-        copy_bidirectional, copy_until_eof, kdf, mod_tcp_conn, prelude::*, verified_relay,
-        xor_slice, Hmac, V3Mode,
+        bind_with_pretty_error, copy_bidirectional, copy_until_eof, kdf, mod_tcp_conn, prelude::*,
+        verified_relay, xor_slice, Hmac, V3Mode,
     },
 };
 
@@ -148,8 +148,7 @@ impl<LA, TA> ShadowTlsServer<LA, TA> {
         LA: std::net::ToSocketAddrs + 'static,
         TA: std::net::ToSocketAddrs + 'static,
     {
-        let listener = TcpListener::bind(self.listen_addr.as_ref())
-            .map_err(|e| anyhow::anyhow!("bind failed, check if the port is used: {e}"))?;
+        let listener = bind_with_pretty_error(self.listen_addr.as_ref())?;
         let shared = Rc::new(self);
         loop {
             match listener.accept().await {

src/util.rs

@@ -1,11 +1,11 @@
-use std::{ptr::copy_nonoverlapping, time::Duration};
+use std::{io::ErrorKind, net::ToSocketAddrs, ptr::copy_nonoverlapping, time::Duration};
 
 use byteorder::{BigEndian, WriteBytesExt};
 use local_sync::oneshot::{Receiver, Sender};
 use monoio::{
     buf::IoBufMut,
     io::{AsyncReadRent, AsyncWriteRent, AsyncWriteRentExt, Splitable},
-    net::TcpStream,
+    net::{TcpListener, TcpStream},
 };
 
 use hmac::Mac;
@@ -176,6 +176,19 @@ pub async fn verified_relay(
     );
 }
 
+/// Bind with pretty error.
+pub fn bind_with_pretty_error<A: ToSocketAddrs>(addr: A) -> anyhow::Result<TcpListener> {
+    TcpListener::bind(addr).map_err(|e| match e.kind() {
+        ErrorKind::AddrInUse => {
+            anyhow::anyhow!("bind failed, check if the port is used: {e}")
+        }
+        ErrorKind::PermissionDenied => {
+            anyhow::anyhow!("bind failed, check if permission configured correct: {e}")
+        }
+        _ => anyhow::anyhow!("bind failed: {e}"),
+    })
+}
+
 /// Remove application data header, verify hmac, remove the
 /// hmac header and copy.
 async fn copy_remove_appdata_and_verify(