feat(shadowsocks): ProxyServerStream::from_stream made public (#1613)

shadowsocks · Aug 13, 2024 · d67908f · d67908f
1 parent 0041f62
commit d67908f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/crates/shadowsocks/src/relay/tcprelay/proxy_listener.rs b/crates/shadowsocks/src/relay/tcprelay/proxy_listener.rs
@@ -78,7 +78,7 @@ impl ProxyListener {
         let stream = map_fn(stream);
 
         // Create a ProxyServerStream and read the target address from it
-        let stream = ProxyServerStream::from_stream(
+        let stream = ProxyServerStream::from_stream_with_user_manager(
             self.context.clone(),
             stream,
             self.method,

diff --git a/crates/shadowsocks/src/relay/tcprelay/proxy_stream/server.rs b/crates/shadowsocks/src/relay/tcprelay/proxy_stream/server.rs
@@ -42,7 +42,15 @@ pub struct ProxyServerStream<S> {
 }
 
 impl<S> ProxyServerStream<S> {
-    pub(crate) fn from_stream(
+    /// Create a `ProxyServerStream` from a connection stream
+    pub fn from_stream(context: SharedContext, stream: S, method: CipherKind, key: &[u8]) -> ProxyServerStream<S> {
+        ProxyServerStream::from_stream_with_user_manager(context, stream, method, key, None)
+    }
+
+    /// Create a `ProxyServerStream` from a connection stream
+    ///
+    /// Set `user_manager` to enable support of verifying EIH users.
+    pub fn from_stream_with_user_manager(
         context: SharedContext,
         stream: S,
         method: CipherKind,