Add IP address handling to net::IsHostnameNonUnique

net/base/net_util.h

 // 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.
 
 #ifndef NET_BASE_NET_UTIL_H_
 #define NET_BASE_NET_UTIL_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 94 matching lines @@
     int* port);
 
 // Returns a host:port string for the given URL.
 NET_EXPORT std::string GetHostAndPort(const GURL& url);
 
 // Returns a host[:port] string for the given URL, where the port is omitted
 // if it is the default for the URL's scheme.
 NET_EXPORT_PRIVATE std::string GetHostAndOptionalPort(const GURL& url);
 
 // Returns true if |hostname| contains a non-registerable or non-assignable
-// domain name (eg: a gTLD that has not been assigned by IANA)
-//
-// TODO(rsleevi): http://crbug.com/119212 - Also match internal IP
-// address ranges.
+// domain name (eg: a gTLD that has not been assigned by IANA) or an IP address
+// that falls in an IANA-reserved range.
 NET_EXPORT bool IsHostnameNonUnique(const std::string& hostname);
 
+// Returns true if an IP address hostname is in a range reserved by the IANA.
+// Works with both IPv4 and IPv6 addresses, and only compares against a given
+// protocols's reserved ranges.
+NET_EXPORT bool IsIPAddressReserved(const IPAddressNumber& address);
+
 // Convenience struct for when you need a |struct sockaddr|.
 struct SockaddrStorage {
   SockaddrStorage() : addr_len(sizeof(addr_storage)),
                       addr(reinterpret_cast<struct sockaddr*>(&addr_storage)) {}
   struct sockaddr_storage addr_storage;
   socklen_t addr_len;
   struct sockaddr* const addr;
 };
 
 // Extracts the IP address and port portions of a sockaddr. |port| is optional,
@@ skipping 343 matching lines @@
 // IP address whose |prefix_length_in_bits| most significant bits match
 // |ip_prefix| will be matched.
 //
 // In cases when an IPv4 address is being compared to an IPv6 address prefix
 // and vice versa, the IPv4 addresses will be converted to IPv4-mapped
 // (IPv6) addresses.
 NET_EXPORT_PRIVATE bool IPNumberMatchesPrefix(const IPAddressNumber& ip_number,
                                               const IPAddressNumber& ip_prefix,
                                               size_t prefix_length_in_bits);
 
+// This is a helper method for IPNumberMatchesPrefix and IsIPAddressReserved.
+// The |ip_prefix| should be a vector or an array. The |prefix_length_in_bits|
+// should be a size_t, unsigned char, int, etc.
+NET_EXPORT_PRIVATE bool IPNumberPrefixCheck(

[Ryan Sleevi, 2013/08/12 21:11:51]

I'm still not sure I've understood why you've added this as NET_EXPORT_PRIVATE -
It's not used in any of the tests, nor is it needed outside of net_util.cc

Just sticking it within the unnamed namespace should be sufficient, right?

The comments describing ip_prefix and prefix_length_in_bits are out of date.

[felt, 2013/08/13 04:17:06]

removed it

+    const IPAddressNumber& ip_number,
+    const unsigned char* ip_prefix,
+    size_t prefix_length_in_bits);
+
 // Retuns the port field of the |sockaddr|.
 const uint16* GetPortFieldFromSockaddr(const struct sockaddr* address,
                                        socklen_t address_len);
 // Returns the value of port in |sockaddr| (in host byte ordering).
 NET_EXPORT_PRIVATE int GetPortFromSockaddr(const struct sockaddr* address,
                                            socklen_t address_len);
 
 // Returns true if |host| is one of the names (e.g. "localhost") or IP
 // addresses (IPv4 127.0.0.0/8 or IPv6 ::1) that indicate a loopback.
 //
@@ skipping 39 matching lines @@
   WIFI_PHY_LAYER_PROTOCOL_UNKNOWN
 };
 
 // Characterize the PHY mode of the currently associated access point.
 // Currently only available on OS_WIN.
 NET_EXPORT WifiPHYLayerProtocol GetWifiPHYLayerProtocol();
 
 }  // namespace net
 
 #endif  // NET_BASE_NET_UTIL_H_