combine_all,
contains,
contains_proper,
+ max_octet1,
+ max_octet2,
+ max_octet3,
+ max_octet4,
+ min_octet1,
+ min_octet2,
+ min_octet3,
+ min_octet4,
prop_all_cidrs_contain_themselves,
prop_contains_proper_intransitive
) where
import Test.HUnit
import Test.QuickCheck
+import qualified Bit as B
import IPv4Address
import ListUtils
import Maskable
equivalent Cidr.None _ = False
equivalent _ Cidr.None = False
equivalent (Cidr addr1 mbits1) (Cidr addr2 mbits2) =
- (mbits1 == mbits2) && ((apply_mask addr1 mbits1) == (apply_mask addr2 mbits2))
+ (mbits1 == mbits2) && ((apply_mask addr1 mbits1 B.Zero) == (apply_mask addr2 mbits2 B.Zero))
-- Returns the mask portion of a CIDR address. That is, everything
-- after the trailing slash.
+min_host :: Cidr -> IPv4Address
+min_host Cidr.None = IPv4Address.None
+min_host (Cidr IPv4Address.None _) = IPv4Address.None
+min_host (Cidr _ Maskbits.None) = IPv4Address.None
+min_host (Cidr addr mask) = apply_mask addr mask B.Zero
+
+
+max_host :: Cidr -> IPv4Address
+max_host Cidr.None = IPv4Address.None
+max_host (Cidr IPv4Address.None _) = IPv4Address.None
+max_host (Cidr _ Maskbits.None) = IPv4Address.None
+max_host (Cidr addr mask) = apply_mask addr mask B.One
+
+
+min_octet1 :: Cidr -> Octet
+min_octet1 cidr = octet1 (min_host cidr)
+
+min_octet2 :: Cidr -> Octet
+min_octet2 cidr = octet2 (min_host cidr)
+
+min_octet3 :: Cidr -> Octet
+min_octet3 cidr = octet3 (min_host cidr)
+
+min_octet4 :: Cidr -> Octet
+min_octet4 cidr = octet4 (min_host cidr)
+
+max_octet1 :: Cidr -> Octet
+max_octet1 cidr = octet1 (max_host cidr)
+
+max_octet2 :: Cidr -> Octet
+max_octet2 cidr = octet2 (max_host cidr)
+
+max_octet3 :: Cidr -> Octet
+max_octet3 cidr = octet3 (max_host cidr)
+
+max_octet4 :: Cidr -> Octet
+max_octet4 cidr = octet4 (max_host cidr)
+
+
+
-- Return true if the first argument (a CIDR range) contains the
-- second (another CIDR range). There are a lot of ways we can be fed
-- junk here. For lack of a better alternative, just return False when
| mbits1 > mbits2 = False
| otherwise = addr1masked == addr2masked
where
- addr1masked = apply_mask addr1 mbits1
- addr2masked = apply_mask addr2 mbits1
+ addr1masked = apply_mask addr1 mbits1 B.Zero
+ addr2masked = apply_mask addr2 mbits1 B.Zero
contains_proper :: Cidr -> Cidr -> Bool
test_combine_contained1 :: Test
test_combine_contained1 =
- TestCase $ assertEqual "10.0.0.0/8, 10.1.0.0/16, and 10.1.1.0/24 combine to 10.0.0.0/8" expected_cidrs (combine_all test_cidrs)
+ TestCase $ assertEqual "10.0.0.0/8, 10.1.0.0/16, and 10.1.1.0/24 combine to 10.0.0.0/8" expected_cidrs (combine_contained test_cidrs)
where
cidr1 = cidr_from_string "10.0.0.0/8"
cidr2 = cidr_from_string "10.1.0.0/16"
test_combine_contained2 :: Test
test_combine_contained2 =
- TestCase $ assertEqual "192.168.1.0/24 combines with itself" [cidr1] (combine_all [cidr1, cidr1])
+ TestCase $ assertEqual "192.168.3.0/23 does not contain 192.168.1.0/24" [cidr1, cidr2] (combine_contained [cidr1, cidr2])
where
- cidr1 = cidr_from_string "192.168.1.0/24"
+ cidr1 = cidr_from_string "192.168.3.0/23"
+ cidr2 = cidr_from_string "192.168.1.0/24"
+
+
+test_combine_all1 :: Test
+test_combine_all1 =
+ TestCase $ assertEqual "10.0.0.0/24 is adjacent to 10.0.1.0/24 and 10.0.3.0/23 contains 10.0.2.0/24" expected_cidrs (combine_all test_cidrs)
+ where
+ cidr1 = cidr_from_string "10.0.0.0/24"
+ cidr2 = cidr_from_string "10.0.1.0/24"
+ cidr3 = cidr_from_string "10.0.2.0/24"
+ cidr4 = cidr_from_string "10.0.3.0/23"
+ cidr5 = cidr_from_string "10.0.0.0/23"
+ expected_cidrs = [cidr4, cidr5]
+ test_cidrs = [cidr1, cidr2, cidr3, cidr4]
+
+
+test_combine_all2 :: Test
+test_combine_all2 =
+ TestCase $ assertEqual "127.0.0.1/32 combines with itself recursively" expected_cidrs (combine_all test_cidrs)
+ where
+ cidr1 = cidr_from_string "127.0.0.1/32"
+ expected_cidrs = [cidr1]
+ test_cidrs = [cidr1, cidr1, cidr1, cidr1, cidr1]
cidr_tests :: [Test]
test_adjacent3,
test_adjacent4,
test_combine_contained1,
- test_combine_contained2
+ test_combine_contained2,
+ test_combine_all1,
+ test_combine_all2
]