diff options
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | mullvad-daemon/Cargo.toml | 1 | ||||
| -rw-r--r-- | mullvad-daemon/src/settings.rs | 10 | ||||
| -rw-r--r-- | mullvad-management-interface/src/types/conversions/settings.rs | 2 | ||||
| -rw-r--r-- | mullvad-types/Cargo.toml | 1 | ||||
| -rw-r--r-- | mullvad-types/src/settings/mod.rs | 14 |
6 files changed, 0 insertions, 30 deletions
diff --git a/Cargo.lock b/Cargo.lock index e744b5b30f..2209e32dce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1998,7 +1998,6 @@ dependencies = [ "objc", "once_cell", "parking_lot", - "rand 0.8.5", "regex", "serde", "serde_json", @@ -2169,7 +2168,6 @@ dependencies = [ "jnix", "log", "once_cell", - "rand 0.8.5", "regex", "serde", "talpid-types", diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml index ecc91e3306..da994ec4d5 100644 --- a/mullvad-daemon/Cargo.toml +++ b/mullvad-daemon/Cargo.toml @@ -21,7 +21,6 @@ once_cell = "1.13" libc = "0.2" log = "0.4" parking_lot = "0.12.0" -rand = "0.8.5" regex = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs index 794b0381ca..a85d766db6 100644 --- a/mullvad-daemon/src/settings.rs +++ b/mullvad-daemon/src/settings.rs @@ -4,7 +4,6 @@ use mullvad_types::{ relay_constraints::{RelayConstraints, RelaySettings, WireguardConstraints}, settings::{DnsState, Settings}, }; -use rand::Rng; use std::{ fmt::{self, Display}, ops::Deref, @@ -68,15 +67,6 @@ impl SettingsPersister { } }; - // If the settings file did not contain a wg_migration_rand_num then it will be initialized - // to -1.0 by serde. This block ensures that this value is correctly intitialzed to a - // percentage. - if settings.wg_migration_rand_num < 0.0 || settings.wg_migration_rand_num > 1.0 { - let mut rng = rand::thread_rng(); - settings.wg_migration_rand_num = rng.gen_range(0.0..=1.0); - should_save |= true - } - // Force IPv6 to be enabled on Android if cfg!(target_os = "android") { should_save |= !settings.tunnel_options.generic.enable_ipv6; diff --git a/mullvad-management-interface/src/types/conversions/settings.rs b/mullvad-management-interface/src/types/conversions/settings.rs index 699dedf155..c0611c799f 100644 --- a/mullvad-management-interface/src/types/conversions/settings.rs +++ b/mullvad-management-interface/src/types/conversions/settings.rs @@ -166,8 +166,6 @@ impl TryFrom<proto::Settings> for mullvad_types::settings::Settings { obfuscation_settings: mullvad_types::relay_constraints::ObfuscationSettings::try_from( obfuscation_settings, )?, - // NOTE: This field is meaningless when obtained from gRPC - wg_migration_rand_num: std::f32::NAN, // NOTE: This field is set based on mullvad-types. It's not based on the actual settings // version. settings_version: CURRENT_SETTINGS_VERSION, diff --git a/mullvad-types/Cargo.toml b/mullvad-types/Cargo.toml index 68d1e71aad..761c123797 100644 --- a/mullvad-types/Cargo.toml +++ b/mullvad-types/Cargo.toml @@ -16,7 +16,6 @@ once_cell = "1.13" log = "0.4" regex = "1" serde = { version = "1.0", features = ["derive"] } -rand = "0.8" uuid = { version = "1.4.1", features = ["v4", "serde" ] } talpid-types = { path = "../talpid-types" } diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs index 12f5d831e1..11a19f6552 100644 --- a/mullvad-types/src/settings/mod.rs +++ b/mullvad-types/src/settings/mod.rs @@ -9,7 +9,6 @@ use crate::{ }; #[cfg(target_os = "android")] use jnix::IntoJava; -use rand::Rng; use serde::{Deserialize, Deserializer, Serialize, Serializer}; #[cfg(target_os = "windows")] use std::{collections::HashSet, path::PathBuf}; @@ -93,23 +92,11 @@ pub struct Settings { /// Split tunneling settings #[cfg(windows)] pub split_tunnel: SplitTunnelSettings, - /// Temporary variable for a random number between 0 and 1 that determines if the user should - /// use wireguard or openvpn when the automatic feature is set. This variable will be removed - /// in future versions. - /// A value of -1.0 implies that the variable should be initialized to a random number. - /// NOTE: This field will be removed completely in future versions. - #[serde(default = "out_of_range_wg_migration_rand_num")] - #[cfg_attr(target_os = "android", jnix(skip))] - pub wg_migration_rand_num: f32, /// Specifies settings schema version #[cfg_attr(target_os = "android", jnix(skip))] pub settings_version: SettingsVersion, } -fn out_of_range_wg_migration_rand_num() -> f32 { - -1.0 -} - #[cfg(windows)] #[derive(Debug, Clone, Default, Deserialize, Serialize, PartialEq)] pub struct SplitTunnelSettings { @@ -145,7 +132,6 @@ impl Default for Settings { auto_connect: false, tunnel_options: TunnelOptions::default(), show_beta_releases: false, - wg_migration_rand_num: rand::thread_rng().gen_range(0.0..=1.0), #[cfg(windows)] split_tunnel: SplitTunnelSettings::default(), settings_version: CURRENT_SETTINGS_VERSION, |