summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-02-02 11:06:04 +0100
committerDavid Lönnhager <david.l@mullvad.net>2021-03-01 13:49:45 +0100
commit50d057ae92f59f2fadca4fd96568f4401dbffa41 (patch)
treedf07af6eb14bc1745be256928561e64a2d488086 /mullvad-daemon/src
parent0da3dc9997b43594e910314a5b5c805c80af914c (diff)
downloadmullvadvpn-50d057ae92f59f2fadca4fd96568f4401dbffa41.tar.xz
mullvadvpn-50d057ae92f59f2fadca4fd96568f4401dbffa41.zip
Rename "IP protocol" to "IP version"
Diffstat (limited to 'mullvad-daemon/src')
-rw-r--r--mullvad-daemon/src/management_interface.rs10
-rw-r--r--mullvad-daemon/src/relays.rs2
2 files changed, 6 insertions, 6 deletions
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()),
}