Clean up - Use webrtc IPIsMacBased.

content/renderer/p2p/ipc_network_manager.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 "content/renderer/p2p/ipc_network_manager.h"
 #include <string>
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/sys_byteorder.h"
 #include "content/public/common/content_switches.h"
 #include "net/base/net_util.h"
 
 namespace content {
 
 namespace {
 
-// According to http://www.ietf.org/rfc/rfc2373.txt, Appendix A, page 19.  An
-// address which contains MAC will have its 11th and 12th bytes as FF:FE as well
-// as the U/L bit as 1.
-bool IsMacBasedIPv6Address(const net::IPAddressNumber& ipaddress) {
-  return ((ipaddress[8] & 0x02) && ipaddress[11] == 0xFF &&
-          ipaddress[12] == 0xFE);
-}
-
 rtc::AdapterType ConvertConnectionTypeToAdapterType(
     net::NetworkChangeNotifier::ConnectionType type) {
   switch (type) {
     case net::NetworkChangeNotifier::CONNECTION_UNKNOWN:
         return rtc::ADAPTER_TYPE_UNKNOWN;
     case net::NetworkChangeNotifier::CONNECTION_ETHERNET:
         return rtc::ADAPTER_TYPE_ETHERNET;
     case net::NetworkChangeNotifier::CONNECTION_WIFI:
         return rtc::ADAPTER_TYPE_WIFI;
     case net::NetworkChangeNotifier::CONNECTION_2G:
@@ skipping 53 matching lines @@
       memcpy(&address, &it->address[0], sizeof(uint32));
       address = rtc::NetworkToHost32(address);
       rtc::IPAddress prefix =
           rtc::TruncateIP(rtc::IPAddress(address), it->prefix_length);
       rtc::Network* network =
           new rtc::Network(it->name, it->name, prefix, it->prefix_length,
                            ConvertConnectionTypeToAdapterType(it->type));
       network->AddIP(rtc::IPAddress(address));
       networks.push_back(network);
     } else if (it->address.size() == net::kIPv6AddressSize) {
+      in6_addr address;
+      memcpy(&address, &it->address[0], sizeof(in6_addr));
+      rtc::InterfaceAddress ip6_addr(address, it->ip_address_attributes);
+
       // Only allow non-deprecated IPv6 addresses which don't contain MAC.
-      if (IsMacBasedIPv6Address(it->address) ||
+      if (rtc::IPIsMacBased(ip6_addr) ||
           (it->ip_address_attributes & net::IP_ADDRESS_ATTRIBUTE_DEPRECATED)) {
         continue;
       }
 
-      in6_addr address;
-      memcpy(&address, &it->address[0], sizeof(in6_addr));
-      rtc::InterfaceAddress ip6_addr(address, it->ip_address_attributes);
       if (!rtc::IPIsPrivate(ip6_addr)) {
         rtc::IPAddress prefix =
             rtc::TruncateIP(rtc::IPAddress(ip6_addr), it->prefix_length);
         rtc::Network* network =
             new rtc::Network(it->name, it->name, prefix, it->prefix_length,
                              ConvertConnectionTypeToAdapterType(it->type));
         network->AddIP(ip6_addr);
         networks.push_back(network);
       }
     }
@@ skipping 27 matching lines @@
                            stats.ipv4_network_count);
   UMA_HISTOGRAM_COUNTS_100("WebRTC.PeerConnection.IPv6Interfaces",
                            stats.ipv6_network_count);
 }
 
 void IpcNetworkManager::SendNetworksChangedSignal() {
   SignalNetworksChanged();
 }
 
 }  // namespace content