Remove unused WinNet_GetTapInterfaceIpv6Status function

5 files changed, 0 insertions, 98 deletions

diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index c475aa11a2..6881b02311 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -369,14 +369,6 @@ fn try_enabling_ipv6(tunnel_parameters: &TunnelParameters) -> Result<()> {
 
     let guid = match tunnel_parameters {
         TunnelParameters::OpenVpn(..) => {
-            // TODO: This status check can be removed if it is certain
-            // that `enable_ipv6_for_adapter` is reliable.
-            let status =
-                crate::winnet::get_tap_interface_ipv6_status().map_err(Error::WinnetError)?;
-            if status {
-                return Ok(());
-            }
-
             let alias = crate::winnet::get_tap_interface_alias().map_err(Error::WinnetError)?;
             guid_string =
                 crate::winnet::interface_alias_to_guid(&alias).map_err(Error::WinnetError)?;
diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs
index 534dab5228..a0b183d779 100644
--- a/talpid-core/src/winnet.rs
+++ b/talpid-core/src/winnet.rs
@@ -94,32 +94,6 @@ pub fn enable_ipv6_for_adapter(interface_guid: &str) -> Result<(), Error> {
     }
 }
 
-/// Checks if IPv6 is enabled for the TAP interface
-pub fn get_tap_interface_ipv6_status() -> Result<bool, Error> {
-    // WinNet_GetTapInterfaceIpv6Status() will fail if the alias cannot be retrieved.
-    // Try to retrieve it first so that we may return a more specific error.
-    let _ = get_tap_interface_alias()?;
-    let tap_ipv6_status =
-        unsafe { WinNet_GetTapInterfaceIpv6Status(Some(log_sink), logging_context()) };
-
-    match tap_ipv6_status {
-        // Enabled
-        0 => Ok(true),
-        // Disabled
-        1 => Ok(false),
-        // Failure
-        2 => Err(Error::GetIpv6Status),
-        // Unexpected value
-        i => {
-            log::error!(
-                "Unexpected return code from WinNet_GetTapInterfaceIpv6Status: {}",
-                i
-            );
-            Err(Error::GetIpv6Status)
-        }
-    }
-}
-
 /// Dynamically determines the alias of the TAP adapter.
 pub fn get_tap_interface_alias() -> Result<OsString, Error> {
     let mut alias_ptr: *mut wchar_t = ptr::null_mut();
@@ -443,12 +417,6 @@ mod api {
             sink_context: *const u8,
         ) -> bool;
 
-        #[link_name = "WinNet_GetTapInterfaceIpv6Status"]
-        pub fn WinNet_GetTapInterfaceIpv6Status(
-            sink: Option<LogSink>,
-            sink_context: *const u8,
-        ) -> u32;
-
         #[link_name = "WinNet_GetTapInterfaceAlias"]
         pub fn WinNet_GetTapInterfaceAlias(
             tunnel_interface_alias: *mut *mut wchar_t,
diff --git a/windows/winnet/src/winnet/winnet.cpp b/windows/winnet/src/winnet/winnet.cpp
index 6a37b100f6..ac56e94ff6 100644
--- a/windows/winnet/src/winnet/winnet.cpp
+++ b/windows/winnet/src/winnet/winnet.cpp
@@ -94,47 +94,6 @@ WinNet_EnableIpv6ForAdapter(
 

 extern "C"

 WINNET_LINKAGE

-WINNET_GTII_STATUS

-WINNET_API

-WinNet_GetTapInterfaceIpv6Status(

-	MullvadLogSink logSink,

-	void *logSinkContext

-)

-{

-	try

-	{

-		MIB_IPINTERFACE_ROW iface = { 0 };

-

-		iface.InterfaceLuid = NetworkInterfaces::GetInterfaceLuid(InterfaceUtils::GetTapInterfaceAlias());

-		iface.Family = AF_INET6;

-

-		const auto status = GetIpInterfaceEntry(&iface);

-

-		if (NO_ERROR == status)

-		{

-			return WINNET_GTII_STATUS_ENABLED;

-		}

-

-		if (ERROR_NOT_FOUND == status)

-		{

-			return WINNET_GTII_STATUS_DISABLED;

-		}

-

-		THROW_WINDOWS_ERROR(status, "Resolve TAP IPv6 interface");

-	}

-	catch (const std::exception &err)

-	{

-		shared::logging::UnwindAndLog(logSink, logSinkContext, err);

-		return WINNET_GTII_STATUS_FAILURE;

-	}

-	catch (...)

-	{

-		return WINNET_GTII_STATUS_FAILURE;

-	}

-}

-

-extern "C"

-WINNET_LINKAGE

 bool

 WINNET_API

 WinNet_GetTapInterfaceAlias(

diff --git a/windows/winnet/src/winnet/winnet.def b/windows/winnet/src/winnet/winnet.def
index c281e481f5..5a1bbfe99f 100644
--- a/windows/winnet/src/winnet/winnet.def
+++ b/windows/winnet/src/winnet/winnet.def
@@ -3,7 +3,6 @@ EXPORTS
 	WinNet_EnsureBestMetric
 	WinNet_InterfaceAliasToGuid
 	WinNet_EnableIpv6ForAdapter
-	WinNet_GetTapInterfaceIpv6Status
 	WinNet_GetTapInterfaceAlias
 	WinNet_ReleaseString
 	WinNet_ActivateConnectivityMonitor
diff --git a/windows/winnet/src/winnet/winnet.h b/windows/winnet/src/winnet/winnet.h
index f084f0e737..98b0083f03 100644
--- a/windows/winnet/src/winnet/winnet.h
+++ b/windows/winnet/src/winnet/winnet.h
@@ -43,22 +43,6 @@ WinNet_EnableIpv6ForAdapter(
 	void *logSinkContext
 );
 
-enum WINNET_GTII_STATUS
-{
-	WINNET_GTII_STATUS_ENABLED = 0,
-	WINNET_GTII_STATUS_DISABLED = 1,
-	WINNET_GTII_STATUS_FAILURE = 2,
-};
-
-extern "C"
-WINNET_LINKAGE
-WINNET_GTII_STATUS
-WINNET_API
-WinNet_GetTapInterfaceIpv6Status(
-	MullvadLogSink logSink,
-	void *logSinkContext
-);
-
 extern "C"
 WINNET_LINKAGE
 bool