diff options
| author | Emīls <emils@mullvad.net> | 2019-12-05 15:58:31 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2019-12-05 15:58:31 +0000 |
| commit | e7e70df17f472be16460a2bcea41c5925f537dff (patch) | |
| tree | c73ffd4c8fc32068c2a52a8771d051c6be372596 | |
| parent | 4b89520b96325613165b0b6ad1c45c4dc702ddae (diff) | |
| parent | 42ba04a8e5d905e600d717e4456cc5daa5edacf9 (diff) | |
| download | mullvadvpn-e7e70df17f472be16460a2bcea41c5925f537dff.tar.xz mullvadvpn-e7e70df17f472be16460a2bcea41c5925f537dff.zip | |
Merge branch 'fix-improved-wg-port-selectiong'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d24cf0416..bd0ce98f83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,8 @@ Line wrap the file at 100 chars. Th ## [Unreleased] +### Fixed +- Fix improved WireGuard port selection ## [2019.10-beta2] - 2019-12-05 diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index 677dcb6da1..51937e9ecf 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -288,10 +288,7 @@ impl RelaySelector { // This ensures that if after the first 2 failed attempts the daemon does not // conenct, then afterwards 2 of each 4 successive attempts will try to connect on // port 53. - if retry_attempt > 2 - && retry_attempt % 4 < 2 - && relay_constraints.wireguard_constraints.port.is_any() - { + if retry_attempt % 4 > 1 && relay_constraints.wireguard_constraints.port.is_any() { relay_constraints.wireguard_constraints.port = Constraint::Only(53); } } |