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

Unified Diff: net/dns/address_sorter_win.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback eroman Created 4 years, 11 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
Index: net/dns/address_sorter_win.cc
diff --git a/net/dns/address_sorter_win.cc b/net/dns/address_sorter_win.cc
index 816b42d0b4404cf546d46bc9ed1f51db3d1d0bd4..aca46976f1978d688f66dca5bc2d4b1ea39afd6a 100644
--- a/net/dns/address_sorter_win.cc
+++ b/net/dns/address_sorter_win.cc
@@ -60,7 +60,7 @@ class AddressSorterWin : public AddressSorter {
IPEndPoint ipe = list[i];
// Addresses must be sockaddr_in6.
if (ipe.GetFamily() == ADDRESS_FAMILY_IPV4) {
- ipe = IPEndPoint(ConvertIPv4NumberToIPv6Number(ipe.address()),
+ ipe = IPEndPoint(ConvertIPv4NumberToIPv6Number(ipe.address().bytes()),
ipe.port());
}
@@ -116,9 +116,9 @@ class AddressSorterWin : public AddressSorter {
DCHECK(result) << "Unable to roundtrip between IPEndPoint and "
<< "SOCKET_ADDRESS!";
// Unmap V4MAPPED IPv6 addresses so that Happy Eyeballs works.
- if (IsIPv4Mapped(ipe.address())) {
- ipe = IPEndPoint(ConvertIPv4MappedToIPv4(ipe.address()),
- ipe.port());
+ if (IsIPv4Mapped(ipe.address().bytes())) {
+ ipe = IPEndPoint(ConvertIPv4MappedToIPv4(ipe.address().bytes()),
+ ipe.port());
}
list.push_back(ipe);
}

Powered by Google App Engine
This is Rietveld 408576698