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

net/base/network_interfaces_win.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/base/network_interfaces_win.h"
 
 #pragma comment(lib, "iphlpapi.lib")
 
 #include <algorithm>
 
@@ skipping 162 matching lines @@
           if (is_xp) {
             // Prior to Windows Vista the FirstPrefix pointed to the list with
             // single prefix for each IP address assigned to the adapter.
             // Order of FirstPrefix does not match order of FirstUnicastAddress,
             // so we need to find corresponding prefix.
             for (IP_ADAPTER_PREFIX* prefix = adapter->FirstPrefix; prefix;
                  prefix = prefix->Next) {
               int prefix_family = prefix->Address.lpSockaddr->sa_family;
               IPEndPoint network_endpoint;
               if (prefix_family == family &&
-                  network_endpoint.FromSockAddr(prefix->Address.lpSockaddr,
+                  network_endpoint.FromSockAddr(
+                      prefix->Address.lpSockaddr,
                       prefix->Address.iSockaddrLength) &&
-                  IPNumberMatchesPrefix(endpoint.address(),
-                                        network_endpoint.address(),
+                  IPNumberMatchesPrefix(endpoint.address().bytes(),
+                                        network_endpoint.address().bytes(),
                                         prefix->PrefixLength)) {
                 prefix_length =
                     std::max<size_t>(prefix_length, prefix->PrefixLength);
               }
             }
           }
 
           // If the duplicate address detection (DAD) state is not changed to
           // Preferred, skip this address.
           if (address->DadState != IpDadStatePreferred) {
@@ skipping 10 matching lines @@
           int ip_address_attributes = IP_ADDRESS_ATTRIBUTE_NONE;
           if (family == AF_INET6) {
             if (address->PrefixOrigin == IpPrefixOriginRouterAdvertisement &&
                 address->SuffixOrigin == IpSuffixOriginRandom) {
               ip_address_attributes |= IP_ADDRESS_ATTRIBUTE_TEMPORARY;
             }
             if (address->PreferredLifetime == 0) {
               ip_address_attributes |= IP_ADDRESS_ATTRIBUTE_DEPRECATED;
             }
           }
-          networks->push_back(NetworkInterface(
-              adapter->AdapterName,
-              base::SysWideToNativeMB(adapter->FriendlyName), index,
-              GetNetworkInterfaceType(adapter->IfType), endpoint.address(),
-              prefix_length, ip_address_attributes));
+          networks->push_back(
+              NetworkInterface(adapter->AdapterName,
+                               base::SysWideToNativeMB(adapter->FriendlyName),
+                               index, GetNetworkInterfaceType(adapter->IfType),
+                               endpoint.address().bytes(), prefix_length,
+                               ip_address_attributes));
         }
       }
     }
   }
   return true;
 }
 
 }  // namespace internal
 
 bool GetNetworkList(NetworkInterfaceList* networks, int policy) {
@@ skipping 106 matching lines @@
 
   if (!conn_info.get())
     return "";
 
   const DOT11_SSID dot11_ssid = conn_info->wlanAssociationAttributes.dot11Ssid;
   return std::string(reinterpret_cast<const char*>(dot11_ssid.ucSSID),
                      dot11_ssid.uSSIDLength);
 }
 
 }  // namespace net