diff options
| -rw-r--r-- | mullvad-types/src/relay_constraints.rs | 24 | ||||
| -rw-r--r-- | mullvad-types/src/settings/mod.rs | 3 |
2 files changed, 0 insertions, 27 deletions
diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs index 7789948797..18cdfda2d9 100644 --- a/mullvad-types/src/relay_constraints.rs +++ b/mullvad-types/src/relay_constraints.rs @@ -172,30 +172,6 @@ impl RelaySettings { }), } } - - pub(crate) fn ensure_bridge_compatibility(&mut self) { - match self { - RelaySettings::Normal(ref mut constraints) => { - if constraints.tunnel_protocol == Constraint::Only(TunnelType::Wireguard) { - constraints.tunnel_protocol = Constraint::Any; - } - if let Constraint::Only(TransportPort { - protocol: TransportProtocol::Udp, - .. - }) = constraints.openvpn_constraints.port - { - constraints.openvpn_constraints.port = Constraint::Any; - } - } - RelaySettings::CustomTunnelEndpoint(config) => { - if config.endpoint().protocol == TransportProtocol::Udp { - log::warn!( - "Using custom tunnel endpoint with UDP, bridges will likely not work" - ); - } - } - } - } } /// Limits the set of [`crate::relay_list::Relay`]s that a `RelaySelector` may select. diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs index 0705764555..36981b82c7 100644 --- a/mullvad-types/src/settings/mod.rs +++ b/mullvad-types/src/settings/mod.rs @@ -194,9 +194,6 @@ impl Settings { pub fn set_bridge_state(&mut self, bridge_state: BridgeState) -> bool { if self.bridge_state != bridge_state { self.bridge_state = bridge_state; - if self.bridge_state == BridgeState::On { - self.relay_settings.ensure_bridge_compatibility(); - } true } else { false |