summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-01-18 18:26:32 +0100
committerDavid Lönnhager <david.l@mullvad.net>2021-03-01 13:49:45 +0100
commit9ac59fa48083dafddbe1baf9bcec6729db919352 (patch)
tree49d552a16e1e8aae3fdb6349f5ecfabe71589168 /mullvad-cli/src
parentea12d9b2b55ed19e23566fc3a03fc6095d30bd4f (diff)
downloadmullvadvpn-9ac59fa48083dafddbe1baf9bcec6729db919352.tar.xz
mullvadvpn-9ac59fa48083dafddbe1baf9bcec6729db919352.zip
Include IP version constraint in 'mullvad relay get'
Diffstat (limited to 'mullvad-cli/src')
-rw-r--r--mullvad-cli/src/cmds/relay.rs21
1 files changed, 19 insertions, 2 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index eb1492258a..170e1276a3 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -668,6 +668,14 @@ impl Relay {
Ok(())
}
+ fn format_ip_version(protocol: Option<IpVersion>) -> &'static str {
+ match protocol {
+ None => "IPv4 or IPv6",
+ Some(IpVersion::V4) => "IPv4",
+ Some(IpVersion::V6) => "IPv6",
+ }
+ }
+
fn format_transport_protocol(protocol: Option<TransportProtocol>) -> &'static str {
match protocol {
None => "any transport protocol",
@@ -703,9 +711,18 @@ impl Relay {
fn format_wireguard_constraints(constraints: Option<&WireguardConstraints>) -> String {
if let Some(constraints) = constraints {
- Self::format_port(constraints.port)
+ format!(
+ "{} over {}",
+ Self::format_port(constraints.port),
+ Self::format_ip_version(
+ constraints
+ .ip_protocol
+ .clone()
+ .map(|protocol| IpVersion::from_i32(protocol.protocol).unwrap())
+ )
+ )
} else {
- "any port".to_string()
+ "any port over IPv4 or IPv6".to_string()
}
}