From 5a43b168231c7ed97f3f1862abaac2eb139f716b Mon Sep 17 00:00:00 2001 From: "pauljensen@chromium.org" Date: Thu, 29 May 2014 16:55:46 +0000 Subject: Don't use network interface type on Windows XP as it is documented to give inaccurate results like returning Ethernet for WiFi. BUG=378136 Review URL: https://codereview.chromium.org/294393005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273501 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/net_util_win.cc | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'net') diff --git a/net/base/net_util_win.cc b/net/base/net_util_win.cc index c3d9f3b..cac92e3 100644 --- a/net/base/net_util_win.cc +++ b/net/base/net_util_win.cc @@ -85,6 +85,12 @@ struct WlanApi { // Converts Windows defined types to NetworkInterfaceType. NetworkChangeNotifier::ConnectionType GetNetworkInterfaceType(DWORD ifType) { + // Bail out for pre-Vista versions of Windows which are documented to give + // inaccurate results like returning Ethernet for WiFi. + // http://msdn.microsoft.com/en-us/library/windows/desktop/aa366058.aspx + if (base::win::GetVersion() < base::win::VERSION_VISTA) + return NetworkChangeNotifier::CONNECTION_UNKNOWN; + NetworkChangeNotifier::ConnectionType type = NetworkChangeNotifier::CONNECTION_UNKNOWN; if (ifType == IF_TYPE_ETHERNET_CSMACD) { -- cgit v1.1