Remove duct from talpid-tunnel

mullvad · Jan 2, 2025 · ed32ea5 · ed32ea5
1 parent 3a134c9
commit ed32ea5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/talpid-tunnel/Cargo.toml b/talpid-tunnel/Cargo.toml
@@ -20,7 +20,6 @@ futures = { workspace = true }
 tokio = { workspace = true, features = ["process", "rt-multi-thread", "fs"] }
 
 [target.'cfg(all(unix, not(target_os = "android")))'.dependencies]
-duct = "0.13"
 nix = "0.23"
 
 [target.'cfg(target_os = "android")'.dependencies]

diff --git a/talpid-tunnel/src/tun_provider/unix.rs b/talpid-tunnel/src/tun_provider/unix.rs
@@ -163,31 +163,24 @@ impl TunnelDevice {
             IpAddr::V6(ipv6) => {
                 #[cfg(target_os = "linux")]
                 {
-                    duct::cmd!(
-                        "ip",
-                        "-6",
-                        "addr",
-                        "add",
-                        ipv6.to_string(),
-                        "dev",
-                        self.dev.name()
-                    )
-                    .run()
-                    .map(|_| ())
-                    .map_err(Error::SetIpv6)
+                    use std::process::Command;
+                    // ip -6 addr add <ipv6 address> dev <device>
+                    let address = ipv6.to_string();
+                    let device = self.dev.name();
+                    let mut ip = Command::new("ip");
+                    ip.args(["-6", "addr", "add", &address, "dev", device]);
+                    ip.output().map_err(Error::SetIpv6)?;
+                    Ok(())
                 }
                 #[cfg(target_os = "macos")]
                 {
-                    duct::cmd!(
-                        "ifconfig",
-                        self.dev.name(),
-                        "inet6",
-                        ipv6.to_string(),
-                        "alias"
-                    )
-                    .run()
-                    .map(|_| ())
-                    .map_err(Error::SetIpv6)
+                    // ifconfig <device> inet6 <ipv6 address> alias
+                    let address = ipv6.to_string();
+                    let device = self.dev.name();
+                    let mut ifconfig = Command::new("ifconfig");
+                    ifconfig.args([device, "inet6", &address, "alias"]);
+                    ifconfig.output().map_err(Error::SetIpv6)?;
+                    Ok(())
                 }
             }
         }