diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-03-31 15:03:22 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-04-13 13:06:59 +0200 |
| commit | 8b7cf1a8439a2734cd532776d75fa3a84e43b064 (patch) | |
| tree | 2b472c18ddf3a0b90c7be3995a43329778325c07 | |
| parent | 2a3d38c467d39342061d0fa7dd2f3b65197caddf (diff) | |
| download | mullvadvpn-8b7cf1a8439a2734cd532776d75fa3a84e43b064.tar.xz mullvadvpn-8b7cf1a8439a2734cd532776d75fa3a84e43b064.zip | |
Substitute 'invalid' for 'unknown' where appropriate
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 2 | ||||
| -rw-r--r-- | mullvad-cli/src/format.rs | 8 | ||||
| -rw-r--r-- | mullvad-daemon/src/management_interface.rs | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index 5544e58062..d8c3f37a9a 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -349,7 +349,7 @@ impl Relay { "udp" => TransportProtocol::Udp, "tcp" => TransportProtocol::Tcp, _ => clap::Error::with_description( - "unknown transport protocol", + "invalid transport protocol", clap::ErrorKind::ValueValidation, ) .exit(), diff --git a/mullvad-cli/src/format.rs b/mullvad-cli/src/format.rs index 7070e322ac..250bc70ba7 100644 --- a/mullvad-cli/src/format.rs +++ b/mullvad-cli/src/format.rs @@ -59,13 +59,13 @@ pub fn print_state(state: &TunnelState) { fn format_endpoint(endpoint: &TunnelEndpoint) -> String { let mut out = format!( "{} {} over {}", - match TunnelType::from_i32(endpoint.tunnel_type).expect("unknown tunnel protocol") { + match TunnelType::from_i32(endpoint.tunnel_type).expect("invalid tunnel protocol") { TunnelType::Wireguard => "WireGuard", TunnelType::Openvpn => "OpenVPN", }, endpoint.address, format_protocol( - TransportProtocol::from_i32(endpoint.protocol).expect("unknown transport protocol") + TransportProtocol::from_i32(endpoint.protocol).expect("invalid transport protocol") ), ); @@ -73,13 +73,13 @@ fn format_endpoint(endpoint: &TunnelEndpoint) -> String { write!( &mut out, " via {} {} over {}", - match ProxyType::from_i32(proxy.proxy_type).expect("unknown proxy type") { + match ProxyType::from_i32(proxy.proxy_type).expect("invalid proxy type") { ProxyType::Shadowsocks => "Shadowsocks", ProxyType::Custom => "custom bridge", }, proxy.address, format_protocol( - TransportProtocol::from_i32(proxy.protocol).expect("unknown transport protocol") + TransportProtocol::from_i32(proxy.protocol).expect("invalid transport protocol") ), ) .unwrap(); diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs index f32c3986fa..05bd38e1dc 100644 --- a/mullvad-daemon/src/management_interface.rs +++ b/mullvad-daemon/src/management_interface.rs @@ -916,7 +916,7 @@ fn convert_relay_settings_update( Some(types::TunnelType::Wireguard) => { Some(Constraint::Only(TunnelType::Wireguard)) } - None => return Err(Status::invalid_argument("unknown tunnel protocol")), + None => return Err(Status::invalid_argument("invalid tunnel protocol")), }, None => Some(Constraint::Any), } @@ -954,7 +954,7 @@ fn convert_relay_settings_update( Some(types::IpVersion::V4) => Some(IpVersion::V4), Some(types::IpVersion::V6) => Some(IpVersion::V6), None => { - return Err(Status::invalid_argument("unknown ip protocol version")) + return Err(Status::invalid_argument("invalid ip protocol version")) } }, None => None, |