X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FCidr.hs;h=b5dc9d2b8022de1fdf89e01bea4ebc3644c3f137;hb=6477e5a14e0fbd02750cf87dc21900525f63452f;hp=41ea9ee9a711b6af63c928419f77a7363fbaf20e;hpb=d34688b75f995d99e112064225735921a8d4ee28;p=hath.git diff --git a/src/Cidr.hs b/src/Cidr.hs index 41ea9ee..b5dc9d2 100644 --- a/src/Cidr.hs +++ b/src/Cidr.hs @@ -31,7 +31,7 @@ import Octet data Cidr = None | Cidr { ipv4address :: IPv4Address, maskbits :: Maskbits } - deriving (Eq) + instance Show Cidr where @@ -47,6 +47,9 @@ instance Arbitrary Cidr where coarbitrary _ = variant 0 +instance Eq Cidr where + cidr1 == cidr2 = (cidr1 `equivalent` cidr2) + -- Two CIDR ranges are equivalent if they have the same network bits -- and the masks are the same. @@ -55,13 +58,16 @@ equivalent Cidr.None Cidr.None = True 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. maskbits_from_cidr_string :: String -> Maskbits -maskbits_from_cidr_string s = - maskbits_from_string ((splitWith (`elem` "/") s) !! 1) +maskbits_from_cidr_string s + | length partlist == 2 = maskbits_from_string (partlist !! 1) + | otherwise = Maskbits.None + where + partlist = (splitWith (`elem` "/") s) -- Takes an IP address String in CIDR notation, and returns a list of @@ -91,157 +97,14 @@ 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) - | mask == ThirtyTwo = addr - | mask == ThirtyOne = addr { octet4 = apply_mask oct4 Seven } - | mask == Thirty = addr { octet4 = apply_mask oct4 Six } - | mask == TwentyNine = addr { octet4 = apply_mask oct4 Five } - | mask == TwentyEight = addr { octet4 = apply_mask oct4 Four } - | mask == TwentySeven = addr { octet4 = apply_mask oct4 Three } - | mask == TwentySix = addr { octet4 = apply_mask oct4 Two } - | mask == TwentyFive = addr { octet4 = apply_mask oct4 One } - | mask == TwentyFour = addr { octet4 = min_octet } - | mask == TwentyThree = addr { octet3 = apply_mask oct3 Seven, - octet4 = min_octet } - | mask == TwentyTwo = addr { octet3 = apply_mask oct3 Six, - octet4 = min_octet } - | mask == TwentyOne = addr { octet3 = apply_mask oct3 Five, - octet4 = min_octet } - | mask == Twenty = addr { octet3 = apply_mask oct3 Four, - octet4 = min_octet } - | mask == Nineteen = addr { octet3 = apply_mask oct3 Three, - octet4 = min_octet } - | mask == Eighteen = addr { octet3 = apply_mask oct3 Two, - octet4 = min_octet } - | mask == Seventeen = addr { octet3 = apply_mask oct3 One, - octet4 = min_octet } - | mask == Sixteen = addr { octet3 = min_octet, - octet4 = min_octet } - | mask == Fifteen = addr { octet2 = apply_mask oct2 Seven, - octet3 = min_octet, - octet4 = min_octet } - | mask == Fourteen = addr { octet2 = apply_mask oct2 Six, - octet3 = min_octet, - octet4 = min_octet } - | mask == Thirteen = addr { octet2 = apply_mask oct2 Five, - octet3 = min_octet, - octet4 = min_octet } - | mask == Twelve = addr { octet2 = apply_mask oct2 Four, - octet3 = min_octet, - octet4 = min_octet } - | mask == Eleven = addr { octet2 = apply_mask oct2 Three, - octet3 = min_octet, - octet4 = min_octet } - | mask == Ten = addr { octet2 = apply_mask oct2 Two, - octet3 = min_octet, - octet4 = min_octet } - | mask == Nine = addr { octet2 = apply_mask oct2 One, - octet3 = min_octet, - octet4 = min_octet } - | mask == Eight = min_address { octet1 = oct1 } - | mask == Seven = min_address { octet1 = apply_mask oct1 Seven } - | mask == Six = min_address { octet1 = apply_mask oct1 Six } - | mask == Five = min_address { octet1 = apply_mask oct1 Five } - | mask == Four = min_address { octet1 = apply_mask oct1 Four } - | mask == Three = min_address { octet1 = apply_mask oct1 Three } - | mask == Two = min_address { octet1 = apply_mask oct1 Two } - | mask == One = min_address { octet1 = apply_mask oct1 One } - | mask == Zero = min_address - | otherwise = addr - where - oct1 = (octet1 addr) - oct2 = (octet2 addr) - oct3 = (octet3 addr) - oct4 = (octet4 addr) - +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) - | mask == ThirtyTwo = addr - | mask == ThirtyOne = addr { octet4 = oct4 { b8 = B.One } } - | mask == Thirty = addr { octet4 = oct4 { b7 = B.One, b8 = B.One } } - | mask == TwentyNine = addr { octet4 = oct4 { b6 = B.One, - b7 = B.One, - b8 = B.One } } - | mask == TwentyEight = addr { octet4 = oct4 { b5 = B.One, - b6 = B.One, - b7 = B.One, - b8 = B.One } } - | mask == TwentySeven = addr { octet4 = oct4 { b4 = B.One, - b5 = B.One, - b6 = B.One, - b7 = B.One, - b8 = B.One } } - | mask == TwentySix = addr { octet4 = oct4 { b3 = B.One, - b4 = B.One, - b5 = B.One, - b6 = B.One, - b7 = B.One, - b8 = B.One } } - | mask == TwentyFive = addr { octet4 = oct4 { b2 = B.One, - b3 = B.One, - b4 = B.One, - b5 = B.One, - b6 = B.One, - b7 = B.One, - b8 = B.One } } - | mask == TwentyFour = addr { octet4 = max_octet } - | mask == TwentyThree = ipv4address_from_octets oct1 oct2 (Octet a17 a18 a19 a20 a21 a22 a23 B.One) (max_octet) - | mask == TwentyTwo = ipv4address_from_octets oct1 oct2 (Octet a17 a18 a19 a20 a21 a22 B.One B.One) (max_octet) - | mask == TwentyOne = ipv4address_from_octets oct1 oct2 (Octet a17 a18 a19 a20 a21 B.One B.One B.One) (max_octet) - | mask == Twenty = ipv4address_from_octets oct1 oct2 (Octet a17 a18 a19 a20 B.One B.One B.One B.One) (max_octet) - | mask == Nineteen = ipv4address_from_octets oct1 oct2 (Octet a17 a18 a19 B.One B.One B.One B.One B.One) (max_octet) - | mask == Eighteen = ipv4address_from_octets oct1 oct2 (Octet a17 a18 B.One B.One B.One B.One B.One B.One) (max_octet) - | mask == Seventeen = ipv4address_from_octets oct1 oct2 (Octet a17 B.One B.One B.One B.One B.One B.One B.One) (max_octet) - | mask == Sixteen = ipv4address_from_octets oct1 oct2 (max_octet) (max_octet) - | mask == Fifteen = ipv4address_from_octets oct1 (Octet a9 a10 a11 a12 a13 a14 a15 B.One) (max_octet) (max_octet) - | mask == Fourteen = ipv4address_from_octets oct1 (Octet a9 a10 a11 a12 a13 a14 B.One B.One) (max_octet) (max_octet) - | mask == Thirteen = ipv4address_from_octets oct1 (Octet a9 a10 a11 a12 a13 B.One B.One B.One) (max_octet) (max_octet) - | mask == Twelve = ipv4address_from_octets oct1 (Octet a9 a10 a11 a12 B.One B.One B.One B.One) (max_octet) (max_octet) - | mask == Eleven = ipv4address_from_octets oct1 (Octet a9 a10 a11 B.One B.One B.One B.One B.One) (max_octet) (max_octet) - | mask == Ten = ipv4address_from_octets oct1 (Octet a9 a10 B.One B.One B.One B.One B.One B.One) (max_octet) (max_octet) - | mask == Nine = ipv4address_from_octets oct1 (Octet a9 B.One B.One B.One B.One B.One B.One B.One) (max_octet) (max_octet) - | mask == Eight = ipv4address_from_octets oct1 (max_octet) (max_octet) (max_octet) - | mask == Seven = ipv4address_from_octets (Octet a1 a2 a3 a4 a5 a6 a7 B.One) (max_octet) (max_octet) (max_octet) - | mask == Six = ipv4address_from_octets (Octet a1 a2 a3 a4 a5 a6 B.One B.One) (max_octet) (max_octet) (max_octet) - | mask == Five = ipv4address_from_octets (Octet a1 a2 a3 a4 a5 B.One B.One B.One) (max_octet) (max_octet) (max_octet) - | mask == Four = ipv4address_from_octets (Octet a1 a2 a3 a4 B.One B.One B.One B.One) (max_octet) (max_octet) (max_octet) - | mask == Three = ipv4address_from_octets (Octet a1 a2 a3 B.One B.One B.One B.One B.One) (max_octet) (max_octet) (max_octet) - | mask == Two = ipv4address_from_octets (Octet a1 a2 B.One B.One B.One B.One B.One B.One) (max_octet) (max_octet) (max_octet) - | mask == One = ipv4address_from_octets (Octet a1 B.One B.One B.One B.One B.One B.One B.One) (max_octet) (max_octet) (max_octet) - | mask == Zero = ipv4address_from_octets (max_octet) (max_octet) (max_octet) (max_octet) - | otherwise = addr - where - a1 = (b1 oct1) - a2 = (b2 oct1) - a3 = (b3 oct1) - a4 = (b4 oct1) - a5 = (b5 oct1) - a6 = (b6 oct1) - a7 = (b7 oct1) - a9 = (b1 oct2) - a10 = (b2 oct2) - a11 = (b3 oct2) - a12 = (b4 oct2) - a13 = (b5 oct2) - a14 = (b6 oct2) - a15 = (b7 oct2) - a17 = (b1 oct3) - a18 = (b2 oct3) - a19 = (b3 oct3) - a20 = (b4 oct3) - a21 = (b5 oct3) - a22 = (b6 oct3) - a23 = (b7 oct3) - oct1 = (octet1 addr) - oct2 = (octet2 addr) - oct3 = (octet3 addr) - oct4 = (octet4 addr) - +max_host (Cidr addr mask) = apply_mask addr mask B.One min_octet1 :: Cidr -> Octet @@ -313,8 +176,8 @@ contains (Cidr addr1 mbits1) (Cidr addr2 mbits2) | 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 @@ -334,9 +197,15 @@ redundant cidrlist cidr = any ((flip contains_proper) cidr) cidrlist -- adjacent Cidrs are combined into a larger one, they will be removed -- in the second step since the larger Cidr must contain the smaller -- two. +-- +-- Once this is done, we see whether or not the result is different +-- than the argument that was passed in. If nothing changed, we're +-- done and return the list that was passed to us. However, if +-- something changed, we recurse and try to combine the list again. combine_all :: [Cidr] -> [Cidr] -combine_all cidrs = - combine_contained unique_cidrs +combine_all cidrs + | cidrs == (combine_contained unique_cidrs) = cidrs + | otherwise = combine_all (combine_contained unique_cidrs) where unique_cidrs = nubBy equivalent valid_cidr_combinations valid_cidr_combinations = filter (/= Cidr.None) cidr_combinations @@ -385,6 +254,22 @@ adjacent cidr1 cidr2 -- HUnit Tests +test_min_host1 :: Test +test_min_host1 = + TestCase $ assertEqual "The minimum host in 10.0.0.0/24 is 10.0.0.0" expected actual + where + actual = show $ min_host (cidr_from_string "10.0.0.0/24") + expected = "10.0.0.0" + + +test_max_host1 :: Test +test_max_host1 = + TestCase $ assertEqual "The maximum host in 10.0.0.0/24 is 10.0.0.255" expected actual + where + actual = show $ max_host (cidr_from_string "10.0.0.0/24") + expected = "10.0.0.255" + + test_equality1 :: Test test_equality1 = TestCase $ assertEqual "10.1.1.0/23 equals itself" True (cidr1 == cidr1) @@ -482,8 +367,8 @@ test_combine_all1 = 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] + expected_cidrs = [cidr_from_string "10.0.0.0/22"] + test_cidrs = [cidr1, cidr2, cidr3, cidr4, cidr5] test_combine_all2 :: Test @@ -495,8 +380,22 @@ test_combine_all2 = test_cidrs = [cidr1, cidr1, cidr1, cidr1, cidr1] +test_combine_all3 :: Test +test_combine_all3 = + TestCase $ assertEqual "10.0.0.16, 10.0.0.17, 10.0.0.18, and 10.0.0.19 get combined into 10.0.0.16/30" expected_cidrs (combine_all test_cidrs) + where + cidr1 = cidr_from_string "10.0.0.16/32" + cidr2 = cidr_from_string "10.0.0.17/32" + cidr3 = cidr_from_string "10.0.0.18/32" + cidr4 = cidr_from_string "10.0.0.19/32" + expected_cidrs = [cidr_from_string "10.0.0.16/30"] + test_cidrs = [cidr1, cidr2, cidr3, cidr4] + + cidr_tests :: [Test] -cidr_tests = [ test_equality1, +cidr_tests = [ test_min_host1, + test_max_host1, + test_equality1, test_contains1, test_contains2, test_contains_proper1, @@ -508,7 +407,8 @@ cidr_tests = [ test_equality1, test_combine_contained1, test_combine_contained2, test_combine_all1, - test_combine_all2 + test_combine_all2, + test_combine_all3 ]