diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-12-06 13:43:35 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-12-06 13:43:35 +0100 |
| commit | afb8383f6fcc24ff9632e9b494ba1ba0587b4306 (patch) | |
| tree | dbe1f4f1f209b034cbd3212b76d76d259e31da06 | |
| parent | 074f07b029a18a29e46936f2fe1f56b9e867dc4a (diff) | |
| parent | fdbc2580518ccf1e95f4d01568a9bd9b0c43dd62 (diff) | |
| download | mullvadvpn-afb8383f6fcc24ff9632e9b494ba1ba0587b4306.tar.xz mullvadvpn-afb8383f6fcc24ff9632e9b494ba1ba0587b4306.zip | |
Merge branch 'cli-fix-relay-get-any-location'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | mullvad-management-interface/src/types.rs | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 618ddcdb31..305c0107f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ Line wrap the file at 100 chars. Th ### Fixed - Always kill `sslocal` if the tunnel monitor fails to start when using bridges. +- Show relay location constraint correctly in the CLI when it is set to `any`. #### Windows - Fix app size after changing display scale. diff --git a/mullvad-management-interface/src/types.rs b/mullvad-management-interface/src/types.rs index 4e3a7217eb..ba6774dbff 100644 --- a/mullvad-management-interface/src/types.rs +++ b/mullvad-management-interface/src/types.rs @@ -773,14 +773,10 @@ impl TryFrom<RelaySettings> for mullvad_types::relay_constraints::RelaySettings } relay_settings::Endpoint::Normal(settings) => { - let location = - Constraint::<mullvad_types::relay_constraints::LocationConstraint>::from( - settings - .location - .ok_or(FromProtobufTypeError::InvalidArgument( - "missing relay location", - ))?, - ); + let location = settings + .location + .map(Constraint::<mullvad_types::relay_constraints::LocationConstraint>::from) + .unwrap_or(Constraint::Any); let providers = try_providers_constraint_from_proto(&settings.providers)?; let tunnel_protocol = settings .tunnel_type |