diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-08-23 15:29:09 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-08-25 15:19:19 +0200 |
| commit | e0788bfee8f46404992c520c7f45f907e7bdec03 (patch) | |
| tree | 2493b9225f82f29db4000975519712b51cec66ee /mullvad-daemon | |
| parent | 31709fca7175312c2ca12a4ad4161047e7be9a70 (diff) | |
| download | mullvadvpn-e0788bfee8f46404992c520c7f45f907e7bdec03.tar.xz mullvadvpn-e0788bfee8f46404992c520c7f45f907e7bdec03.zip | |
Use TransportPort for OpenVPN constraints
Diffstat (limited to 'mullvad-daemon')
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index 8417926c3d..ad1a038817 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -389,12 +389,13 @@ impl RelaySelector { // If no tunnel protocol is selected, use preferred constraints Constraint::Any => { if original_constraints.openvpn_constraints.port.is_any() - && original_constraints.openvpn_constraints.protocol.is_any() || bridge_state == BridgeState::On { relay_constraints.openvpn_constraints = OpenVpnConstraints { - port: preferred_port, - protocol: Constraint::Only(preferred_protocol), + port: Constraint::Only(TransportPort { + protocol: preferred_protocol, + port: preferred_port, + }), }; } else { relay_constraints.openvpn_constraints = @@ -414,15 +415,19 @@ impl RelaySelector { Constraint::Only(TunnelType::OpenVpn) => { let openvpn_constraints = &mut relay_constraints.openvpn_constraints; *openvpn_constraints = original_constraints.openvpn_constraints; - if bridge_state == BridgeState::On && openvpn_constraints.protocol.is_any() { + if bridge_state == BridgeState::On && openvpn_constraints.port.is_any() { // FIXME: This is temporary while talpid-core only supports TCP proxies - openvpn_constraints.protocol = Constraint::Only(TransportProtocol::Tcp); - } else if openvpn_constraints.port.is_any() && openvpn_constraints.protocol.is_any() - { + openvpn_constraints.port = Constraint::Only(TransportPort { + protocol: TransportProtocol::Tcp, + port: Constraint::Any, + }); + } else if openvpn_constraints.port.is_any() { let (preferred_port, preferred_protocol) = Self::preferred_openvpn_constraints(retry_attempt); - openvpn_constraints.port = preferred_port; - openvpn_constraints.protocol = Constraint::Only(preferred_protocol); + openvpn_constraints.port = Constraint::Only(TransportPort { + protocol: preferred_protocol, + port: preferred_port, + }); } } Constraint::Only(TunnelType::Wireguard) => { |