pending ws + vmess

Watfaq · Aug 27, 2023 · e55cf11 · e55cf11
1 parent 037035b
commit e55cf11
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 262 deletions.
diff --git a/clash/tests/data/config/rules.yaml b/clash/tests/data/config/rules.yaml
@@ -127,6 +127,7 @@ proxies:
     cipher: auto
     udp: true
     skip-cert-verify: true
+    network: ws
     ws-opts:
       path: /api/v3/download.getFile
       headers:

diff --git a/clash_lib/src/proxy/vmess/mod.rs b/clash_lib/src/proxy/vmess/mod.rs
@@ -77,7 +77,6 @@ impl Handler {
         &'a self,
         s: AnyStream,
         sess: &'a Session,
-        resolver: ThreadSafeDNSResolver,
         udp: bool,
     ) -> io::Result<AnyStream> {
         let mut stream = s;
@@ -182,7 +181,7 @@ impl OutboundHandler for Handler {
         resolver: ThreadSafeDNSResolver,
     ) -> io::Result<AnyStream> {
         let stream = new_tcp_stream(
-            resolver.clone(),
+            resolver,
             self.opts.server.as_str(),
             self.opts.port,
             self.opts.common_opts.iface.as_ref(),
@@ -198,17 +197,17 @@ impl OutboundHandler for Handler {
         })
         .await?;
 
-        self.inner_proxy_stream(stream, sess, resolver, false).await
+        self.inner_proxy_stream(stream, sess, false).await
     }
 
     /// wraps a stream with outbound handler
     async fn proxy_stream(
         &self,
         s: AnyStream,
         sess: &Session,
-        resolver: ThreadSafeDNSResolver,
+        _: ThreadSafeDNSResolver,
     ) -> io::Result<AnyStream> {
-        self.inner_proxy_stream(s, sess, resolver, false).await
+        self.inner_proxy_stream(s, sess, false).await
     }
 
     async fn connect_datagram(
@@ -241,9 +240,7 @@ impl OutboundHandler for Handler {
                 format!("failed to resolve {}", sess.destination.host()).as_str(),
             ))?;
 
-        let stream = self
-            .inner_proxy_stream(stream, sess, resolver, true)
-            .await?;
+        let stream = self.inner_proxy_stream(stream, sess, true).await?;
 
         Ok(Box::new(OutboundDatagramVmess::new(
             stream,

diff --git a/clash_lib/src/proxy/vmess/vmess_impl/tls/macos.rs b/clash_lib/src/proxy/vmess/vmess_impl/tls/macos.rs
diff --git a/clash_lib/src/proxy/vmess/vmess_impl/tls/mod.rs b/clash_lib/src/proxy/vmess/vmess_impl/tls/mod.rs
diff --git a/clash_lib/src/proxy/vmess/vmess_impl/tls/stream.rs b/clash_lib/src/proxy/vmess/vmess_impl/tls/stream.rs
diff --git a/clash_lib/src/proxy/vmess/vmess_impl/tls/unix.rs b/clash_lib/src/proxy/vmess/vmess_impl/tls/unix.rs
diff --git a/clash_lib/src/proxy/vmess/vmess_impl/tls/windows.rs b/clash_lib/src/proxy/vmess/vmess_impl/tls/windows.rs