linux pbr

Watfaq · Sep 17, 2024 · 1ff758c · 1ff758c
1 parent 10499b6
commit 1ff758c
Show file tree

Hide file tree

Showing 37 changed files with 452 additions and 196 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clash/tests/data/config/rules.yaml b/clash/tests/data/config/rules.yaml
@@ -8,6 +8,7 @@ tun:
   device-id: "dev://utun1989"
   route-all: true
   gateway: "198.19.0.1/32"
+  so-mark: 3389
   # routes:
   #   - 0.0.0.0/1
   #   - 128.0.0.0/1

diff --git a/clash_lib/src/app/outbound/manager.rs b/clash_lib/src/app/outbound/manager.rs
@@ -390,8 +390,9 @@ impl OutboundManager {
                     let relay = relay::Handler::new(
                         relay::HandlerOptions {
                             name: proto.name.clone(),
-                            shared_opts: crate::proxy::HandlerSharedOptions {
+                            common_opts: crate::proxy::HandlerCommonOptions {
                                 icon: proto.icon.clone(),
+                                ..Default::default()
                             },
                         },
                         providers,
@@ -443,8 +444,9 @@ impl OutboundManager {
                     let url_test = urltest::Handler::new(
                         urltest::HandlerOptions {
                             name: proto.name.clone(),
-                            shared_opts: crate::proxy::HandlerSharedOptions {
+                            common_opts: crate::proxy::HandlerCommonOptions {
                                 icon: proto.icon.clone(),
+                                ..Default::default()
                             },
                             ..Default::default()
                         },
@@ -499,8 +501,9 @@ impl OutboundManager {
                     let fallback = fallback::Handler::new(
                         fallback::HandlerOptions {
                             name: proto.name.clone(),
-                            shared_opts: crate::proxy::HandlerSharedOptions {
+                            common_opts: crate::proxy::HandlerCommonOptions {
                                 icon: proto.icon.clone(),
+                                ..Default::default()
                             },
                             ..Default::default()
                         },
@@ -554,8 +557,9 @@ impl OutboundManager {
                     let load_balance = loadbalance::Handler::new(
                         loadbalance::HandlerOptions {
                             name: proto.name.clone(),
-                            shared_opts: crate::proxy::HandlerSharedOptions {
+                            common_opts: crate::proxy::HandlerCommonOptions {
                                 icon: proto.icon.clone(),
+                                ..Default::default()
                             },
                             ..Default::default()
                         },
@@ -613,8 +617,9 @@ impl OutboundManager {
                         selector::HandlerOptions {
                             name: proto.name.clone(),
                             udp: proto.udp.unwrap_or(true),
-                            shared_opts: crate::proxy::HandlerSharedOptions {
+                            common_opts: crate::proxy::HandlerCommonOptions {
                                 icon: proto.icon.clone(),
+                                ..Default::default()
                             },
                         },
                         providers,
@@ -651,7 +656,10 @@ impl OutboundManager {
             selector::HandlerOptions {
                 name: PROXY_GLOBAL.to_owned(),
                 udp: true,
-                shared_opts: crate::proxy::HandlerSharedOptions { icon: None },
+                common_opts: crate::proxy::HandlerCommonOptions {
+                    icon: None,
+                    ..Default::default()
+                },
             },
             vec![pd.clone()],
             stored_selection,

diff --git a/clash_lib/src/config/def.rs b/clash_lib/src/config/def.rs
@@ -20,6 +20,10 @@ pub struct TunConfig {
     #[serde(default)]
     pub route_all: bool,
     pub mtu: Option<i32>,
+    /// fwmark on Linux only
+    pub so_mark: Option<u32>,
+    /// policy routing table on Linux only
+    pub route_table: Option<u32>,
 }
 
 #[derive(Serialize, Deserialize, Default, Copy, Clone)]

diff --git a/clash_lib/src/config/internal/config.rs b/clash_lib/src/config/internal/config.rs
@@ -118,6 +118,8 @@ impl TryFrom<def::Config> for Config {
                         Error::InvalidConfig(format!("parse tun gateway: {}", x))
                     })?,
                     mtu: t.mtu,
+                    so_mark: t.so_mark,
+                    route_table: t.route_table,
                 },
                 None => TunConfig::default(),
             },
@@ -300,6 +302,8 @@ pub struct TunConfig {
     pub routes: Vec<IpNet>,
     pub gateway: IpNet,
     pub mtu: Option<i32>,
+    pub so_mark: Option<u32>,
+    pub route_table: Option<u32>,
 }
 
 #[derive(Clone, Default)]

diff --git a/clash_lib/src/config/internal/proxy.rs b/clash_lib/src/config/internal/proxy.rs
@@ -125,7 +125,7 @@ impl Display for OutboundProxyProtocol {
 
 #[derive(serde::Serialize, serde::Deserialize, Debug, Default, Clone)]
 #[serde(rename_all = "kebab-case")]
-pub struct CommonOption {
+pub struct CommonConfigOptions {
     pub name: String,
     pub server: String,
     pub port: u16,
@@ -141,7 +141,7 @@ pub struct CommonOption {
 #[serde(rename_all = "kebab-case")]
 pub struct OutboundShadowsocks {
     #[serde(flatten)]
-    pub common_opts: CommonOption,
+    pub common_opts: CommonConfigOptions,
     pub cipher: String,
     pub password: String,
     #[serde(default = "default_bool_true")]
@@ -154,7 +154,7 @@ pub struct OutboundShadowsocks {
 #[serde(rename_all = "kebab-case")]
 pub struct OutboundSocks5 {
     #[serde(flatten)]
-    pub common_opts: CommonOption,
+    pub common_opts: CommonConfigOptions,
     pub username: Option<String>,
     pub password: Option<String>,
     #[serde(default = "Default::default")]
@@ -191,7 +191,7 @@ pub struct GrpcOpt {
 #[serde(rename_all = "kebab-case")]
 pub struct OutboundTrojan {
     #[serde(flatten)]
-    pub common_opts: CommonOption,
+    pub common_opts: CommonConfigOptions,
     pub password: String,
     pub alpn: Option<Vec<String>>,
     pub sni: Option<String>,
@@ -206,7 +206,7 @@ pub struct OutboundTrojan {
 #[serde(rename_all = "kebab-case")]
 pub struct OutboundVmess {
     #[serde(flatten)]
-    pub common_opts: CommonOption,
+    pub common_opts: CommonConfigOptions,
     pub uuid: String,
     #[serde(alias = "alterId")]
     pub alter_id: u16,
@@ -226,7 +226,7 @@ pub struct OutboundVmess {
 #[serde(rename_all = "kebab-case")]
 pub struct OutboundWireguard {
     #[serde(flatten)]
-    pub common_opts: CommonOption,
+    pub common_opts: CommonConfigOptions,
     pub private_key: String,
     pub public_key: String,
     pub preshared_key: Option<String>,
@@ -250,7 +250,7 @@ pub struct OutboundTor {
 #[serde(rename_all = "kebab-case")]
 pub struct OutboundTuic {
     #[serde(flatten)]
-    pub common_opts: CommonOption,
+    pub common_opts: CommonConfigOptions,
     pub uuid: Uuid,
     pub password: String,
     /// override field 'server' dns record, not used for now

diff --git a/clash_lib/src/proxy/converters/shadowsocks.rs b/clash_lib/src/proxy/converters/shadowsocks.rs
@@ -7,7 +7,7 @@ use crate::{
             Handler, HandlerOptions, OBFSOption, ShadowTlsOption, SimpleOBFSMode,
             SimpleOBFSOption, V2RayOBFSOption,
         },
-        CommonOption,
+        HandlerCommonOptions,
     },
     Error,
 };
@@ -26,7 +26,7 @@ impl TryFrom<&OutboundShadowsocks> for Handler {
     fn try_from(s: &OutboundShadowsocks) -> Result<Self, Self::Error> {
         let h = Handler::new(HandlerOptions {
             name: s.common_opts.name.to_owned(),
-            common_opts: CommonOption {
+            common_opts: HandlerCommonOptions {
                 connector: s.common_opts.connect_via.clone(),
                 ..Default::default()
             },

diff --git a/clash_lib/src/proxy/converters/socks5.rs b/clash_lib/src/proxy/converters/socks5.rs
@@ -2,7 +2,7 @@ use crate::{
     config::internal::proxy::OutboundSocks5,
     proxy::{
         socks::{Handler, HandlerOptions},
-        CommonOption,
+        HandlerCommonOptions,
     },
 };
 
@@ -20,7 +20,7 @@ impl TryFrom<&OutboundSocks5> for Handler {
     fn try_from(s: &OutboundSocks5) -> Result<Self, Self::Error> {
         let h = Handler::new(HandlerOptions {
             name: s.common_opts.name.to_owned(),
-            common_opts: CommonOption {
+            common_opts: HandlerCommonOptions {
                 connector: s.common_opts.connect_via.clone(),
                 ..Default::default()
             },

diff --git a/clash_lib/src/proxy/converters/trojan.rs b/clash_lib/src/proxy/converters/trojan.rs
@@ -5,7 +5,7 @@ use crate::{
     proxy::{
         options::{GrpcOption, WsOption},
         trojan::{Handler, HandlerOptions, Transport},
-        CommonOption,
+        HandlerCommonOptions,
     },
     Error,
 };
@@ -32,7 +32,7 @@ impl TryFrom<&OutboundTrojan> for Handler {
 
         let h = Handler::new(HandlerOptions {
             name: s.common_opts.name.to_owned(),
-            common_opts: CommonOption {
+            common_opts: HandlerCommonOptions {
                 connector: s.common_opts.connect_via.clone(),
                 ..Default::default()
             },

diff --git a/clash_lib/src/proxy/converters/tuic.rs b/clash_lib/src/proxy/converters/tuic.rs
@@ -6,7 +6,7 @@ use crate::{
     config::internal::proxy::OutboundTuic,
     proxy::{
         tuic::{types::CongestionControl, Handler, HandlerOptions},
-        CommonOption,
+        HandlerCommonOptions,
     },
 };
 
@@ -25,7 +25,7 @@ impl TryFrom<&OutboundTuic> for Handler {
         Ok(Handler::new(HandlerOptions {
             name: s.common_opts.name.to_owned(),
             server: s.common_opts.server.to_owned(),
-            common_opts: CommonOption {
+            common_opts: HandlerCommonOptions {
                 connector: s.common_opts.connect_via.clone(),
                 ..Default::default()
             },

diff --git a/clash_lib/src/proxy/converters/vmess.rs b/clash_lib/src/proxy/converters/vmess.rs
@@ -6,7 +6,7 @@ use crate::{
         options::{GrpcOption, Http2Option, WsOption},
         transport::TLSOptions,
         vmess::{Handler, HandlerOptions, VmessTransport},
-        CommonOption,
+        HandlerCommonOptions,
     },
     Error,
 };
@@ -33,7 +33,7 @@ impl TryFrom<&OutboundVmess> for Handler {
 
         let h = Handler::new(HandlerOptions {
             name: s.common_opts.name.to_owned(),
-            common_opts: CommonOption {
+            common_opts: HandlerCommonOptions {
                 connector: s.common_opts.connect_via.clone(),
                 ..Default::default()
             },

diff --git a/clash_lib/src/proxy/converters/wireguard.rs b/clash_lib/src/proxy/converters/wireguard.rs
@@ -4,7 +4,7 @@ use crate::{
     config::internal::proxy::OutboundWireguard,
     proxy::{
         wg::{Handler, HandlerOptions},
-        CommonOption,
+        HandlerCommonOptions,
     },
     Error,
 };
@@ -23,7 +23,7 @@ impl TryFrom<&OutboundWireguard> for Handler {
     fn try_from(s: &OutboundWireguard) -> Result<Self, Self::Error> {
         let h = Handler::new(HandlerOptions {
             name: s.common_opts.name.to_owned(),
-            common_opts: CommonOption {
+            common_opts: HandlerCommonOptions {
                 connector: s.common_opts.connect_via.clone(),
                 ..Default::default()
             },

diff --git a/clash_lib/src/proxy/direct/mod.rs b/clash_lib/src/proxy/direct/mod.rs
@@ -74,7 +74,7 @@ impl OutboundHandler for Handler {
             (remote_ip, sess.destination.port()).into(),
             sess.iface.clone(),
             #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            sess.so_mark,
         )
         .await?;
 
@@ -92,7 +92,7 @@ impl OutboundHandler for Handler {
             None,
             sess.iface.clone(),
             #[cfg(any(target_os = "linux", target_os = "android"))]
-            None,
+            sess.so_mark,
         )
         .await
         .map(|x| OutboundDatagramImpl::new(x, resolver))?;
@@ -119,7 +119,7 @@ impl OutboundHandler for Handler {
                 sess.destination.port(),
                 sess.iface.as_ref(),
                 #[cfg(any(target_os = "linux", target_os = "android"))]
-                None,
+                sess.so_mark,
             )
             .await?;
         let s = ChainedStreamWrapper::new(s);
@@ -140,7 +140,7 @@ impl OutboundHandler for Handler {
                 sess.destination.clone(),
                 sess.iface.clone(),
                 #[cfg(any(target_os = "linux", target_os = "android"))]
-                None,
+                sess.so_mark,
             )
             .await?;
         let d = ChainedDatagramWrapper::new(d);

diff --git a/clash_lib/src/proxy/fallback/mod.rs b/clash_lib/src/proxy/fallback/mod.rs
@@ -22,7 +22,7 @@ use super::{
 
 #[derive(Default, Clone)]
 pub struct HandlerOptions {
-    pub shared_opts: super::options::HandlerSharedOptions,
+    pub common_opts: super::options::HandlerCommonOptions,
     pub name: String,
     pub udp: bool,
 }
@@ -150,6 +150,6 @@ impl OutboundHandler for Handler {
     }
 
     fn icon(&self) -> Option<String> {
-        self.opts.shared_opts.icon.clone()
+        self.opts.common_opts.icon.clone()
     }
 }
diff --git a/clash_lib/src/proxy/loadbalance/mod.rs b/clash_lib/src/proxy/loadbalance/mod.rs
@@ -26,7 +26,7 @@ use super::{
 
 #[derive(Default, Clone)]
 pub struct HandlerOptions {
-    pub shared_opts: super::options::HandlerSharedOptions,
+    pub common_opts: super::options::HandlerCommonOptions,
     pub name: String,
     pub udp: bool,
     pub strategy: LoadBalanceStrategy,
@@ -157,6 +157,6 @@ impl OutboundHandler for Handler {
     }
 
     fn icon(&self) -> Option<String> {
-        self.opts.shared_opts.icon.clone()
+        self.opts.common_opts.icon.clone()
     }
 }