Change IPEndpoint::address() to return a net::IPAddress

net/dns/host_resolver_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/dns/host_resolver_impl.h"
 
 #include <utility>
 
 #if defined(OS_WIN)
 #include <Winsock2.h>
@@ skipping 197 matching lines @@
           net_log.net_log(),
           net_log.source()));
   int rv = socket->Connect(IPEndPoint(dest, 53));
   if (rv != OK)
     return false;
   IPEndPoint endpoint;
   rv = socket->GetLocalAddress(&endpoint);
   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;
   const uint8_t kTeredoPrefix[] = {0x20, 0x01, 0, 0};
   bool is_teredo = std::equal(kTeredoPrefix,
                               kTeredoPrefix + arraysize(kTeredoPrefix),
                               address.begin());
   if (is_teredo)
     return false;
   return true;
@@ skipping 63 matching lines @@
 
 AddressList EnsurePortOnAddressList(const AddressList& list, uint16_t port) {
   if (list.empty() || list.front().port() == port)
     return list;
   return AddressList::CopyWithPort(list, 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)
           return false;
         break;
       case ADDRESS_FAMILY_IPV6:
         return false;
       default:
         NOTREACHED();
         return false;
@@ skipping 391 matching lines @@
     // Running on the worker thread
     int error = params_.resolver_proc->Resolve(key_.hostname,
                                                key_.address_family,
                                                key_.host_resolver_flags,
                                                &results,
                                                &os_error);
 
     // 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;
         break;
       }
     }
 
     task_runner_->PostTask(FROM_HERE,
                            base::Bind(&ProcTask::OnLookupComplete,
                                       this,
@@ skipping 1703 matching lines @@
     dns_client_->SetConfig(dns_config);
     num_dns_failures_ = 0;
     if (dns_client_->GetConfig())
       UMA_HISTOGRAM_BOOLEAN("AsyncDNS.DnsClientEnabled", true);
   }
 
   AbortDnsTasks();
 }
 
 }  // namespace net