refactor: instead of delivery mark everywhere, use global mark

Watfaq · Apr 9, 2024 · 4ee0b15 · 4ee0b15
1 parent 2fb6ead
commit 4ee0b15
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 45 deletions.
diff --git a/clash_lib/src/app/dns/dhcp.rs b/clash_lib/src/app/dns/dhcp.rs
@@ -176,9 +176,7 @@ async fn listen_dhcp_client(iface: &str) -> io::Result<UdpSocket> {
 
     new_udp_socket(
         Some(&listen_addr.parse().expect("must parse")),
-        Some(&Interface::Name(iface.to_string())),
-        #[cfg(any(target_os = "linux", target_os = "android"))]
-        None,
+        Some(&Interface::Name(iface.to_string()))
     )
     .await
 }

diff --git a/clash_lib/src/common/http.rs b/clash_lib/src/common/http.rs
@@ -49,9 +49,7 @@ impl Service<Uri> for LocalConnector {
                         _ => panic!("invalid url: {}", remote),
                     },
                 }),
-                None,
-                #[cfg(any(target_os = "linux", target_os = "android"))]
-                None,
+                None
             )
             .await
         })

diff --git a/clash_lib/src/proxy/direct/mod.rs b/clash_lib/src/proxy/direct/mod.rs
@@ -52,9 +52,7 @@ impl OutboundHandler for Handler {
             resolver,
             sess.destination.host().as_str(),
             sess.destination.port(),
-            None,
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            None
         )
         .await?;
 
