diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-09 17:22:14 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-04 13:18:17 +0000 |
| commit | 8ee1b5f99357e10d8bd29b4664d4138c293c8863 (patch) | |
| tree | f755e580e2087882aa364b80bcf3ab350786818c | |
| parent | cc0bc7e4abc129319f108a029cfc46b7768557e3 (diff) | |
| download | mullvadvpn-8ee1b5f99357e10d8bd29b4664d4138c293c8863.tar.xz mullvadvpn-8ee1b5f99357e10d8bd29b4664d4138c293c8863.zip | |
Prepare to enable custom DNS code paths on Android
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 9 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/mod.rs | 8 |
2 files changed, 5 insertions, 12 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index b4e5dd3279..bf6556dd2e 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -26,8 +26,6 @@ use futures::{ }; use log::{debug, error, info, warn}; use mullvad_rpc::AccountsProxy; -#[cfg(not(target_os = "android"))] -use mullvad_types::settings::DnsOptions; use mullvad_types::{ account::{AccountData, AccountToken, VoucherSubmission}, endpoint::MullvadEndpoint, @@ -37,21 +35,20 @@ use mullvad_types::{ RelaySettingsUpdate, }, relay_list::{Relay, RelayList}, - settings::Settings, + settings::{DnsOptions, Settings}, states::{TargetState, TunnelState}, version::{AppVersion, AppVersionInfo}, wireguard::KeygenEvent, }; use settings::SettingsPersister; #[cfg(not(target_os = "android"))] -use std::net::IpAddr; -#[cfg(not(target_os = "android"))] use std::path::Path; use std::{ fs::{self, File}, io, marker::PhantomData, mem, + net::IpAddr, path::PathBuf, sync::{mpsc as sync_mpsc, Arc, Weak}, time::Duration, @@ -583,7 +580,6 @@ where let tunnel_command_tx = tunnel_state_machine::spawn( settings.allow_lan, settings.block_when_disconnected, - #[cfg(not(target_os = "android"))] Self::get_custom_resolvers(&settings.tunnel_options.dns_options), tunnel_parameters_generator, log_dir, @@ -637,7 +633,6 @@ where Ok(daemon) } - #[cfg(not(target_os = "android"))] fn get_custom_resolvers(dns_options: &DnsOptions) -> Option<Vec<IpAddr>> { if dns_options.custom { Some(dns_options.addresses.clone()) diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs index 3e07bde0f4..ccaa3a3ff0 100644 --- a/talpid-core/src/tunnel_state_machine/mod.rs +++ b/talpid-core/src/tunnel_state_machine/mod.rs @@ -23,11 +23,10 @@ use futures::{ channel::{mpsc, oneshot}, stream, StreamExt, }; -#[cfg(not(target_os = "android"))] -use std::net::IpAddr; use std::{ collections::HashSet, io, + net::IpAddr, path::{Path, PathBuf}, sync::{mpsc as sync_mpsc, Arc}, }; @@ -75,7 +74,7 @@ pub enum Error { pub async fn spawn( allow_lan: bool, block_when_disconnected: bool, - #[cfg(not(target_os = "android"))] custom_dns: Option<Vec<IpAddr>>, + custom_dns: Option<Vec<IpAddr>>, tunnel_parameters_generator: impl TunnelParametersGenerator, log_dir: Option<PathBuf>, resource_dir: PathBuf, @@ -112,7 +111,6 @@ pub async fn spawn( allow_lan, block_when_disconnected, is_offline, - #[cfg(not(target_os = "android"))] custom_dns, tunnel_parameters_generator, tun_provider, @@ -193,7 +191,7 @@ impl TunnelStateMachine { allow_lan: bool, block_when_disconnected: bool, is_offline: bool, - #[cfg(not(target_os = "android"))] custom_dns: Option<Vec<IpAddr>>, + custom_dns: Option<Vec<IpAddr>>, tunnel_parameters_generator: impl TunnelParametersGenerator, tun_provider: TunProvider, log_dir: Option<PathBuf>, |