diff options
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index 7a0dc2df23..e6b4698c73 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -2333,6 +2333,8 @@ impl Daemon { #[cfg(daita)] async fn on_set_daita_enabled(&mut self, tx: ResponseTx<(), settings::Error>, value: bool) { + use mullvad_types::{constraints::Constraint, Intersection}; + match self .settings .update(|settings| settings.tunnel_options.wireguard.daita.enabled = value) @@ -2340,7 +2342,16 @@ impl Daemon { { Ok(settings_changed) => { Self::oneshot_send(tx, Ok(()), "set_daita_enabled response"); - if settings_changed && self.get_target_tunnel_type() != Some(TunnelType::OpenVpn) { + let RelaySettings::Normal(constraints) = &self.settings.relay_settings else { + return; // DAITA is not supported for custom relays + }; + + let wireguard_enabled = constraints + .tunnel_protocol + .intersection(Constraint::Only(TunnelType::Wireguard)) + .is_some(); + + if settings_changed && wireguard_enabled { log::info!("Reconnecting because DAITA settings changed"); self.reconnect_tunnel(); } @@ -2358,6 +2369,8 @@ impl Daemon { tx: ResponseTx<(), settings::Error>, value: bool, ) { + use mullvad_types::{constraints::Constraint, Intersection}; + match self .settings .update(|settings| settings.tunnel_options.wireguard.daita.use_anywhere = value) @@ -2366,8 +2379,19 @@ impl Daemon { Ok(settings_changed) => { Self::oneshot_send(tx, Ok(()), "set_daita_use_anywhere response"); - // TODO: don't reconnect if multihop is enabled - if settings_changed && self.get_target_tunnel_type() != Some(TunnelType::OpenVpn) { + let RelaySettings::Normal(constraints) = &self.settings.relay_settings else { + return; // DAITA is not supported for custom relays + }; + + let wireguard_enabled = constraints + .tunnel_protocol + .intersection(Constraint::Only(TunnelType::Wireguard)) + .is_some(); + + let multihop_enabled = constraints.wireguard_constraints.use_multihop; + let daita_enabled = self.settings.tunnel_options.wireguard.daita.enabled; + + if settings_changed && wireguard_enabled && daita_enabled && !multihop_enabled { log::info!("Reconnecting because DAITA settings changed"); self.reconnect_tunnel(); } |