rm tun feature (always enabled)

e1732a364fed · e1732a364fed · commit a89dc95cc07c · 2099-01-01T00:00:00.000Z
diff --git a/.github/workflows/build_ruci_cmd_cross.yml b/.github/workflows/build_ruci_cmd_cross.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Build ${{ matrix.target }}
         run: |
 
-          compile_features="-f file_server -f api_server -f api_client -f utils -f tun -f quinn -f native-tls-vendored -f lua54 -f lwip -f steganography"
+          compile_features="-f file_server -f api_server -f api_client -f utils -f quinn -f native-tls-vendored -f lua54 -f lwip -f steganography"
 
           cd crates/ruci-cmd
           ./build_cross.sh -v ${{ inputs.tag || github.ref_name }} -t ${{ matrix.target }} $compile_features
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,7 +43,7 @@ jobs:
         run: cargo test --verbose --all-features
 
       - name: Run Rucimp tests
-        run: cd rucimp && cargo test --verbose --features "tun quinn lua sockopt use-native-tls ruci-rustls21 trace steganography"
+        run: cd rucimp && cargo test --verbose --features "quinn lua sockopt use-native-tls ruci-rustls21 trace steganography"
 
       - name: Run Ruci-cmd tests
-        run: cd crates/ruci-cmd && cargo test --verbose --features "steganography lua file_server api_server api_client utils quinn use-native-tls tun lwip smoltcp"
+        run: cd crates/ruci-cmd && cargo test --verbose --features "steganography lua file_server api_server api_client utils quinn use-native-tls lwip smoltcp"
diff --git a/Cargo.toml b/Cargo.toml
@@ -93,11 +93,10 @@ sha2 = "0.10"          #for trojan
 hickory-resolver = { version = "0.24", features = ["serde-config"] }
 
 
-tun = { version = "0.7", features = ["async"], optional = true }
+tun = { version = "0.7", features = ["async"] }
 
 [features]
 
-default = ["tun"]
 
 trace = []
 
diff --git a/crates/ruci-cmd/Cargo.toml b/crates/ruci-cmd/Cargo.toml
@@ -63,7 +63,6 @@ default = ["api_server", "utils"]
 lua = ["rucimp/lua"]
 lua54 = ["rucimp/lua54"]
 
-tun = ["rucimp/tun"]
 
 # quic = ["rucimp/quic"]
 quinn = ["rucimp/quinn"]
diff --git a/crates/ruci-cmd/Makefile b/crates/ruci-cmd/Makefile
@@ -1,13 +1,13 @@
 define compile
-	cargo build --target ${BUILD_TRIPLET} -F steganography -F lua -F file_server -F api_server -F api_client -F utils -F quinn -F use-native-tls -F tun -F lwip -F smoltcp ${EXTRA} --release
+	cargo build --target ${BUILD_TRIPLET} -F steganography -F lua -F file_server -F api_server -F api_client -F utils -F quinn -F use-native-tls -F lwip -F smoltcp ${EXTRA} --release
 endef
 
 define default_target
-	cargo build -F steganography -F lua -F file_server -F api_server -F api_client -F utils -F quinn -F use-native-tls -F tun -F lwip -F smoltcp ${EXTRA} --release
+	cargo build -F steganography -F lua -F file_server -F api_server -F api_client -F utils -F quinn -F use-native-tls -F lwip -F smoltcp ${EXTRA} --release
 endef
 
 define compile_cross
-	cargo build --target ${BUILD_TRIPLET} -F steganography -F lua54 -F file_server -F api_server -F api_client -F utils -F quinn -F native-tls-vendored -F tun -F lwip -F smoltcp ${EXTRA} --release
+	cargo build --target ${BUILD_TRIPLET} -F steganography -F lua54 -F file_server -F api_server -F api_client -F utils -F quinn -F native-tls-vendored -F lwip -F smoltcp ${EXTRA} --release
 endef
 
 