@@ -79,9 +77,7 @@ impl OutboundHandler for Handler {
     ) -> std::io::Result<BoxedChainedDatagram> {
         let d = new_udp_socket(
             None,
-            sess.iface.as_ref(),
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            sess.iface.as_ref()
         )
         .await
         .map(|x| OutboundDatagramImpl::new(x, resolver))?;

diff --git a/clash_lib/src/proxy/relay/mod.rs b/clash_lib/src/proxy/relay/mod.rs
@@ -91,9 +91,7 @@ impl OutboundHandler for Handler {
                     resolver.clone(),
                     remote_addr.host().as_str(),
                     remote_addr.port(),
-                    None,
-                    #[cfg(any(target_os = "linux", target_os = "android"))]
-                    None,
+                    None
                 )
                 .await?;
 

diff --git a/clash_lib/src/proxy/shadowsocks/mod.rs b/clash_lib/src/proxy/shadowsocks/mod.rs
@@ -217,9 +217,7 @@ impl OutboundHandler for Handler {
             resolver.clone(),
             self.opts.server.as_str(),
             self.opts.port,
-            self.opts.common_opts.iface.as_ref(),
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            self.opts.common_opts.iface.as_ref()
         )
         .map_err(|x| {
             io::Error::new(
@@ -310,9 +308,7 @@ impl OutboundHandler for Handler {
         );
         let socket = new_udp_socket(
             None,
-            self.opts.common_opts.iface.as_ref(),
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            self.opts.common_opts.iface.as_ref()
         )
         .await?;
         let socket = ProxySocket::from_socket(UdpSocketType::Client, ctx, &cfg, socket);

diff --git a/clash_lib/src/proxy/socks/inbound/stream.rs b/clash_lib/src/proxy/socks/inbound/stream.rs
@@ -140,9 +140,7 @@ pub async fn handle_tcp<'a>(
             let udp_addr = SocketAddr::new(s.local_addr()?.ip(), 0);
             let udp_inbound = new_udp_socket(
                 Some(&udp_addr),
-                None,
-                #[cfg(any(target_os = "linux", target_os = "android"))]
-                None,
+                None
             )
             .await?;
 
@@ -166,7 +164,6 @@ pub async fn handle_tcp<'a>(
             let sess = Session {
                 network: Network::Udp,
                 typ: Type::Socks5,
-                packet_mark: None,
                 iface: None,
                 ..Default::default()
             };

diff --git a/clash_lib/src/proxy/trojan/mod.rs b/clash_lib/src/proxy/trojan/mod.rs
@@ -155,9 +155,7 @@ impl OutboundHandler for Handler {
             resolver.clone(),
             self.opts.server.as_str(),
             self.opts.port,
-            self.opts.common_opts.iface.as_ref(),
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            self.opts.common_opts.iface.as_ref()
         )
         .map_err(|x| {
             io::Error::new(
@@ -195,9 +193,7 @@ impl OutboundHandler for Handler {
             resolver.clone(),
             self.opts.server.as_str(),
             self.opts.port,
-            self.opts.common_opts.iface.as_ref(),
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            self.opts.common_opts.iface.as_ref()
         )
         .map_err(|x| {
             io::Error::new(

diff --git a/clash_lib/src/proxy/utils/socket_helpers.rs b/clash_lib/src/proxy/utils/socket_helpers.rs
@@ -9,6 +9,7 @@ use tokio::{
     net::{TcpSocket, TcpStream, UdpSocket},
     time::timeout,
 };
+use crate::session::get_somark;
 
 #[cfg(target_os = "windows")]
 use tracing::warn;
@@ -72,7 +73,6 @@ pub async fn new_tcp_stream<'a>(
     address: &'a str,
     port: u16,
     iface: Option<&'a Interface>,
-    #[cfg(any(target_os = "linux", target_os = "android"))] packet_mark: Option<u32>,
 ) -> io::Result<AnyStream> {
     let dial_addr = resolver
         .resolve(address, false)
@@ -103,8 +103,8 @@ pub async fn new_tcp_stream<'a>(
         must_bind_socket_on_interface(&socket, iface)?;
     }
 
-    #[cfg(any(target_os = "linux", target_os = "android"))]
-    if let Some(packet_mark) = packet_mark {
+    #[cfg(target_os = "linux")]
+    if let Some(packet_mark) = get_somark() {
         socket.set_mark(packet_mark)?;
     }
 
@@ -124,7 +124,6 @@ pub async fn new_tcp_stream<'a>(
 pub async fn new_udp_socket(
     src: Option<&SocketAddr>,
     iface: Option<&Interface>,
-    #[cfg(any(target_os = "linux", target_os = "android"))] packet_mark: Option<u32>,
 ) -> io::Result<UdpSocket> {
     let socket = match src {
         Some(src) => {
@@ -146,7 +145,7 @@ pub async fn new_udp_socket(
     }
 
     #[cfg(any(target_os = "linux", target_os = "android"))]
-    if let Some(packet_mark) = packet_mark {
+    if let Some(packet_mark) = get_somark() {
         socket.set_mark(packet_mark)?;
     }
 

diff --git a/clash_lib/src/proxy/vmess/mod.rs b/clash_lib/src/proxy/vmess/mod.rs
@@ -174,9 +174,7 @@ impl OutboundHandler for Handler {
             resolver,
             self.opts.server.as_str(),
             self.opts.port,
-            self.opts.common_opts.iface.as_ref(),
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            self.opts.common_opts.iface.as_ref()
         )
         .map_err(|x| {
             io::Error::new(
@@ -214,9 +212,7 @@ impl OutboundHandler for Handler {
             resolver.clone(),
             self.opts.server.as_str(),
             self.opts.port,
-            self.opts.common_opts.iface.as_ref(),
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            self.opts.common_opts.iface.as_ref()
         )
         .map_err(|x| {
             io::Error::new(

diff --git a/clash_lib/src/proxy/wg/wireguard.rs b/clash_lib/src/proxy/wg/wireguard.rs
@@ -82,9 +82,7 @@ impl WireguardTunnel {
 
         let udp = new_udp_socket(
             None,
-            None,
-            #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            None
         )
         .await?;
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,9 +49,7 @@ impl Service<Uri> for LocalConnector { @@
                             _ => panic!("invalid url: {}", remote),
                         },
                     }),
-                    None,
-                    #[cfg(any(target_os = "linux", target_os = "android"))]
-                    None,
+                    None
                 )
                 .await
             })
@@ Expand Down @@