From be7f9f010bbeb6ff9302e68e66cf0935824a0edd Mon Sep 17 00:00:00 2001
From: zephyr <i@zephyr.moe>
Date: Fri, 17 Jun 2022 00:25:09 +0900
Subject: [PATCH] exit immediately, do not handle accept failure

---
 Cargo.lock        | 11 +++++------
 cmd/Cargo.toml    |  8 ++++----
 cmd/src/client.rs |  7 ++++++-
 cmd/src/server.rs |  7 ++++++-
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2ed531d..3d83581 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -114,9 +114,7 @@ dependencies = [
 
 [[package]]
 name = "kaminari"
-version = "0.8.3"
-source = "registry+/~https://github.com/rust-lang/crates.io-index"
-checksum = "a950527d5583b6b8dd5c120bf6bbf23b2946cc88772a653c8ca0b5b5e07e873f"
+version = "0.9.0"
 dependencies = [
  "lazy_static",
  "lightws",
@@ -131,6 +129,8 @@ dependencies = [
 [[package]]
 name = "kaminari"
 version = "0.9.0"
+source = "registry+/~https://github.com/rust-lang/crates.io-index"
+checksum = "815665de1010c5ce13ecdfbe3e193eadb5aa6c07afd092abdb9f6bff2942a4a8"
 dependencies = [
  "lazy_static",
  "lightws",
@@ -138,16 +138,15 @@ dependencies = [
  "rustls-pemfile",
  "tokio",
  "tokio-rustls",
- "udpflow",
  "webpki-roots",
 ]
 
 [[package]]
 name = "kaminari-cmd"
-version = "0.5.3"
+version = "0.5.4"
 dependencies = [
  "anyhow",
- "kaminari 0.8.3",
+ "kaminari 0.9.0 (registry+/~https://github.com/rust-lang/crates.io-index)",
  "realm_io",
  "tokio",
 ]
diff --git a/cmd/Cargo.toml b/cmd/Cargo.toml
index fe0e90f..f6b9918 100644
--- a/cmd/Cargo.toml
+++ b/cmd/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kaminari-cmd"
-version = "0.5.3"
+version = "0.5.4"
 edition = "2021"
 authors = ["zephyr <i@zephyr.moe>"]
 repository = "/~https://github.com/zephyrchien/kaminari/cmd"
@@ -9,10 +9,10 @@ readme = "README.md"
 license = "GPL-3.0"
 
 [dependencies]
-kaminari = "0.8.3"
-realm_io = "0.3.2"
-tokio = { version = "1", features = ["rt", "net", "macros"] }
 anyhow = "1"
+realm_io = "0.3.2"
+kaminari = { version = "0.9.0", features = ["ws", "tls"] }
+tokio = { version = "1.9", features = ["rt", "net", "macros"] }
 
 [[bin]]
 name = "kaminaric"
diff --git a/cmd/src/client.rs b/cmd/src/client.rs
index 151a1d5..59023a2 100644
--- a/cmd/src/client.rs
+++ b/cmd/src/client.rs
@@ -41,7 +41,10 @@ async fn main() -> Result<()> {
                     Ok((stream, _)) => {
                         tokio::spawn(relay(stream, remote, $cc));
                     }
-                    Err(e) => eprintln!("accept error: {}", e),
+                    Err(e) => {
+                        eprintln!("accept error: {}", e);
+                        break;
+                    }
                 }
             }
         };
@@ -87,6 +90,8 @@ async fn main() -> Result<()> {
             run_ws_each!(client);
         }
     };
+
+    Ok(())
 }
 
 async fn relay<T>(mut local: TcpStream, remote: SocketAddr, client: Ref<T>) -> std::io::Result<()>
diff --git a/cmd/src/server.rs b/cmd/src/server.rs
index e0692b0..2450b84 100644
--- a/cmd/src/server.rs
+++ b/cmd/src/server.rs
@@ -51,7 +51,10 @@ async fn main() -> Result<()> {
                     Ok((stream, _)) => {
                         tokio::spawn(relay(stream, remote, $ac));
                     }
-                    Err(e) => eprintln!("accept error: {}", e),
+                    Err(e) => {
+                        eprintln!("accept error: {}", e);
+                        break;
+                    }
                 }
             }
         };
@@ -75,6 +78,8 @@ async fn main() -> Result<()> {
             run!(Ref::new(&server));
         }
     };
+
+    Ok(())
 }
 
 async fn relay<T: AsyncAccept<TcpStream>>(