diff options
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 14 | ||||
| -rw-r--r-- | mullvad-daemon/src/management_interface.rs | 10 | ||||
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 2 | ||||
| -rw-r--r-- | mullvad-management-interface/proto/management_interface.proto | 2 | ||||
| -rw-r--r-- | mullvad-types/src/relay_constraints.rs | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index 170e1276a3..6343b9e5d5 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -157,8 +157,8 @@ impl Command for Relay { .possible_values(&["any", "udp", "tcp"]), ) .arg( - clap::Arg::with_name("ip protocol") - .long("ip") + clap::Arg::with_name("ip version") + .long("ipv") .required(false) .default_value("any") .possible_values(&["any", "4", "6"]), @@ -475,7 +475,7 @@ impl Relay { let vpn_protocol = matches.value_of("vpn protocol").unwrap(); let port = parse_port_constraint(matches.value_of("port").unwrap())?; let protocol = parse_protocol_constraint(matches.value_of("transport protocol").unwrap()); - let ip_proto = parse_ip_protocol_constraint(matches.value_of("ip protocol").unwrap()); + let ip_version = parse_ip_version_constraint(matches.value_of("ip version").unwrap()); match vpn_protocol { "wireguard" => { @@ -487,7 +487,7 @@ impl Relay { NormalRelaySettingsUpdate { wireguard_constraints: Some(WireguardConstraints { port: port.unwrap_or(0) as u32, - ip_protocol: ip_proto.option().map(|protocol| { + ip_version: ip_version.option().map(|protocol| { IpVersionConstraint { protocol: protocol as i32, } @@ -500,7 +500,7 @@ impl Relay { .await } "openvpn" => { - if let Constraint::Only(_) = ip_proto { + if let Constraint::Only(_) = ip_version { return Err(Error::InvalidCommand( "OpenVPN does not support the IP version constraint", )); @@ -716,7 +716,7 @@ impl Relay { Self::format_port(constraints.port), Self::format_ip_version( constraints - .ip_protocol + .ip_version .clone() .map(|protocol| IpVersion::from_i32(protocol.protocol).unwrap()) ) @@ -784,7 +784,7 @@ fn parse_protocol_constraint(raw_protocol: &str) -> Constraint<TransportProtocol } } -fn parse_ip_protocol_constraint(raw_protocol: &str) -> Constraint<IpVersion> { +fn parse_ip_version_constraint(raw_protocol: &str) -> Constraint<IpVersion> { match raw_protocol { "any" => Constraint::Any, "4" => Constraint::Only(IpVersion::V4), diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs index 3866f51014..732e648199 100644 --- a/mullvad-daemon/src/management_interface.rs +++ b/mullvad-daemon/src/management_interface.rs @@ -949,8 +949,8 @@ fn convert_relay_settings_update( } else { None }; - let ip_protocol = if let Some(ref constraints) = settings.wireguard_constraints { - match &constraints.ip_protocol { + let ip_version = if let Some(ref constraints) = settings.wireguard_constraints { + match &constraints.ip_version { Some(constraint) => match types::IpVersion::from_i32(constraint.protocol) { Some(types::IpVersion::V4) => Some(IpVersion::V4), Some(types::IpVersion::V6) => Some(IpVersion::V6), @@ -975,7 +975,7 @@ fn convert_relay_settings_update( } else { Constraint::Any }, - ip_protocol: Constraint::from(ip_protocol), + ip_version: Constraint::from(ip_version), } }), openvpn_constraints: settings.openvpn_constraints.map(|constraints| { @@ -1018,9 +1018,9 @@ fn convert_relay_settings(settings: &RelaySettings) -> types::RelaySettings { wireguard_constraints: Some(types::WireguardConstraints { port: u32::from(constraints.wireguard_constraints.port.unwrap_or(0)), - ip_protocol: constraints + ip_version: constraints .wireguard_constraints - .ip_protocol + .ip_version .option() .map(|version| match version { IpVersion::V4 => types::IpVersion::V4, diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index dd3d2e12fd..2e2a009c4d 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -692,7 +692,7 @@ impl RelaySelector { relay: &Relay, constraints: WireguardConstraints, ) -> Option<IpAddr> { - match constraints.ip_protocol { + match constraints.ip_version { Constraint::Any | Constraint::Only(IpVersion::V4) => Some(relay.ipv4_addr_in.into()), Constraint::Only(IpVersion::V6) => relay.ipv6_addr_in.map(|addr| addr.into()), } diff --git a/mullvad-management-interface/proto/management_interface.proto b/mullvad-management-interface/proto/management_interface.proto index f864665766..83ea64a2ac 100644 --- a/mullvad-management-interface/proto/management_interface.proto +++ b/mullvad-management-interface/proto/management_interface.proto @@ -315,7 +315,7 @@ message IpVersionConstraint { message WireguardConstraints { // NOTE: optional uint32 port = 1; - IpVersionConstraint ip_protocol = 2; + IpVersionConstraint ip_version = 2; } message CustomRelaySettings { diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs index 8d9361aa09..d1104f4733 100644 --- a/mullvad-types/src/relay_constraints.rs +++ b/mullvad-types/src/relay_constraints.rs @@ -437,7 +437,7 @@ impl Match<OpenVpnEndpointData> for OpenVpnConstraints { #[serde(default)] pub struct WireguardConstraints { pub port: Constraint<u16>, - pub ip_protocol: Constraint<IpVersion>, + pub ip_version: Constraint<IpVersion>, } impl fmt::Display for WireguardConstraints { @@ -447,7 +447,7 @@ impl fmt::Display for WireguardConstraints { Constraint::Only(port) => write!(f, "port {}", port)?, } write!(f, " over ")?; - match self.ip_protocol { + match self.ip_version { Constraint::Any => write!(f, "IPv4 or IPv6"), Constraint::Only(protocol) => write!(f, "{}", protocol), } |