diff --git a/nym-vpn-core/nym-vpn-lib/src/config.rs b/nym-vpn-core/nym-vpn-lib/src/config.rs index c87fcf5dd2..adbbcd2300 100644 --- a/nym-vpn-core/nym-vpn-lib/src/config.rs +++ b/nym-vpn-core/nym-vpn-lib/src/config.rs @@ -13,8 +13,6 @@ use talpid_types::net::GenericTunnelOptions; #[cfg(target_os = "linux")] pub const TUNNEL_FWMARK: u32 = 0x6d6f6c65; -#[cfg(target_os = "linux")] -pub const TUNNEL_TABLE_ID: u32 = 0x6d6f6c65; #[derive(Clone)] pub struct WireguardConfig(pub talpid_wireguard::config::Config); diff --git a/nym-vpn-core/nym-vpn-lib/src/tunnel.rs b/nym-vpn-core/nym-vpn-lib/src/tunnel.rs index 3922841fb4..b409221545 100644 --- a/nym-vpn-core/nym-vpn-lib/src/tunnel.rs +++ b/nym-vpn-core/nym-vpn-lib/src/tunnel.rs @@ -114,12 +114,9 @@ pub fn start_tunnel( pub async fn setup_route_manager() -> crate::error::Result { #[cfg(target_os = "linux")] let route_manager = { - RouteManager::new( - HashSet::new(), - crate::config::TUNNEL_FWMARK, - crate::config::TUNNEL_TABLE_ID, - ) - .await? + let fwmark = 0; + let table_id = 0; + RouteManager::new(HashSet::new(), fwmark, table_id).await? }; #[cfg(not(target_os = "linux"))] diff --git a/nym-vpn-core/nym-vpn-lib/src/tunnel_setup.rs b/nym-vpn-core/nym-vpn-lib/src/tunnel_setup.rs index 1b59325655..711a34ae61 100644 --- a/nym-vpn-core/nym-vpn-lib/src/tunnel_setup.rs +++ b/nym-vpn-core/nym-vpn-lib/src/tunnel_setup.rs @@ -77,10 +77,10 @@ pub(crate) async fn init_firewall_dns( #[cfg(target_os = "linux")] { + let fwmark = 0; // ? debug!("Starting firewall"); let firewall = tokio::task::spawn_blocking(move || { - Firewall::new(crate::config::TUNNEL_FWMARK) - .map_err(|err| crate::error::Error::FirewallError(err.to_string())) + Firewall::new(fwmark).map_err(|err| crate::error::Error::FirewallError(err.to_string())) }) .await??; debug!("Starting dns monitor");