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

Unified Diff: net/dns/host_resolver_impl.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase for ChromeOS 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
« no previous file with comments | « net/dns/dns_config_service_win.cc ('k') | net/dns/mdns_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/host_resolver_impl.cc
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 16970cd56821aa64fb9aea2ff445929eb6cbeb86..39a965fa733ac4bda646662684dd98d6773e9dbf 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -215,7 +215,7 @@ bool IsGloballyReachable(const IPAddressNumber& dest,
if (rv != OK)
return false;
DCHECK_EQ(ADDRESS_FAMILY_IPV6, endpoint.GetFamily());
- const IPAddressNumber& address = endpoint.address();
+ const IPAddressNumber& address = endpoint.address().bytes();
bool is_link_local = (address[0] == 0xFE) && ((address[1] & 0xC0) == 0x80);
if (is_link_local)
return false;
@@ -299,7 +299,7 @@ AddressList EnsurePortOnAddressList(const AddressList& list, uint16_t port) {
// Returns true if |addresses| contains only IPv4 loopback addresses.
bool IsAllIPv4Loopback(const AddressList& addresses) {
for (unsigned i = 0; i < addresses.size(); ++i) {
- const IPAddressNumber& address = addresses[i].address();
+ const IPAddressNumber& address = addresses[i].address().bytes();
switch (addresses[i].GetFamily()) {
case ADDRESS_FAMILY_IPV4:
if (address[0] != 127)
@@ -711,7 +711,7 @@ class HostResolverImpl::ProcTask
// Fail the resolution if the result contains 127.0.53.53. See the comment
// block of kIcanNameCollisionIp for details on why.
for (const auto& it : results) {
- const IPAddressNumber& cur = it.address();
+ const IPAddressNumber& cur = it.address().bytes();
if (cur.size() == arraysize(kIcanNameCollisionIp) &&
0 == memcmp(&cur.front(), kIcanNameCollisionIp, cur.size())) {
error = ERR_ICANN_NAME_COLLISION;
« no previous file with comments | « net/dns/dns_config_service_win.cc ('k') | net/dns/mdns_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698