Update IPAddress::IsReserved() ranges.

net/base/ip_address_unittest.cc

 // Copyright (c) 2015 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/ip_address.h"
 
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 59 matching lines @@
   uint8_t addr3[5] = {0xFE, 0xDC, 0xBA, 0x98};
   IPAddress ip_address3(addr3);
   EXPECT_FALSE(ip_address3.IsValid());
   EXPECT_FALSE(ip_address3.empty());
 
   IPAddress ip_address4;
   EXPECT_FALSE(ip_address4.IsValid());
   EXPECT_TRUE(ip_address4.empty());
 }
 
-TEST(IPAddressTest, IsReserved) {
+enum IPAddressReservedResult : bool { UNRESERVED = false, RESERVED = true };

[eroman, 2016/04/18 22:52:39]

nit: How about NOT_RESERVED rather than "UNRESERVED" ?

[martijnc, 2016/04/19 18:30:42]

Done.

+
+// Tests for the reserved IPv4 ranges and the (unreserved) blocks in between.
+// The reserved ranges are tested by checking the first and last address of each
+// range. The unreserved blocks are tested similarly. These tests cover the
+// entire IPv4 address range.
+TEST(IPAddressTest, IsReserved_IPv4) {

[eroman, 2016/04/18 22:52:39]

nit: Remove the underscore (_) from the name.

*Technically* GTEST names should not have underscores [1]

We get it wrong in other code, and honestly underscores are hard to cause
problems, but may as well just remove it :)

[1]
https://github.com/google/googletest/blob/master/googletest/docs/Primer.md#si...

[martijnc, 2016/04/19 18:30:42]

Oh, didn't know that, thanks. Removed.

   struct {
     const char* const address;
-    bool is_reserved;
-  } tests[] = {{"10.10.10.10", true},
-               {"9.9.255.255", false},
-               {"127.0.0.1", true},
-               {"128.0.0.1", false},
-               {"198.18.0.0", true},
-               {"198.18.255.255", true},
-               {"198.17.255.255", false},
-               {"198.19.255.255", true},
-               {"198.20.0.0", false},
-               {"0000::", true},
-               {"FFC0:ba98:7654:3210:FEDC:BA98:7654:3210", false},
-               {"2000:ba98:7654:2301:EFCD:BA98:7654:3210", false},
-               {"::192.9.5.5", true},
-               {"FEED::BEEF", true}};
+    IPAddressReservedResult is_reserved;
+  } tests[] = {// 0.0.0.0/8
+               {"0.0.0.0", RESERVED},
+               {"0.255.255.255", RESERVED},
+               // Unreserved block(s)
+               {"1.0.0.0", UNRESERVED},
+               {"9.255.255.255", UNRESERVED},
+               // 10.0.0.0/8
+               {"10.0.0.0", RESERVED},
+               {"10.255.255.255", RESERVED},
+               // Unreserved block(s)
+               {"11.0.0.0", UNRESERVED},
+               {"100.63.255.255", UNRESERVED},
+               // 100.64.0.0/10
+               {"100.64.0.0", RESERVED},
+               {"100.127.255.255", RESERVED},
+               // Unreserved block(s)
+               {"100.128.0.0", UNRESERVED},
+               {"126.255.255.255", UNRESERVED},
+               // 127.0.0.0/8
+               {"127.0.0.0", RESERVED},
+               {"127.255.255.255", RESERVED},
+               // Unreserved block(s)
+               {"128.0.0.0", UNRESERVED},
+               {"169.253.255.255", UNRESERVED},
+               // 169.254.0.0/16
+               {"169.254.0.0", RESERVED},
+               {"169.254.255.255", RESERVED},
+               // Unreserved block(s)
+               {"169.255.0.0", UNRESERVED},
+               {"172.15.255.255", UNRESERVED},
+               // 172.16.0.0/12
+               {"172.16.0.0", RESERVED},
+               {"172.31.255.255", RESERVED},
+               // Unreserved block(s)
+               {"172.32.0.0", UNRESERVED},
+               {"191.255.255.255", UNRESERVED},
+               // 192.0.0.0/24 (including sub ranges)
+               {"192.0.0.0", UNRESERVED},
+               {"192.0.0.255", UNRESERVED},
+               // Unreserved block(s)
+               {"192.0.1.0", UNRESERVED},
+               {"192.0.1.255", UNRESERVED},
+               // 192.0.2.0/24
+               {"192.0.2.0", RESERVED},
+               {"192.0.2.255", RESERVED},
+               // Unreserved block(s)
+               {"192.0.3.0", UNRESERVED},
+               {"192.31.195.255", UNRESERVED},
+               // 192.31.196.0/24
+               {"192.31.196.0", UNRESERVED},
+               {"192.31.196.255", UNRESERVED},
+               // Unreserved block(s)
+               {"192.32.197.0", UNRESERVED},
+               {"192.52.192.255", UNRESERVED},
+               // 192.52.193.0/24
+               {"192.52.193.0", UNRESERVED},
+               {"192.52.193.255", UNRESERVED},
+               // Unreserved block(s)
+               {"192.52.194.0", UNRESERVED},
+               {"192.88.98.255", UNRESERVED},
+               // 192.88.99.0/24
+               {"192.88.99.0", RESERVED},
+               {"192.88.99.255", RESERVED},
+               // Unreserved block(s)
+               {"192.88.100.0", UNRESERVED},
+               {"192.167.255.255", UNRESERVED},
+               // 192.168.0.0/16
+               {"192.168.0.0", RESERVED},
+               {"192.168.255.255", RESERVED},
+               // Unreserved block(s)
+               {"192.169.0.0", UNRESERVED},
+               {"192.175.47.255", UNRESERVED},
+               // 192.175.48.0/24
+               {"192.175.48.0", UNRESERVED},
+               {"192.175.48.255", UNRESERVED},
+               // Unreserved block(s)
+               {"192.175.49.0", UNRESERVED},
+               {"198.17.255.255", UNRESERVED},
+               // 198.18.0.0/15
+               {"198.18.0.0", RESERVED},
+               {"198.19.255.255", RESERVED},
+               // Unreserved block(s)
+               {"198.20.0.0", UNRESERVED},
+               {"198.51.99.255", UNRESERVED},
+               // 198.51.100.0/24
+               {"198.51.100.0", RESERVED},
+               {"198.51.100.255", RESERVED},
+               // Unreserved block(s)
+               {"198.51.101.0", UNRESERVED},
+               {"203.0.112.255", UNRESERVED},
+               // 203.0.113.0/24
+               {"203.0.113.0", RESERVED},
+               {"203.0.113.255", RESERVED},
+               // Unreserved block(s)
+               {"203.0.114.0", UNRESERVED},
+               {"223.255.255.255", UNRESERVED},
+               // 224.0.0.0/8 - 255.0.0.0/8
+               {"224.0.0.0", RESERVED},
+               {"255.255.255.255", RESERVED}};
 
   IPAddress address;
   for (const auto& test : tests) {
     EXPECT_TRUE(address.AssignFromIPLiteral(test.address));
-    EXPECT_EQ(test.is_reserved, address.IsReserved());
+    EXPECT_EQ(!!test.is_reserved, address.IsReserved());
   }
 }
 