diff --git a/crates/ruci-cmd/README.md b/crates/ruci-cmd/README.md
@@ -17,19 +17,19 @@ debug:
 ```sh
 
 # 指定不生成 log 
-RUST_LOG=none,ruci=debug cargo run --features "lua utils use-native-tls quinn tun steganography lwip smoltcp" -- --log-file ""
+RUST_LOG=none,ruci=debug cargo run --features "lua utils use-native-tls quinn  steganography lwip smoltcp" -- --log-file ""
 
 # 指定lua配置
-RUST_LOG=none,ruci=debug cargo run --features "lua utils use-native-tls quinn tun steganography lwip"  -- --log-file "" -c remote.lua
+RUST_LOG=none,ruci=debug cargo run --features "lua utils use-native-tls quinn  steganography lwip"  -- --log-file "" -c remote.lua
 
 # powershell
-$Env:RUST_LOG="none,ruci=debug";cargo run --features "lua utils use-native-tls quinn tun" -- --log-file ""
+$Env:RUST_LOG="none,ruci=debug";cargo run --features "lua utils use-native-tls quinn " -- --log-file ""
 
 # 运行 grpc 的 lua 配置. 注意要加 --infinite
-RUST_LOG=none,ruci=debug cargo run --features "lua utils use-native-tls quinn tun"  -- --log-file "" -c local_mux2_h2.lua --infinite
+RUST_LOG=none,ruci=debug cargo run --features "lua utils use-native-tls quinn "  -- --log-file "" -c local_mux2_h2.lua --infinite
 
 # 开启所有功能并启用 trace
-RUST_LOG=debug cargo run --features "api_server api_client trace lua utils use-native-tls quinn tun" -- -a --trace
+RUST_LOG=debug cargo run --features "api_server api_client trace lua utils use-native-tls quinn " -- -a --trace
 ```
 
 make:
@@ -56,7 +56,7 @@ CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android32-clang cargo buil
 
 # features
 
-features: lua, lua54, api_server, api_client, utils, trace, use-native-tls, native-tls-vendored, quic, quinn, tun, smoltcp, lwip
+features: lua, lua54, api_server, api_client, utils, trace, use-native-tls, native-tls-vendored, quic, quinn, , smoltcp, lwip
 default enables api_server,utils.
 
 api_server, trace 这两个feature都会少许降低 performance. 
diff --git a/crates/ruci-cmd/src/lib.rs b/crates/ruci-cmd/src/lib.rs
@@ -652,7 +652,6 @@ fn log_setup(args: Args) -> Option<tracing_appender::non_blocking::WorkerGuard>
         "quinn",
         // #[cfg(feature = "quic")]
         // "quic",
-        #[cfg(feature = "tun")]
         "tun",
         #[cfg(feature = "smoltcp")]
         "smoltcp",
diff --git a/dev_res/run_h2_trojans_recorder_pair.sh b/dev_res/run_h2_trojans_recorder_pair.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-RUST_LOG=none,ruci=debug cargo run --features "lua quinn tun lwip use-native-tls" --example chain -- remote.lua &
+RUST_LOG=none,ruci=debug cargo run --features "lua quinn lwip use-native-tls" --example chain -- remote.lua &
 PID1=$!
 
-RUST_LOG=none,ruci=debug cargo run --features "lua quinn tun lwip use-native-tls" --example chain_infinite -- local_mux_h2_recorder.lua &
+RUST_LOG=none,ruci=debug cargo run --features "lua quinn lwip use-native-tls" --example chain_infinite -- local_mux_h2_recorder.lua &
 PID2=$!
 
 sleep 5
