X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FCidr.hs;h=41ea9ee9a711b6af63c928419f77a7363fbaf20e;hb=d34688b75f995d99e112064225735921a8d4ee28;hp=06704fb5e37479b8bade2a9420a4b824cfeb60bc;hpb=75038b45b9c379d8313511e58c3c0fe680810883;p=hath.git diff --git a/src/Cidr.hs b/src/Cidr.hs index 06704fb..41ea9ee 100644 --- a/src/Cidr.hs +++ b/src/Cidr.hs @@ -87,10 +87,11 @@ cidr_from_string s -min_address :: Cidr -> IPv4Address -min_address (Cidr IPv4Address.None _) = IPv4Address.None -min_address (Cidr _ Maskbits.None) = IPv4Address.None -min_address (Cidr addr mask) +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 } @@ -137,41 +138,15 @@ min_address (Cidr addr mask) | mask == Nine = addr { octet2 = apply_mask oct2 One, octet3 = min_octet, octet4 = min_octet } - | mask == Eight = addr { octet2 = min_octet, - octet3 = min_octet, - octet4 = min_octet } - | mask == Seven = addr { octet1 = apply_mask oct1 Seven, - octet2 = min_octet, - octet3 = min_octet, - octet4 = min_octet } - | mask == Six = addr { octet1 = apply_mask oct1 Six, - octet2 = min_octet, - octet3 = min_octet, - octet4 = min_octet } - | mask == Five = addr { octet1 = apply_mask oct1 Five, - octet2 = min_octet, - octet3 = min_octet, - octet4 = min_octet } - | mask == Four = addr { octet1 = apply_mask oct1 Four, - octet2 = min_octet, - octet3 = min_octet, - octet4 = min_octet } - | mask == Three = addr { octet1 = apply_mask oct1 Three, - octet2 = min_octet, - octet3 = min_octet, - octet4 = min_octet } - | mask == Two = addr { octet1 = apply_mask oct1 Two, - octet2 = min_octet, - octet3 = min_octet, - octet4 = min_octet } - | mask == One = addr { octet1 = apply_mask oct1 One, - octet2 = min_octet, - octet3 = min_octet, - octet4 = min_octet } - | mask == Zero = addr { octet1 = min_octet, - octet2 = min_octet, - 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) @@ -181,19 +156,40 @@ min_address (Cidr addr mask) -max_address :: Cidr -> IPv4Address -max_address (Cidr IPv4Address.None _) = IPv4Address.None -max_address (Cidr _ Maskbits.None) = IPv4Address.None -max_address (Cidr addr mask) - | mask == ThirtyTwo = ipv4address_from_octets oct1 oct2 oct3 oct4 - | mask == ThirtyOne = ipv4address_from_octets oct1 oct2 oct3 (Octet a25 a26 a27 a28 a29 a30 a31 B.One) - | mask == Thirty = ipv4address_from_octets oct1 oct2 oct3 (Octet a25 a26 a27 a28 a29 a30 B.One B.One) - | mask == TwentyNine = ipv4address_from_octets oct1 oct2 oct3 (Octet a25 a26 a27 a28 a29 B.One B.One B.One) - | mask == TwentyEight = ipv4address_from_octets oct1 oct2 oct3 (Octet a25 a26 a27 a28 B.One B.One B.One B.One) - | mask == TwentySeven = ipv4address_from_octets oct1 oct2 oct3 (Octet a25 a26 a27 B.One B.One B.One B.One B.One) - | mask == TwentySix = ipv4address_from_octets oct1 oct2 oct3 (Octet a25 a26 B.One B.One B.One B.One B.One B.One) - | mask == TwentyFive = ipv4address_from_octets oct1 oct2 oct3 (Octet a25 B.One B.One B.One B.One B.One B.One B.One) - | mask == TwentyFour = ipv4address_from_octets oct1 oct2 oct3 (max_octet) +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) @@ -241,13 +237,6 @@ max_address (Cidr addr mask) a21 = (b5 oct3) a22 = (b6 oct3) a23 = (b7 oct3) - a25 = (b1 oct4) - a26 = (b2 oct4) - a27 = (b3 oct4) - a28 = (b4 oct4) - a29 = (b5 oct4) - a30 = (b6 oct4) - a31 = (b7 oct4) oct1 = (octet1 addr) oct2 = (octet2 addr) oct3 = (octet3 addr) @@ -256,28 +245,28 @@ max_address (Cidr addr mask) min_octet1 :: Cidr -> Octet -min_octet1 cidr = octet1 (min_address cidr) +min_octet1 cidr = octet1 (min_host cidr) min_octet2 :: Cidr -> Octet -min_octet2 cidr = octet2 (min_address cidr) +min_octet2 cidr = octet2 (min_host cidr) min_octet3 :: Cidr -> Octet -min_octet3 cidr = octet3 (min_address cidr) +min_octet3 cidr = octet3 (min_host cidr) min_octet4 :: Cidr -> Octet -min_octet4 cidr = octet4 (min_address cidr) +min_octet4 cidr = octet4 (min_host cidr) max_octet1 :: Cidr -> Octet -max_octet1 cidr = octet1 (max_address cidr) +max_octet1 cidr = octet1 (max_host cidr) max_octet2 :: Cidr -> Octet -max_octet2 cidr = octet2 (max_address cidr) +max_octet2 cidr = octet2 (max_host cidr) max_octet3 :: Cidr -> Octet -max_octet3 cidr = octet3 (max_address cidr) +max_octet3 cidr = octet3 (max_host cidr) max_octet4 :: Cidr -> Octet -max_octet4 cidr = octet4 (max_address cidr) +max_octet4 cidr = octet4 (max_host cidr)