+// Tests for the reserved IPv6 ranges and the (unreserved) blocks in between.
+// The reserved ranges are tested by checking the first and last address of each
+// range. The unreserved blocks are tested similarly. These tests cover the
+// entire IPv6 address range.
+TEST(IPAddressTest, IsReserved_IPv6) {
+  struct {
+    const char* const address;
+    IPAddressReservedResult is_reserved;
+  } tests[] = {// 0000::/8
+               {"0:0:0:0:0:0:0:0", RESERVED},
+               {"ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // 0100::/8
+               {"100:0:0:0:0:0:0:0", RESERVED},
+               {"1ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // 0200::/7
+               {"200:0:0:0:0:0:0:0", RESERVED},
+               {"3ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // 0400::/6
+               {"400:0:0:0:0:0:0:0", RESERVED},
+               {"7ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // 0800::/5
+               {"800:0:0:0:0:0:0:0", RESERVED},
+               {"fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // 1000::/4
+               {"1000:0:0:0:0:0:0:0", RESERVED},
+               {"1fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // 2000::/3 (Global Unicast)
+               {"2000:0:0:0:0:0:0:0", UNRESERVED},
+               {"3fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", UNRESERVED},
+               // 4000::/3
+               {"4000:0:0:0:0:0:0:0", RESERVED},
+               {"5fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // 6000::/3
+               {"6000:0:0:0:0:0:0:0", RESERVED},
+               {"7fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // 8000::/3
+               {"8000:0:0:0:0:0:0:0", RESERVED},
+               {"9fff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // c000::/3
+               {"c000:0:0:0:0:0:0:0", RESERVED},
+               {"dfff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // e000::/4
+               {"e000:0:0:0:0:0:0:0", RESERVED},
+               {"efff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // f000::/5
+               {"f000:0:0:0:0:0:0:0", RESERVED},
+               {"f7ff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // f800::/6
+               {"f800:0:0:0:0:0:0:0", RESERVED},
+               {"fbff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // fc00::/7
+               {"fc00:0:0:0:0:0:0:0", RESERVED},
+               {"fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // fe00::/9
+               {"fe00:0:0:0:0:0:0:0", RESERVED},
+               {"fe7f:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // fe80::/10
+               {"fe80:0:0:0:0:0:0:0", RESERVED},
+               {"febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // fec0::/10
+               {"fec0:0:0:0:0:0:0:0", RESERVED},
+               {"feff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", RESERVED},
+               // ff00::/8 (Multicast)
+               {"ff00:0:0:0:0:0:0:0", UNRESERVED},
+               {"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", UNRESERVED}};
+
+  IPAddress address;
+  for (const auto& test : tests) {
+    EXPECT_TRUE(address.AssignFromIPLiteral(test.address));
+    EXPECT_EQ(!!test.is_reserved, address.IsReserved());
+  }
+}
+
 TEST(IPAddressTest, IsZero) {
   uint8_t address1[4] = {};
   IPAddress zero_ipv4_address(address1);
   EXPECT_TRUE(zero_ipv4_address.IsZero());
 
   uint8_t address2[4] = {10};
   IPAddress non_zero_ipv4_address(address2);
   EXPECT_FALSE(non_zero_ipv4_address.IsZero());
 
   uint8_t address3[16] = {};
@@ skipping 313 matching lines @@
 
   // Prefix is longer than the address.
   uint8_t ipv6_prefix5[] = {42, 0, 20, 80, 64, 12, 12, 9, 0,
                             0,  0, 0,  0,  0,  0,  0,  10};
   EXPECT_FALSE(IPAddressStartsWith(ipv6_address, ipv6_prefix5));
 }
 
 }  // anonymous namespace
 
 }  // namespace net