Remove TunConfig default implementation

Author: dlon

Cargo.lock

@@ -136,6 +136,7 @@ pub async fn spawn(
     let tun_provider = TunProvider::new(
         #[cfg(target_os = "android")]
         android_context.clone(),
+        talpid_tunnel::tun_provider::blocking_config(),
     );
 
     let (shutdown_tx, shutdown_rx) = oneshot::channel();

talpid-core/src/tunnel_state_machine/mod.rs

@@ -11,6 +11,7 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
+once_cell = { workspace = true }
 thiserror = { workspace = true }
 cfg-if = "1.0"
 ipnetwork = { workspace = true }

talpid-tunnel/Cargo.toml

@@ -60,7 +60,7 @@ pub struct AndroidTunProvider {
 
 impl AndroidTunProvider {
     /// Create a new AndroidTunProvider interfacing with Android's VpnService.
-    pub fn new(context: AndroidContext) -> Self {
+    pub fn new(context: AndroidContext, config: TunConfig) -> Self {
         let env = JnixEnv::from(
             context
                 .jvm
@@ -73,7 +73,7 @@ impl AndroidTunProvider {
             jvm: context.jvm,
             class: talpid_vpn_service_class,
             object: context.vpn_service,
-            config: TunConfig::default(),
+            config,
         }
     }
 

talpid-tunnel/src/tun_provider/android/mod.rs

@@ -1,5 +1,6 @@
 use cfg_if::cfg_if;
 use ipnetwork::IpNetwork;
+use once_cell::sync::Lazy;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 
 cfg_if! {
@@ -68,22 +69,29 @@ impl TunConfig {
     }
 }
 
-impl Default for TunConfig {
-    fn default() -> Self {
-        TunConfig {
-            addresses: vec![IpAddr::V4(Ipv4Addr::new(10, 0, 0, 1))],
-            mtu: 1380,
-            ipv4_gateway: Ipv4Addr::new(10, 64, 0, 1),
-            ipv6_gateway: None,
-            routes: vec![
-                IpNetwork::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 0)
-                    .expect("Invalid IP network prefix for IPv4 address"),
-                IpNetwork::new(IpAddr::V6(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0)), 0)
-                    .expect("Invalid IP network prefix for IPv6 address"),
-            ],
-            allow_lan: false,
-            dns_servers: None,
-            excluded_packages: vec![],
-        }
+/// Return a tunnel configuration that routes all traffic inside the tunnel.
+/// Most values except the routes are nonsensical. This is mostly used as a reasonable default on
+/// Android to route all traffic inside the tunnel.
+pub fn blocking_config() -> TunConfig {
+    TunConfig {
+        addresses: vec![IpAddr::V4(Ipv4Addr::new(10, 0, 0, 1))],
+        mtu: 1380,
+        ipv4_gateway: Ipv4Addr::new(10, 64, 0, 1),
+        ipv6_gateway: None,
+        routes: DEFAULT_ROUTES.clone(),
+        allow_lan: false,
+        dns_servers: None,
+        excluded_packages: vec![],
     }
 }
+
+static DEFAULT_ROUTES: Lazy<Vec<IpNetwork>> =
+    Lazy::new(|| vec![*IPV4_DEFAULT_ROUTE, *IPV6_DEFAULT_ROUTE]);
+static IPV4_DEFAULT_ROUTE: Lazy<IpNetwork> = Lazy::new(|| {
+    IpNetwork::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), 0)
+        .expect("Invalid IP network prefix for IPv4 address")
+});
+static IPV6_DEFAULT_ROUTE: Lazy<IpNetwork> = Lazy::new(|| {
+    IpNetwork::new(IpAddr::V6(Ipv6Addr::UNSPECIFIED), 0)
+        .expect("Invalid IP network prefix for IPv6 address")
+});

talpid-tunnel/src/tun_provider/mod.rs

@@ -7,17 +7,11 @@ pub enum Error {}
 pub struct StubTunProvider;
 
 impl StubTunProvider {
-    pub fn new() -> Self {
+    pub fn new(_: TunConfig) -> Self {
         StubTunProvider
     }
 
-    pub fn open_tun(&mut self, _: TunConfig) -> Result<(), Error> {
+    pub fn open_tun(&mut self) -> Result<(), Error> {
         unimplemented!();
     }
 }
-
-impl Default for StubTunProvider {
-    fn default() -> Self {
-        Self::new()
-    }
-}

talpid-tunnel/src/tun_provider/stub.rs

@@ -30,10 +30,8 @@ pub struct UnixTunProvider {
 }
 
 impl UnixTunProvider {
-    pub fn new() -> Self {
-        UnixTunProvider {
-            config: TunConfig::default(),
-        }
+    pub fn new(config: TunConfig) -> Self {
+        UnixTunProvider { config }
     }
 
     /// Get the current tunnel config. Note that the tunnel must be recreated for any changes to
@@ -58,12 +56,6 @@ impl UnixTunProvider {
     }
 }
 
-impl Default for UnixTunProvider {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 /// Generic tunnel device.
 ///
 /// Contains the file descriptor representing the device.