summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorpauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-29 16:55:46 +0000
committerpauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-29 16:55:46 +0000
commit5a43b168231c7ed97f3f1862abaac2eb139f716b (patch)
tree380f7e5eb17a778c71b77ced305acbff3b4f8dcb /net
parent8c75c13447bb132283933509f12a97eeadde4303 (diff)
downloadchromium_src-5a43b168231c7ed97f3f1862abaac2eb139f716b.zip
chromium_src-5a43b168231c7ed97f3f1862abaac2eb139f716b.tar.gz
chromium_src-5a43b168231c7ed97f3f1862abaac2eb139f716b.tar.bz2
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
Diffstat (limited to 'net')
-rw-r--r--net/base/net_util_win.cc6
1 files changed, 6 insertions, 0 deletions
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) {