Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Unified Diff: net/base/net_util.cc

Issue 1564020: Don't do dynamic IPv6 probe on Windows... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/net_util.cc
===================================================================
--- net/base/net_util.cc (revision 43952)
+++ net/base/net_util.cc (working copy)
@@ -1563,7 +1563,7 @@
enum IPv6SupportStatus {
IPV6_CANNOT_CREATE_SOCKETS,
- IPV6_CAN_CREATE_SOCKETS, // Deprecated: No longer used.
+ IPV6_CAN_CREATE_SOCKETS,
IPV6_GETIFADDRS_FAILED,
IPV6_GLOBAL_ADDRESS_MISSING,
IPV6_GLOBAL_ADDRESS_PRESENT,
@@ -1641,9 +1641,13 @@
}
closesocket(test_socket);
+ // TODO(jar): Bug 40851: The remainder of probe is not working.
+ IPv6SupportResults(IPV6_CAN_CREATE_SOCKETS); // Record status.
+ return true; // Don't disable IPv6 yet.
+
// Check to see if any interface has a IPv6 address.
// Note: The original IPv6 socket can't be used here, as WSAIoctl() will fail.
- test_socket = WSASocket(AF_INET, SOCK_DGRAM, 0, NULL, 0, 0);
+ test_socket = socket(AF_INET, SOCK_STREAM, 0);
DCHECK(test_socket != INVALID_SOCKET);
INTERFACE_INFO interfaces[128];
DWORD bytes_written = 0;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698