diff --git a/dev_res/test_all_lua_examples.sh b/dev_res/test_all_lua_examples.sh
@@ -18,7 +18,7 @@ test_lua_file() {
     echo "Testing $file..."
     
     # 运行命令
-    RUST_LOG=none,ruci=debug cargo run --features "lua quinn tun lwip smoltcp use-native-tls steganography" --example lua "../$file" &
+    RUST_LOG=none,ruci=debug cargo run --features "lua quinn lwip smoltcp use-native-tls steganography" --example lua "../$file" &
     local pid=$!
     
     sleep 2
@@ -45,7 +45,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 cd "$SCRIPT_DIR/../rucimp" || exit 1
 echo "Building example lua ..."
 
-RUST_LOG=none,ruci=debug cargo build --example lua --features "lua quinn tun lwip smoltcp use-native-tls steganography"
+RUST_LOG=none,ruci=debug cargo build --example lua --features "lua quinn lwip smoltcp use-native-tls steganography"
 
 # 主测试逻辑
 echo "Starting Lua examples test..."
diff --git a/dev_res/test_all_lua_examples_with_ruci_cmd.sh b/dev_res/test_all_lua_examples_with_ruci_cmd.sh
@@ -18,7 +18,7 @@ test_lua_file() {
     echo "Testing $file..."
     
     # 运行命令
-    RUST_LOG=none,ruci=debug cargo run --features "lua utils use-native-tls quinn tun steganography lwip smoltcp" -- --log-file "" -c "../../$file" &
+    RUST_LOG=none,ruci=debug cargo run --features "lua utils use-native-tls quinn steganography lwip smoltcp" -- --log-file "" -c "../../$file" &
     local pid=$!
     
     sleep 2
@@ -46,7 +46,7 @@ cd "$SCRIPT_DIR/../crates/ruci-cmd" || exit 1
 
 echo "Building ruci-cmd..."
 
-RUST_LOG=none,ruci=debug cargo build --features "lua utils use-native-tls quinn tun steganography lwip smoltcp"
+RUST_LOG=none,ruci=debug cargo build --features "lua utils use-native-tls quinn steganography lwip smoltcp"
 
 # 主测试逻辑
 echo "Starting Lua examples test with ruci-cmd..."
diff --git a/dev_res/test_configs_with_ruci_cmd.sh b/dev_res/test_configs_with_ruci_cmd.sh
@@ -22,7 +22,7 @@ test_config_file() {
     echo "Testing $file..."
     
     # 运行命令
-    RUST_LOG=none,ruci=debug cargo run --features "lua utils use-native-tls quinn tun steganography lwip smoltcp" -- --log-file "" -c "$file" &
+    RUST_LOG=none,ruci=debug cargo run --features "lua utils use-native-tls quinn steganography lwip smoltcp" -- --log-file "" -c "$file" &
     local pid=$!
     
     sleep 2
@@ -152,7 +152,7 @@ fi
 echo "Starting test with ruci-cmd for ${selected_type} files in $(basename "$selected_dir")..."
 echo "----------------------------------------"
 
-RUST_LOG=none,ruci=debug cargo build --features "lua utils use-native-tls quinn tun steganography lwip smoltcp"
+RUST_LOG=none,ruci=debug cargo build --features "lua utils use-native-tls quinn steganography lwip smoltcp"
 
 # 测试每个文件
 for file in "${config_files[@]}"; do
diff --git a/doc/Introduction_zh.md b/doc/Introduction_zh.md
@@ -77,7 +77,7 @@ rucimp 的核心部分是 modes 模块. 读完 modes 内容后，其它代码都
 
 rucimp 有很多可选feature, 生成文档时要注意, 如
 
-    cargo doc --no-deps --open --features "ruci-rustls21 quinn tun trace lua use-native-tls"
+    cargo doc --no-deps --open --features "ruci-rustls21 quinn trace lua use-native-tls"
 
 ## ruci-cmd (可选)
 
diff --git a/doc/book/src/lua/map_config.md b/doc/book/src/lua/map_config.md
@@ -113,11 +113,9 @@ BindDialer 中所有项都是可选的，但 bind_addr 或 dial_addr 中至少
 
     dns_client= {..} --optional
 
-    --#[cfg(feature = "tun")]
-    in_auto_route= {..}, 
+    in_auto_route= {..},  --optional
 
-    --#[cfg(feature = "tun")]
-    out_auto_route = {..}, 
+    out_auto_route = {..},  --optional
 
     ext= {..}, --optional
 }
diff --git a/doc/dev.md b/doc/dev.md
@@ -1,9 +1,9 @@
 Clippy:
 ruci-cmd 目录下
-cargo clippy --all-targets --no-default-features --features "steganography lua file_server api_server api_client utils quinn use-native-tls tun lwip smoltcp"
+cargo clippy --all-targets --no-default-features --features "steganography lua file_server api_server api_client utils quinn use-native-tls lwip smoltcp"
 
 在 rucimp 目录下
-cargo clippy --all-targets --no-default-features --features "tun lwip smoltcp quinn lua sockopt use-native-tls ruci-rustls21 trace steganography"
+cargo clippy --all-targets --no-default-features --features "lwip smoltcp quinn lua sockopt use-native-tls ruci-rustls21 trace steganography"
 
 或在ruci目录下直接
 
@@ -45,3 +45,4 @@ macOS/linux 上存在内存泄漏，不知如何解决，可能与 tun 包有关
 又发现 windows 上开启tun 后，存在大量的组播请求，占用大量资源。这里有问题
 
 新的 netstack-lwip 代码已可以在 windows 上编译通过。
+使用了 netstack-smoltcp 包解决 自实现的 smoltcp 的 bug.
diff --git a/doc/notes.md b/doc/notes.md
@@ -501,7 +501,6 @@ https://docs.rs/futures/latest/futures/index.html
     "use-native-tls",
     "route",
     "quinn",
-    "tun"
   ],
   //"rust-analyzer.cargo.target": "aarch64-unknown-linux-gnu"
 }
