reduce memory usage when loading multiple duplicated ca/cert/key

zephyrchien · Apr 18, 2022 · c76dff0 · c76dff0
1 parent 409f113
commit c76dff0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kaminari/Cargo.toml b/kaminari/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kaminari"
-version = "0.5.5"
+version = "0.5.6"
 edition = "2021"
 authors = ["zephyr <[email protected]>"]
 keywords = ["lightws", "network"]

diff --git a/kaminari/src/mix.rs b/kaminari/src/mix.rs
@@ -32,6 +32,20 @@ impl MixConnect {
             (Some(ws), Some(tls)) => Wss(WsConnect::new(TlsConnect::new(NopConnect {}, tls), ws)),
         }
     }
+
+    pub fn new_shared(conf: MixClientConf) -> Self {
+        use MixConnect::*;
+        let MixClientConf { ws, tls } = conf;
+        match (ws, tls) {
+            (None, None) => Plain(NopConnect {}),
+            (Some(ws), None) => Ws(WsConnect::new(NopConnect {}, ws)),
+            (None, Some(tls)) => Tls(TlsConnect::new_shared(NopConnect {}, tls)),
+            (Some(ws), Some(tls)) => Wss(WsConnect::new(
+                TlsConnect::new_shared(NopConnect {}, tls),
+                ws,
+            )),
+        }
+    }
 }
 
 impl<S: IOStream> AsyncConnect<S> for MixConnect {
@@ -80,6 +94,19 @@ impl MixAccept {
             (Some(ws), Some(tls)) => Wss(WsAccept::new(TlsAccept::new(NopAccept {}, tls), ws)),
         }
     }
+
+    pub fn new_shared(conf: MixServerConf) -> Self {
+        use MixAccept::*;
+        let MixServerConf { ws, tls } = conf;
+        match (ws, tls) {
+            (None, None) => Plain(NopAccept {}),
+            (Some(ws), None) => Ws(WsAccept::new(NopAccept {}, ws)),
+            (None, Some(tls)) => Tls(TlsAccept::new_shared(NopAccept {}, tls)),
+            (Some(ws), Some(tls)) => {
+                Wss(WsAccept::new(TlsAccept::new_shared(NopAccept {}, tls), ws))
+            }
+        }
+    }
 }
 
 impl<S: IOStream> AsyncAccept<S> for MixAccept {