X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FIPv4Address.hs;h=ca6f3d331c243948e4e0567a5f57900fa76b2396;hb=4520812e6f264cdeba984d180f20a8f8c6b6d645;hp=31ad7bd43965a56f7d243ab932ddbb4dc79dac33;hpb=ee9a99cf60149744ffe85e794c60724256b8fec5;p=hath.git diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs index 31ad7bd..ca6f3d3 100644 --- a/src/IPv4Address.hs +++ b/src/IPv4Address.hs @@ -1,5 +1,6 @@ module IPv4Address ( ipv4address_from_octets, + ipv4address_tests, IPv4Address(None), max_octet1, max_octet2, @@ -14,10 +15,13 @@ module IPv4Address octet2, octet3, octet4 -) - where +) where + +import Test.HUnit +import Test.QuickCheck import qualified Bit as B +import Maskable import Maskbits import Octet @@ -41,6 +45,62 @@ instance Show IPv4Address where oct4 = (octet4 addr) +instance Arbitrary IPv4Address where + arbitrary = do + oct1 <- arbitrary :: Gen Octet + oct2 <- arbitrary :: Gen Octet + oct3 <- arbitrary :: Gen Octet + oct4 <- arbitrary :: Gen Octet + return (IPv4Address oct1 oct2 oct3 oct4) + + coarbitrary _ = variant 0 + + + +instance Maskable IPv4Address where + apply_mask _ Maskbits.None = IPv4Address.None + apply_mask addr mask + | mask == ThirtyTwo = ipv4address_from_octets oct1 oct2 oct3 oct4 + | mask == ThirtyOne = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Seven) + | mask == Thirty = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Six) + | mask == TwentyNine = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Five) + | mask == TwentyEight = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Four) + | mask == TwentySeven = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Three) + | mask == TwentySix = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 Two) + | mask == TwentyFive = ipv4address_from_octets oct1 oct2 oct3 (apply_mask oct4 One) + | mask == TwentyFour = ipv4address_from_octets oct1 oct2 oct3 (min_octet) + | mask == TwentyThree = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Seven) (min_octet) + | mask == TwentyTwo = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Six) (min_octet) + | mask == TwentyOne = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Five) (min_octet) + | mask == Twenty = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Four) (min_octet) + | mask == Nineteen = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Three) (min_octet) + | mask == Eighteen = ipv4address_from_octets oct1 oct2 (apply_mask oct3 Two) (min_octet) + | mask == Seventeen = ipv4address_from_octets oct1 oct2 (apply_mask oct3 One) (min_octet) + | mask == Sixteen = ipv4address_from_octets oct1 oct2 (min_octet) (min_octet) + | mask == Fifteen = ipv4address_from_octets oct1 (apply_mask oct2 Seven) (min_octet) (min_octet) + | mask == Fourteen = ipv4address_from_octets oct1 (apply_mask oct2 Six) (min_octet) (min_octet) + | mask == Thirteen = ipv4address_from_octets oct1 (apply_mask oct2 Five) (min_octet) (min_octet) + | mask == Twelve = ipv4address_from_octets oct1 (apply_mask oct2 Four) (min_octet) (min_octet) + | mask == Eleven = ipv4address_from_octets oct1 (apply_mask oct2 Three) (min_octet) (min_octet) + | mask == Ten = ipv4address_from_octets oct1 (apply_mask oct2 Two) (min_octet) (min_octet) + | mask == Nine = ipv4address_from_octets oct1 (apply_mask oct2 One) (min_octet) (min_octet) + | mask == Eight = ipv4address_from_octets oct1 (min_octet) (min_octet) (min_octet) + | mask == Seven = ipv4address_from_octets (apply_mask oct1 Seven) (min_octet) (min_octet) (min_octet) + | mask == Six = ipv4address_from_octets (apply_mask oct1 Six) (min_octet) (min_octet) (min_octet) + | mask == Five = ipv4address_from_octets (apply_mask oct1 Five) (min_octet) (min_octet) (min_octet) + | mask == Four = ipv4address_from_octets (apply_mask oct1 Four) (min_octet) (min_octet) (min_octet) + | mask == Three = ipv4address_from_octets (apply_mask oct1 Three) (min_octet) (min_octet) (min_octet) + | mask == Two = ipv4address_from_octets (apply_mask oct1 Two) (min_octet) (min_octet) (min_octet) + | mask == One = ipv4address_from_octets (apply_mask oct1 One) (min_octet) (min_octet) (min_octet) + | mask == Zero = ipv4address_from_octets (min_octet) (min_octet) (min_octet) (min_octet) + | otherwise = IPv4Address.None + where + oct1 = (octet1 addr) + oct2 = (octet2 addr) + oct3 = (octet3 addr) + oct4 = (octet4 addr) + + -- We don't export our constructor so this function is the only -- way to construct an address from octets. As a result, we can -- return IPv4Address.None in response to being passed one of more @@ -339,3 +399,30 @@ most_sig_bit_different addr1 addr2 oct2b = (octet2 addr2) oct3b = (octet3 addr2) oct4b = (octet4 addr2) + + + +-- HUnit Tests +mk_testaddr :: Int -> Int -> Int -> Int -> IPv4Address +mk_testaddr a b c d = + IPv4Address oct1 oct2 oct3 oct4 + where + oct1 = octet_from_int a + oct2 = octet_from_int b + oct3 = octet_from_int c + oct4 = octet_from_int d + + +test_most_sig_bit_different1 :: Test +test_most_sig_bit_different1 = + TestCase $ assertEqual "10.1.1.0 and 10.1.0.0 differ in bit 24" TwentyFour (most_sig_bit_different (mk_testaddr 10 1 1 0) (mk_testaddr 10 1 0 0)) + + +test_most_sig_bit_different2 :: Test +test_most_sig_bit_different2 = + TestCase $ assertEqual "10.1.2.0 and 10.1.1.0 differ in bit 23" TwentyThree (most_sig_bit_different (mk_testaddr 10 1 2 0) (mk_testaddr 10 1 1 0)) + + +ipv4address_tests :: [Test] +ipv4address_tests = [ test_most_sig_bit_different1, + test_most_sig_bit_different2 ]