Remove obsolete virtual adapter code and errors

5 files changed, 0 insertions, 223 deletions

diff --git a/windows/libshared/src/libshared/network/interfaceutils.cpp b/windows/libshared/src/libshared/network/interfaceutils.cpp
index 26588206b3..b5b65d3d61 100644
--- a/windows/libshared/src/libshared/network/interfaceutils.cpp
+++ b/windows/libshared/src/libshared/network/interfaceutils.cpp
@@ -121,76 +121,4 @@ void InterfaceUtils::AddDeviceIpAddresses(NET_LUID device, const std::vector<SOC
 	}
 }
 
-//static
-std::set<InterfaceUtils::NetworkAdapter>
-InterfaceUtils::GetVirtualAdapters(const std::set<NetworkAdapter>& adapters)
-{
-	std::set<NetworkAdapter> virtualAdapters;
-
-	for (const auto& adapter : adapters)
-	{
-		for (size_t i = 0; i < ARRAYSIZE(TUNNEL_INTERFACE_DESCS); i++)
-		{
-			if (nullptr != wcsstr(adapter.raw().Description, TUNNEL_INTERFACE_DESCS[i]))
-			{
-				virtualAdapters.insert(adapter);
-			}
-		}
-	}
-
-	return virtualAdapters;
-}
-
-//static
-std::wstring InterfaceUtils::GetInterfaceAlias()
-{
-	//
-	// Look for virtual adapter with alias "Mullvad".
-	//
-
-	using shared::network::InterfaceUtils;
-
-	auto adapters = InterfaceUtils::GetVirtualAdapters(InterfaceUtils::GetAllAdapters(
-		AF_INET,
-		GAA_FLAG_SKIP_UNICAST | GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST
-	));
-
-	auto findByAlias = [](const std::set<InterfaceUtils::NetworkAdapter>& adapters, const std::wstring& alias)
-	{
-		const auto it = std::find_if(adapters.begin(), adapters.end(), [&alias](const InterfaceUtils::NetworkAdapter& candidate)
-		{
-			return 0 == _wcsicmp(candidate.alias().c_str(), alias.c_str());
-		});
-
-		return it != adapters.end();
-	};
-
-	static const wchar_t baseAlias[] = L"Mullvad";
-
-	if (findByAlias(adapters, baseAlias))
-	{
-		return baseAlias;
-	}
-
-	//
-	// Look for virtual adapter with alias "Mullvad-1", "Mullvad-2", etc.
-	//
-
-	for (auto i = 0; i < 10; ++i)
-	{
-		std::wstringstream ss;
-
-		ss << baseAlias << L"-" << i;
-
-		const auto alias = ss.str();
-
-		if (findByAlias(adapters, alias))
-		{
-			return alias;
-		}
-	}
-
-	THROW_ERROR("Unable to find virtual adapter");
-}
-
 }
diff --git a/windows/libshared/src/libshared/network/interfaceutils.h b/windows/libshared/src/libshared/network/interfaceutils.h
index e29b2fbcb2..b23eb88475 100644
--- a/windows/libshared/src/libshared/network/interfaceutils.h
+++ b/windows/libshared/src/libshared/network/interfaceutils.h
@@ -67,13 +67,6 @@ public:
 	static std::set<NetworkAdapter> GetAllAdapters(ULONG family, ULONG flags);
 
 	static void AddDeviceIpAddresses(NET_LUID device, const std::vector<SOCKADDR_INET> &addresses);
-
-	static std::set<NetworkAdapter> GetVirtualAdapters(const std::set<NetworkAdapter> &adapters);
-
-	//
-	// Determines alias of primary virtual adapter.
-	//
-	static std::wstring GetInterfaceAlias();
 };
 
 }
diff --git a/windows/winnet/src/winnet/winnet.cpp b/windows/winnet/src/winnet/winnet.cpp
index bccf5561d8..e52662c7a2 100644
--- a/windows/winnet/src/winnet/winnet.cpp
+++ b/windows/winnet/src/winnet/winnet.cpp
@@ -215,114 +215,6 @@ extern "C"
 WINNET_LINKAGE

 bool

 WINNET_API

-WinNet_GetInterfaceAlias(

-	wchar_t **alias,

-	MullvadLogSink logSink,

-	void *logSinkContext

-)

