diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-07-15 14:59:03 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-08-19 12:32:59 +0200 |
| commit | 12f77e401e6a3c2c4dab404d419176b6c373aed9 (patch) | |
| tree | 5307d983f68465edef1d023632d27779c0618280 | |
| parent | da0ddc3cbd118e4a92aaac1c787f0f596ebc7cf4 (diff) | |
| download | mullvadvpn-12f77e401e6a3c2c4dab404d419176b6c373aed9.tar.xz mullvadvpn-12f77e401e6a3c2c4dab404d419176b6c373aed9.zip | |
Update CLI to show WireGuard transport protocol
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 10 | ||||
| -rw-r--r-- | mullvad-types/src/relay_constraints.rs | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index d119617802..e4fdfff478 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -749,8 +749,14 @@ impl Relay { fn format_wireguard_constraints(constraints: Option<&WireguardConstraints>) -> String { if let Some(constraints) = constraints { let mut out = format!( - "{} over {}", + "{} over {} over {}", Self::format_port(constraints.port), + Self::format_transport_protocol( + constraints + .protocol + .clone() + .map(|protocol| TransportProtocol::from_i32(protocol.protocol).unwrap()) + ), Self::format_ip_version( constraints .ip_version @@ -770,7 +776,7 @@ impl Relay { out } else { - "any port over IPv4 or IPv6".to_string() + "any port over any protocol over IPv4 or IPv6".to_string() } } diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs index 1e4599df8f..df94de7c05 100644 --- a/mullvad-types/src/relay_constraints.rs +++ b/mullvad-types/src/relay_constraints.rs @@ -491,6 +491,11 @@ impl fmt::Display for WireguardConstraints { Constraint::Only(port) => write!(f, "port {}", port)?, } write!(f, " over ")?; + match self.protocol { + Constraint::Any => write!(f, "any protocol")?, + Constraint::Only(protocol) => write!(f, "{}", protocol)?, + } + write!(f, " over ")?; match self.ip_version { Constraint::Any => write!(f, "IPv4 or IPv6")?, Constraint::Only(protocol) => write!(f, "{}", protocol)?, |