summaryrefslogtreecommitdiffhomepage
path: root/talpid-core
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2020-02-06 13:22:05 +0100
committerDavid Lönnhager <david.l@mullvad.net>2020-02-07 13:01:26 +0100
commit81772b01cd7cabeef9435bb5c39df67b3d63f4bb (patch)
tree63d62e67fa07de2b2b0987950f95ebb58a18cab9 /talpid-core
parent533b498658bad6ecb38b9a0e16e8fb3dd25975e5 (diff)
downloadmullvadvpn-81772b01cd7cabeef9435bb5c39df67b3d63f4bb.tar.xz
mullvadvpn-81772b01cd7cabeef9435bb5c39df67b3d63f4bb.zip
Rename amgiguous metric identifiers
Diffstat (limited to 'talpid-core')
-rw-r--r--talpid-core/src/firewall/windows.rs2
-rw-r--r--talpid-core/src/winnet.rs10
2 files changed, 6 insertions, 6 deletions
diff --git a/talpid-core/src/firewall/windows.rs b/talpid-core/src/firewall/windows.rs
index 38e388ecbf..89e880da7e 100644
--- a/talpid-core/src/firewall/windows.rs
+++ b/talpid-core/src/firewall/windows.rs
@@ -194,7 +194,7 @@ impl Firewall {
protocol: WinFwProt::from(endpoint.protocol),
};
- let metrics_set = winnet::ensure_top_metric_for_interface(&tunnel_metadata.interface)
+ let metrics_set = winnet::ensure_best_metric_for_interface(&tunnel_metadata.interface)
.map_err(Error::SetTapMetric)?;
if metrics_set {
diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs
index 2eee4b205a..256695eb5c 100644
--- a/talpid-core/src/winnet.rs
+++ b/talpid-core/src/winnet.rs
@@ -35,12 +35,12 @@ fn logging_context() -> *const u8 {
}
/// Returns true if metrics were changed, false otherwise
-pub fn ensure_top_metric_for_interface(interface_alias: &str) -> Result<bool, Error> {
+pub fn ensure_best_metric_for_interface(interface_alias: &str) -> Result<bool, Error> {
let interface_alias_ws =
WideCString::from_str(interface_alias).map_err(Error::InvalidInterfaceAlias)?;
let metric_result = unsafe {
- WinNet_EnsureTopMetric(
+ WinNet_EnsureBestMetric(
interface_alias_ws.as_ptr(),
Some(log_sink),
logging_context(),
@@ -56,7 +56,7 @@ pub fn ensure_top_metric_for_interface(interface_alias: &str) -> Result<bool, Er
2 => Err(Error::MetricApplication),
// Unexpected value
i => {
- log::error!("Unexpected return code from WinNet_EnsureTopMetric: {}", i);
+ log::error!("Unexpected return code from WinNet_EnsureBestMetric: {}", i);
Err(Error::MetricApplication)
}
}
@@ -365,8 +365,8 @@ mod api {
#[link_name = "WinNet_DeactivateRouteManager"]
pub fn WinNet_DeactivateRouteManager();
- #[link_name = "WinNet_EnsureTopMetric"]
- pub fn WinNet_EnsureTopMetric(
+ #[link_name = "WinNet_EnsureBestMetric"]
+ pub fn WinNet_EnsureBestMetric(
tunnel_interface_alias: *const wchar_t,
sink: Option<LogSink>,
sink_context: *const u8,