diff --git a/rucimp/Cargo.toml b/rucimp/Cargo.toml
@@ -142,7 +142,6 @@ file_server = ["axum", "tower-http"]
 # quic = ["s2n-quic", "s2n-quic-rustls", "ruci-rustls21"]
 quinn = ["ruci-rustls21", "dep:quinn"]
 
-tun = ["ruci/tun"]
 trace = ["ruci/trace"]
 
 lua = ["mlua/luau", "serde-lua-table", "rustyline"]
diff --git a/rucimp/examples/readme.md b/rucimp/examples/readme.md
@@ -18,16 +18,16 @@ run_h2_trojans_recorder_pair.sh 同时运行h2 的 local 和 remote端用于测
 ```sh
 # in folder rucimp, run:
 
-RUST_LOG=none,ruci=debug cargo run --features "lua quinn tun lwip smoltcp use-native-tls steganography" --example lua
+RUST_LOG=none,ruci=debug cargo run --features "lua quinn lwip smoltcp use-native-tls steganography" --example lua
 RUST_LOG=none,ruci=debug cargo run --features "lua steganography" --example lua
 
-RUST_LOG=none,ruci=debug cargo run --features "lua quinn tun lwip smoltcp use-native-tls steganography" --example lua -- remote.lua
+RUST_LOG=none,ruci=debug cargo run --features "lua quinn lwip smoltcp use-native-tls steganography" --example lua -- remote.lua
 RUST_LOG=none,ruci=debug cargo run --features "lua steganography" --example lua -- remote.lua
 
-RUST_LOG=none,ruci=debug cargo run --features "lua quinn tun" --example lua_infinite -- local_mux_h2.lua
+RUST_LOG=none,ruci=debug cargo run --features "lua quinn" --example lua_infinite -- local_mux_h2.lua
 
 # linux
-RUST_LOG=none,ruci=debug cargo run --features "lua quinn tun sockopt" --example lua
+RUST_LOG=none,ruci=debug cargo run --features "lua quinn sockopt" --example lua
 
 ```
 
@@ -46,16 +46,7 @@ to use rule_route,
 download Country.mmdb from https://cdn.jsdelivr.net/gh/Loyalsoldier/geoip@release/Country.mmdb
 
 then put it to resource folder
-
-## tun
-
-need to enable rucimp's tun feature (which enables ruci's tun feature):
-
-```sh
-sudo RUST_LOG=debug cargo run --example lua -F tun -F lua
-```
-
-（这里的 -F 与上文的 --features 用处相同，只不过 对于参数 一个适合少量 一个适合大量)
+ 
 
 ### macos test
 
