Merge branch 'remove-ipv6-forced'

9 files changed, 11 insertions, 370 deletions

diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index 6ea8393a77..a5b763cad1 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -242,18 +242,8 @@ impl TunnelMonitor {
 
     fn ensure_ipv6_can_be_used_if_enabled(tunnel_parameters: &TunnelParameters) -> Result<()> {
         let options = tunnel_parameters.get_generic_options();
-
-        #[cfg(target_os = "windows")]
         if options.enable_ipv6 {
-            try_enabling_ipv6()
-        } else {
-            Ok(())
-        }
-
-        #[cfg(not(target_os = "windows"))]
-        if options.enable_ipv6 {
-            let enabled = is_ipv6_enabled_in_os()?;
-            if enabled {
+            if is_ipv6_enabled_in_os() {
                 Ok(())
             } else {
                 Err(Error::EnableIpv6Error)
@@ -365,7 +355,7 @@ impl InternalTunnelMonitor {
 
 
 #[cfg(target_os = "windows")]
-fn try_enabling_ipv6() -> Result<()> {
+fn is_ipv6_enabled_in_os() -> bool {
     use winreg::{enums::*, RegKey};
 
     const IPV6_DISABLED_ON_TUNNELS_MASK: u32 = 0x01;
@@ -378,28 +368,24 @@ fn try_enabling_ipv6() -> Result<()> {
         .map(|ipv6_disabled_bits: u32| (ipv6_disabled_bits & IPV6_DISABLED_ON_TUNNELS_MASK) == 0)
         .unwrap_or(true);
 
-    if !globally_enabled {
-        // TODO: Try to globally enable IPv6
+    if globally_enabled {
+        true
+    } else {
         log::debug!("IPv6 disabled in all tunnel interfaces");
-        return Err(Error::EnableIpv6Error);
+        false
     }
-
-    let guid = "{AFE43773-E1F8-4EBB-8536-576AB86AFE9A}";
-    crate::winnet::enable_ipv6_for_adapter(&guid).map_err(Error::WinnetError)
 }
 
 #[cfg(not(target_os = "windows"))]
-fn is_ipv6_enabled_in_os() -> Result<bool> {
+fn is_ipv6_enabled_in_os() -> bool {
     #[cfg(target_os = "linux")]
     {
-        Ok(
-            std::fs::read_to_string("/proc/sys/net/ipv6/conf/all/disable_ipv6")
-                .map(|disable_ipv6| disable_ipv6.trim() == "0")
-                .unwrap_or(false),
-        )
+        std::fs::read_to_string("/proc/sys/net/ipv6/conf/all/disable_ipv6")
+            .map(|disable_ipv6| disable_ipv6.trim() == "0")
+            .unwrap_or(false)
     }
     #[cfg(any(target_os = "macos", target_os = "android"))]
     {
-        Ok(true)
+        true
     }
 }
diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs
index 3c036e95e7..c00a22d73f 100644
--- a/talpid-core/src/winnet.rs
+++ b/talpid-core/src/winnet.rs
@@ -73,26 +73,6 @@ pub fn ensure_best_metric_for_interface(interface_alias: &str) -> Result<bool, E
     }
 }
 
-/// Enables IPv6 for a given interface.
-pub fn enable_ipv6_for_adapter(interface_guid: &str) -> Result<(), Error> {
-    let interface_guid_ws =
-        WideCString::from_str(interface_guid).map_err(Error::InvalidInterfaceAlias)?;
-
-    let result = unsafe {
-        WinNet_EnableIpv6ForAdapter(
-            interface_guid_ws.as_ptr(),
-            Some(log_sink),
-            logging_context(),
-        )
-    };
-
-    if result {
-        Ok(())
-    } else {
-        Err(Error::EnableIpv6)
-    }
-}
-
 #[allow(dead_code)]
 #[repr(u32)]
 pub enum WinNetAddrFamily {
@@ -443,13 +423,6 @@ mod api {
             sink_context: *const u8,
         ) -> u32;
 
-        #[link_name = "WinNet_EnableIpv6ForAdapter"]
-        pub fn WinNet_EnableIpv6ForAdapter(
-            tunnel_interface_alias: *const wchar_t,
-            sink: Option<LogSink>,
-            sink_context: *const u8,
-        ) -> bool;
-
         // TODO: Remove "allow(dead_code)" this is in use.
         #[allow(dead_code)]
         #[link_name = "WinNet_GetBestDefaultRoute"]
diff --git a/windows/winnet/src/winnet/netconfig.cpp b/windows/winnet/src/winnet/netconfig.cpp
deleted file mode 100644
index 7fd7b38869..0000000000
--- a/windows/winnet/src/winnet/netconfig.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-#include "stdafx.h"
-#include "netconfig.h"
-#include <stdexcept>
-#include <sstream>
-#include <windows.h>
-#include <netcfgx.h>
-#include <devguid.h>
-#include <libcommon/registry/registry.h>
-#include <libcommon/error.h>
-#include <libcommon/string.h>
-#include <libcommon/memory.h>
-#include <libshared/network/interfaceutils.h>
-
-
-namespace
-{
-
-const wchar_t NETCFG_LOCK_CLIENT_NAME[] = L"MULLVAD";
-constexpr uint16_t NETCFG_LOCK_TIMEOUT = 5000; // milliseconds
-const wchar_t NETCFG_IPV6_COMPONENT_NAME[] = L"MS_TCPIP6";
-
-void SetIpv6BindingForBindName(INetCfg *netCfg, const std::wstring &bindName, bool enable)
-{
-	INetCfgComponent *transactionComponent = nullptr;
-	HRESULT result = netCfg->FindComponent(NETCFG_IPV6_COMPONENT_NAME, &transactionComponent);
-
-	if (S_OK != result)
-	{
-		THROW_ERROR("Failed to obtain transaction component");
-	}
-
-	INetCfgComponentBindings *bindings = nullptr;
-	result = transactionComponent->QueryInterface(
-		IID_INetCfgComponentBindings,
-		reinterpret_cast<void**>(&bindings)
-	);
-
-	transactionComponent->Release();
-	transactionComponent = nullptr;
-
-	if (S_OK != result)
-	{
-		std::wstringstream ss;
-		ss << L"Failed to obtain component bindings for ";
-		ss << NETCFG_IPV6_COMPONENT_NAME;
-		THROW_ERROR(common::string::ToAnsi(ss.str()).c_str());
-	}
-
-	IEnumNetCfgBindingPath *pathsEnum = NULL;
-	result = bindings->EnumBindingPaths(EBP_BELOW, &pathsEnum);
-
-	bindings->Release();
-	bindings = nullptr;
-
-	if (S_OK != result)
-	{
-		THROW_ERROR("Failed to acquire binding path enumerator");
-	}
-
-	common::memory::ScopeDestructor pathsEnumDestructor;
-	pathsEnumDestructor += [&pathsEnum]() {
-		pathsEnum->Release();
-		pathsEnum = nullptr;
-	};
-
-	INetCfgBindingPath *bindingPath = NULL;
-
-	result = pathsEnum->Next(1, &bindingPath, nullptr);
-
-	for (; S_OK == result; result = pathsEnum->Next(1, &bindingPath, nullptr))
-	{
-		common::memory::ScopeDestructor bindingPathDestructor;
-		bindingPathDestructor += [&bindingPath]() {
-			bindingPath->Release();
-			bindingPath = nullptr;
-		};
-
-		IEnumNetCfgBindingInterface *enumInterface = nullptr;
-		HRESULT enumResult = bindingPath->EnumBindingInterfaces(&enumInterface);
-
-		if (S_OK != enumResult)
-		{
-			THROW_ERROR("Failed to acquire binding path interfaces");
-		}
-
-		common::memory::ScopeDestructor interfaceEnumDestructor;
-		interfaceEnumDestructor += [&enumInterface]() {
-			enumInterface->Release();
-			enumInterface = nullptr;
-		};
-
-		INetCfgBindingInterface *iface = nullptr;
-
-		while (S_OK == enumInterface->Next(1, &iface, nullptr))
-		{
-			INetCfgComponent *cfgComponent = nullptr;
-
-			auto status = iface->GetLowerComponent(&cfgComponent);
-
-			iface->Release();
-			iface = nullptr;
-
-			if (S_OK != status)
-			{
-				THROW_ERROR("Failed to acquire binding interface component");
-			}
-
-			wchar_t *componentBindName = 0;
-
-			status = cfgComponent->GetBindName(&componentBindName);
-
-			cfgComponent->Release();
-			cfgComponent = nullptr;
-
-			if (S_OK != status)
-			{
-				THROW_ERROR("Failed to acquire bind name");
-			}
-
-			bool matchesBindName = (0 == _wcsicmp(bindName.c_str(), componentBindName));
-			CoTaskMemFree(componentBindName);
-
-			if (matchesBindName)
-			{
-				//
-				// Apply the changes and exit the function
-				//
-
-				result = bindingPath->Enable(enable);
-				if (S_OK != result)
-				{
-					THROW_ERROR("Failed to set IPv6 status");
-				}
-				netCfg->Apply();
-
-				return;
-			}
-		}
-	}
-}
-
-} // anonymous namespace
-
-
-void EnableIpv6ForAdapter(const std::wstring &adapterGuid)
-{
-	try
-	{
-		//
-		// Avoid using the COM objects unless necessary
-		// due to slow performance.
-		//
-
-		const auto key = common::registry::Registry::OpenKey(
-			HKEY_LOCAL_MACHINE,
-			L"SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Linkage"
-		);
-		const auto bindings = key->readStringArray(L"Bind");
-
-		std::wstring matchString = std::wstring(L"\\Device\\").append(adapterGuid);
-
-		for (auto it = bindings.begin(); it != bindings.end(); ++it)
-		{
-			if (0 == _wcsicmp(it->c_str(), matchString.c_str()))
-			{
-				// return from function
-				return;
-			}
-		}
-	}
-	catch (...)
-	{
-	}
-
-	//
-	// Initialize COM
-	//
-
-	HRESULT result = CoInitialize(nullptr);
-
-	if (S_OK != result)
-	{
-		std::stringstream ss;
-		ss << "Failed to initialize COM: " << result;
-		THROW_ERROR(ss.str().c_str());
-	}
-
-	common::memory::ScopeDestructor scopeDest;
-	scopeDest += []() {
-		CoUninitialize();
-	};
-
-	//
-	// Initialize INetCfg
-	//
-
-	INetCfg *netCfg = nullptr;
-	result = CoCreateInstance(
-		CLSID_CNetCfg,
-		nullptr,
-		CLSCTX_INPROC_SERVER,
-		IID_INetCfg,
-		reinterpret_cast<void **>(&netCfg)
-	);
-
-	if (S_OK != result)
-	{
-		std::stringstream ss;
-		ss << "Failed to create INetCfg instance: " << result;
-		THROW_ERROR(ss.str().c_str());
-
-	}
-
-	scopeDest += [&netCfg]() { netCfg->Release(); };
-
-	INetCfgLock *netCfgLock = nullptr;
-	result = netCfg->QueryInterface(IID_INetCfgLock, reinterpret_cast<void **>(&netCfgLock));
-
-	if (S_OK != result)
-	{
-		std::stringstream ss;
-		ss << "Failed to obtain INetCfg lock interface: " << result;
-		THROW_ERROR(ss.str().c_str());
-	}
-
-	scopeDest += [&netCfgLock]() {
-		netCfgLock->Release();
-	};
-
-	wchar_t *blockingApplication = nullptr;
-
-	// NOTE: This should be done before initializing INetCfg
-	result = netCfgLock->AcquireWriteLock(
-		NETCFG_LOCK_TIMEOUT,
-		NETCFG_LOCK_CLIENT_NAME,
-		&blockingApplication
-	);
-
-	if (S_OK != result)
-	{
-		std::wstringstream ss;
-		ss << L"Failed to acquire write lock";
-		if (nullptr != blockingApplication)
-		{
-			ss << L" due to application: " << blockingApplication;
-		}
-		ss << ". (" << result << ")";
-
-		THROW_ERROR(common::string::ToAnsi(ss.str()).c_str());
-	}
-
-	scopeDest += [&]() {
-		CoTaskMemFree(blockingApplication);
-		netCfgLock->ReleaseWriteLock();
-	};
-
-	result = netCfg->Initialize(nullptr);
-
-	if (S_OK != result)
-	{
-		std::stringstream ss;
-		ss << "Failed to initialize INetCfg: " << result;
-		THROW_ERROR(ss.str().c_str());
-	}
-
-	scopeDest += [&netCfg]() { netCfg->Uninitialize(); };
-
-	SetIpv6BindingForBindName(netCfg, adapterGuid, true);
-}
diff --git a/windows/winnet/src/winnet/netconfig.h b/windows/winnet/src/winnet/netconfig.h
deleted file mode 100644
index b2849857a2..0000000000
--- a/windows/winnet/src/winnet/netconfig.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include <string>
-
-void EnableIpv6ForAdapter(const std::wstring &guid);
diff --git a/windows/winnet/src/winnet/winnet.cpp b/windows/winnet/src/winnet/winnet.cpp
index e52662c7a2..9ed2ec103e 100644
--- a/windows/winnet/src/winnet/winnet.cpp
+++ b/windows/winnet/src/winnet/winnet.cpp
@@ -4,7 +4,6 @@
 #include "offlinemonitor.h"

 #include "routing/routemanager.h"

 #include "converters.h"

-#include "netconfig.h"

 #include <libshared/logging/logsinkadapter.h>

 #include <libshared/logging/unwind.h>

 #include <libshared/network/interfaceutils.h>

@@ -67,34 +66,6 @@ WinNet_EnsureBestMetric(
 

 extern "C"

 WINNET_LINKAGE

-bool

-WINNET_API

-WinNet_EnableIpv6ForAdapter(

-	const wchar_t *deviceGuid,

-	MullvadLogSink logSink,

-	void *logSinkContext

-)

-{

-	try

-	{

-		if (nullptr == deviceGuid)

-		{

-			THROW_ERROR("Invalid argument: deviceGuid");

-		}

-

-		EnableIpv6ForAdapter(deviceGuid);

-		return true;

-	}

-	catch (const std::exception & err)

-	{

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

-		return false;

-	}

-	return false;

-}

-

-extern "C"

-WINNET_LINKAGE

 WINNET_STATUS

 WINNET_API

 WinNet_GetBestDefaultRoute(

diff --git a/windows/winnet/src/winnet/winnet.def b/windows/winnet/src/winnet/winnet.def
index 82cb952790..4b840ee818 100644
--- a/windows/winnet/src/winnet/winnet.def
+++ b/windows/winnet/src/winnet/winnet.def
@@ -1,7 +1,6 @@
 LIBRARY winnet
 EXPORTS
 	WinNet_EnsureBestMetric
-	WinNet_EnableIpv6ForAdapter
 	WinNet_ActivateConnectivityMonitor
 	WinNet_DeactivateConnectivityMonitor
 	WinNet_ActivateRouteManager
diff --git a/windows/winnet/src/winnet/winnet.h b/windows/winnet/src/winnet/winnet.h
index 2d3c579e60..32d377e73f 100644
--- a/windows/winnet/src/winnet/winnet.h
+++ b/windows/winnet/src/winnet/winnet.h
@@ -33,16 +33,6 @@ WinNet_EnsureBestMetric(
 	void *logSinkContext
 );
 
-extern "C"
-WINNET_LINKAGE
-bool
-WINNET_API
-WinNet_EnableIpv6ForAdapter(
-	const wchar_t *deviceGuid,
-	MullvadLogSink logSink,
-	void *logSinkContext
-);
-
 typedef void (WINNET_API *WinNetConnectivityMonitorCallback)(bool connected, void *context);
 
 extern "C"
diff --git a/windows/winnet/src/winnet/winnet.vcxproj b/windows/winnet/src/winnet/winnet.vcxproj
index 6876035160..7b4578d4b1 100644
--- a/windows/winnet/src/winnet/winnet.vcxproj
+++ b/windows/winnet/src/winnet/winnet.vcxproj
@@ -28,7 +28,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="converters.cpp" />
-    <ClCompile Include="netconfig.cpp" />
     <ClCompile Include="networkadaptermonitor.cpp" />
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="InterfacePair.cpp" />
@@ -43,7 +42,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="converters.h" />
-    <ClInclude Include="netconfig.h" />
     <ClInclude Include="networkadaptermonitor.h" />
     <ClInclude Include="InterfacePair.h" />
     <ClInclude Include="offlinemonitor.h" />
diff --git a/windows/winnet/src/winnet/winnet.vcxproj.filters b/windows/winnet/src/winnet/winnet.vcxproj.filters
index 27f0051bc6..2d5a039c6b 100644
--- a/windows/winnet/src/winnet/winnet.vcxproj.filters
+++ b/windows/winnet/src/winnet/winnet.vcxproj.filters
@@ -21,7 +21,6 @@
       <Filter>routing</Filter>
     </ClCompile>
     <ClCompile Include="converters.cpp" />
-    <ClCompile Include="netconfig.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
@@ -44,7 +43,6 @@
       <Filter>routing</Filter>
     </ClInclude>
     <ClInclude Include="converters.h" />
-    <ClInclude Include="netconfig.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="winnet.def" />