-{

-	try

-	{

-		if (nullptr == alias)

-		{

-			THROW_ERROR("Invalid argument: alias");

-		}

-

-		const auto currentAlias = InterfaceUtils::GetInterfaceAlias();

-

-		auto stringBuffer = new wchar_t[currentAlias.size() + 1];

-		wcscpy(stringBuffer, currentAlias.c_str());

-

-		*alias = stringBuffer;

-

-		return true;

-	}

-	catch (const std::exception &err)

-	{

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

-		return false;

-	}

-	catch (...)

-	{

-		return false;

-	}

-}

-

-extern "C"

-WINNET_LINKAGE

-bool

-WINNET_API

-WinNet_InterfaceAliasToGuid(

-	const wchar_t *alias,

-	wchar_t **guid,

-	MullvadLogSink logSink,

-	void *logSinkContext

-)

-{

-	try

-	{

-		if (nullptr == guid)

-		{

-			THROW_ERROR("Invalid argument: guid");

-		}

-		if (nullptr == alias)

-		{

-			THROW_ERROR("Invalid argument: alias");

-		}

-

-		GUID tempGuid = { 0 };

-		NET_LUID luid = { 0 };

-

-		if (NO_ERROR != ConvertInterfaceAliasToLuid(alias, &luid))

-		{

-			THROW_ERROR("ConvertInterfaceAliasToLuid: invalid parameter");

-		}

-

-		if (NO_ERROR != ConvertInterfaceLuidToGuid(&luid, &tempGuid))

-		{

-			THROW_ERROR("ConvertInterfaceLuidToGuid: invalid parameter");

-		}

-

-		const auto guidStr = common::string::FormatGuid(tempGuid);

-

-		auto guidBuffer = new wchar_t[guidStr.size() + 1];

-		wcscpy(guidBuffer, guidStr.c_str());

-		*guid = guidBuffer;

-

-		return true;

-	}

-	catch (const std::exception & err)

-	{

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

-		return false;

-	}

-	catch (...)

-	{

-		return false;

-	}

-}

-

-extern "C"

-WINNET_LINKAGE

-void

-WINNET_API

-WinNet_ReleaseString(

-	wchar_t *str

-)

-{

-	try

-	{

-		delete[] str;

-	}

-	catch (...)

-	{

-	}

-}

-

-extern "C"

-WINNET_LINKAGE

-bool

-WINNET_API

 WinNet_ActivateConnectivityMonitor(

 	WinNetConnectivityMonitorCallback callback,

 	void *callbackContext,

diff --git a/windows/winnet/src/winnet/winnet.def b/windows/winnet/src/winnet/winnet.def
index 34d3c4e59d..82cb952790 100644
--- a/windows/winnet/src/winnet/winnet.def
+++ b/windows/winnet/src/winnet/winnet.def
@@ -1,10 +1,7 @@
 LIBRARY winnet
 EXPORTS
 	WinNet_EnsureBestMetric
-	WinNet_InterfaceAliasToGuid
 	WinNet_EnableIpv6ForAdapter
-	WinNet_GetInterfaceAlias
-	WinNet_ReleaseString
 	WinNet_ActivateConnectivityMonitor
 	WinNet_DeactivateConnectivityMonitor
 	WinNet_ActivateRouteManager
diff --git a/windows/winnet/src/winnet/winnet.h b/windows/winnet/src/winnet/winnet.h
index 5634298a93..2d3c579e60 100644
--- a/windows/winnet/src/winnet/winnet.h
+++ b/windows/winnet/src/winnet/winnet.h
@@ -43,39 +43,6 @@ WinNet_EnableIpv6ForAdapter(
 	void *logSinkContext
 );
 
-extern "C"
-WINNET_LINKAGE
-bool
-WINNET_API
-WinNet_GetInterfaceAlias(
-	wchar_t **alias,
-	MullvadLogSink logSink,
-	void *logSinkContext
-);
-
-extern "C"
-WINNET_LINKAGE
-bool
-WINNET_API
-WinNet_InterfaceAliasToGuid(
-	const wchar_t *alias,
-	wchar_t **guid,
-	MullvadLogSink logSink,
-	void *logSinkContext
-);
-
-//
-// This is a companion function to the above function.
-// Generically named in case we need other functions here that return strings.
-//
-extern "C"
-WINNET_LINKAGE
-void
-WINNET_API
-WinNet_ReleaseString(
-	wchar_t *str
-);
-
 typedef void (WINNET_API *WinNetConnectivityMonitorCallback)(bool connected, void *context);
 
 extern "C"