diff --git a/rucimp/src/modes/chain/config/mod.rs b/rucimp/src/modes/chain/config/mod.rs
@@ -271,11 +271,9 @@ pub struct BindDialerConfig {
 
     pub dns_client: Option<dns::ClientConfig>,
 
-    #[cfg(feature = "tun")]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub in_auto_route: Option<ruci::net::tun::route::InAutoRouteParams>,
 
-    #[cfg(feature = "tun")]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub out_auto_route: Option<ruci::net::tun::route::OutAutoRouteParams>,
 
@@ -306,7 +304,6 @@ impl TryFrom<Box<BindDialerConfig>> for MapBox {
 
         d.dial_addr = opt_dial_a;
         d.bind_addr = opt_bind_a;
-        #[cfg(feature = "tun")]
         {
             d.in_auto_route = value.in_auto_route;
             d.out_auto_route = value.out_auto_route;
diff --git a/src/map/network/mod.rs b/src/map/network/mod.rs
@@ -135,7 +135,6 @@ impl Map for Direct {
     }
 }
 
-#[cfg(feature = "tun")]
 #[derive(Clone, Debug, Default)]
 enum AutoRouteState {
     #[default]
@@ -153,13 +152,10 @@ pub struct BindDialer {
     pub bind_addr: Option<net::Addr>,
     pub opt_dns_client: Option<Arc<dns::AsyncClient>>,
 
-    #[cfg(feature = "tun")]
     pub in_auto_route: Option<tun::route::InAutoRouteParams>,
 
-    #[cfg(feature = "tun")]
     pub out_auto_route: Option<tun::route::OutAutoRouteParams>,
 
-    #[cfg(feature = "tun")]
     auto_route_state: Arc<parking_lot::Mutex<AutoRouteState>>,
 }
 
@@ -169,7 +165,6 @@ impl Display for BindDialer {
     }
 }
 
-#[cfg(feature = "tun")]
 impl Drop for BindDialer {
     fn drop(&mut self) {
         self.down_route();
@@ -181,7 +176,6 @@ impl BindDialer {
         Self::default()
     }
 
-    #[cfg(feature = "tun")]
     pub fn down_route(&mut self) {
         let mut mg = self.auto_route_state.lock();
         match &*mg {
@@ -230,7 +224,6 @@ impl BindDialer {
 
         match r {
             Ok(c) => {
-                #[cfg(feature = "tun")]
                 if let Some(a) = &bind_a {
                     if let Network::IP = a.network {
                         if let Some(c) = &self.in_auto_route {
diff --git a/src/net/addr.rs b/src/net/addr.rs
@@ -454,15 +454,14 @@ impl Addr {
         }
     }
 
-    /// dial tcp/udp/unix_domain_socket and `ip` if feature "tun" is enabled
+    /// dial tcp/udp/unix_domain_socket and `ip`(by tun)
     ///
     /// ## udp
     ///
     /// 本函数对 udp 的作用 其实是 listen, 它会bind到Addr
     ///
     pub async fn try_dial(&self, oc: Option<Arc<dns::AsyncClient>>) -> Result<Stream> {
         match self.network {
-            #[cfg(feature = "tun")]
             Network::IP => {
                 debug!("Addr dialing IP {}", self);
                 let c = match &self.addr {
@@ -498,9 +497,7 @@ impl Addr {
             Network::Unix => {
                 let u = UnixStream::connect(self.get_name().unwrap_or_default()).await?;
                 Ok(Stream::Conn(Box::new(u)))
-            }
-            #[cfg(not(feature = "tun"))]
-            _ => bail!("try_dial failed, not supported network: {}", self.network),
+            } // _ => bail!("try_dial failed, not supported network: {}", self.network),
         }
     }
 
@@ -541,7 +538,6 @@ impl Addr {
             .unwrap();
 
         match network {
-            #[cfg(feature = "tun")]
             Network::IP => {
                 let bind_addr = match &bind_a {
                     Some(a) => a,
@@ -629,9 +625,7 @@ impl Addr {
 
                 let u = UnixStream::connect(dial_a.get_name().unwrap_or_default()).await?;
                 Ok(Stream::Conn(Box::new(u)))
-            }
-            #[cfg(not(feature = "tun"))]
-            _ => bail!("bind_dial failed, not supported network: {:?}", network),
+            } // _ => bail!("bind_dial failed, not supported network: {:?}", network),
         }
     }
 
diff --git a/src/net/mod.rs b/src/net/mod.rs
@@ -20,7 +20,6 @@ pub mod cp;
 pub use addr::*;
 pub use cp::*;
 
-#[cfg(feature = "tun")]
 pub mod tun;
 
 #[cfg(test)]
diff --git a/src/net/tun/mod.rs b/src/net/tun/mod.rs
@@ -124,7 +124,7 @@ mod test {
 
     use super::create_bind;
 
-    //sudo -E cargo test --package ruci --lib --features tun -- net::tun::test::test --exact --nocapture
+    //sudo -E cargo test --package ruci --lib -- net::tun::test::test --exact --nocapture
     //#[tokio::test]
     async fn test() {
         let a = Addr::from_strs("ip", "utun432", "10.0.0.1", 24).unwrap();
