Remove obsolete virtual adapter code and errors

2 files changed, 0 insertions, 79 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();
 };
 
 }