X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FIPv4Address.hs;h=e72dd592ee1c2f1ad8a3fe5dad6fe26fc43701b1;hb=9200fe5fcab505e5a331514a6ee687c6f78011b1;hp=f52a423a8ffc39894cfbdd01175cbc21fa4a24bb;hpb=75038b45b9c379d8313511e58c3c0fe680810883;p=hath.git

diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs
index f52a423..e72dd59 100644
--- a/src/IPv4Address.hs
+++ b/src/IPv4Address.hs
@@ -2,6 +2,8 @@ module IPv4Address
 ( ipv4address_from_octets,
   ipv4address_tests,
   IPv4Address(None),
+  max_address,
+  min_address,
   most_sig_bit_different,
   octet1,
   octet2,
@@ -44,46 +46,92 @@ instance Arbitrary IPv4Address where
       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)
+    apply_mask _ Maskbits.None _ = IPv4Address.None
+    apply_mask addr mask bit
+        | mask == ThirtyTwo = addr
+        | mask == ThirtyOne = addr { octet4 = (apply_mask oct4 Seven bit) }
+        | mask == Thirty = addr { octet4 = (apply_mask oct4 Six bit) }
+        | mask == TwentyNine = addr { octet4 = (apply_mask oct4 Five bit) }
+        | mask == TwentyEight = addr { octet4 = (apply_mask oct4 Four bit) }
+        | mask == TwentySeven = addr { octet4 = (apply_mask oct4 Three bit) }
+        | mask == TwentySix = addr { octet4 = (apply_mask oct4 Two bit) }
+        | mask == TwentyFive = addr { octet4 = (apply_mask oct4 One bit) }
+        | mask == TwentyFour = addr { octet4 = (apply_mask oct4 Zero bit) }
+        | mask == TwentyThree = addr { octet3 = (apply_mask oct3 Seven bit),
+                                       octet4 = (apply_mask oct4 Zero bit) }
+        | mask == TwentyTwo = addr { octet3 = (apply_mask oct3 Six bit),
+                                     octet4 = (apply_mask oct4 Zero bit) }
+        | mask == TwentyOne = addr { octet3 = (apply_mask oct3 Five bit),
+                                     octet4 = (apply_mask oct4 Zero bit) }
+        | mask == Twenty = addr { octet3 = (apply_mask oct3 Four bit),
+                                  octet4 = (apply_mask oct4 Zero bit) }
+        | mask == Nineteen = addr { octet3 = (apply_mask oct3 Three bit),
+                                    octet4 = (apply_mask oct4 Zero bit) }
+        | mask == Eighteen = addr { octet3 = (apply_mask oct3 Two bit),
+                                    octet4 = (apply_mask oct4 Zero bit) }
+        | mask == Seventeen = addr { octet3 = (apply_mask oct3 One bit),
+                                     octet4 = (apply_mask oct4 Zero bit) }
+        | mask == Sixteen = addr { octet3 = (apply_mask oct3 Zero bit),
+                                   octet4 = (apply_mask oct4 Zero bit) }
+        | mask == Fifteen = addr { octet2 = (apply_mask oct2 Seven bit),
+                                   octet3 = (apply_mask oct3 Zero bit),
+                                   octet4 = (apply_mask oct4 Zero bit) }
+        | mask == Fourteen = addr { octet2 = (apply_mask oct2 Six bit),
+                                    octet3 = (apply_mask oct3 Zero bit),
+                                    octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Thirteen = addr { octet2 = (apply_mask oct2 Five bit),
+                                    octet3 = (apply_mask oct3 Zero bit),
+                                    octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Twelve = addr { octet2 = (apply_mask oct2 Four bit),
+                                  octet3 = (apply_mask oct3 Zero bit),
+                                  octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Eleven = addr { octet2 = (apply_mask oct2 Three bit),
+                                  octet3 = (apply_mask oct3 Zero bit),
+                                  octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Ten = addr { octet2 = (apply_mask oct2 Two bit),
+                               octet3 = (apply_mask oct3 Zero bit),
+                               octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Nine = addr { octet2 = (apply_mask oct2 One bit),
+                                octet3 = (apply_mask oct3 Zero bit),
+                                octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Eight = addr { octet2 = (apply_mask oct2 Zero bit),
+                                 octet3 = (apply_mask oct3 Zero bit),
+                                 octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Seven = addr { octet1 = (apply_mask oct1 Seven bit),
+                                 octet2 = (apply_mask oct2 Zero bit),
+                                 octet3 = (apply_mask oct3 Zero bit),
+                                 octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Six = addr { octet1 = (apply_mask oct1 Six bit),
+                               octet2 = (apply_mask oct2 Zero bit),
+                               octet3 = (apply_mask oct3 Zero bit),
+                               octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Five = addr { octet1 = (apply_mask oct1 Five bit),
+                                octet2 = (apply_mask oct2 Zero bit),
+                                octet3 = (apply_mask oct3 Zero bit),
+                                octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Four = addr { octet1 = (apply_mask oct1 Four bit),
+                                octet2 = (apply_mask oct2 Zero bit),
+                                octet3 = (apply_mask oct3 Zero bit),
+                                octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Three = addr { octet1 = (apply_mask oct1 Three bit),
+                                 octet2 = (apply_mask oct2 Zero bit),
+                                 octet3 = (apply_mask oct3 Zero bit),
+                                 octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Two = addr { octet1 = (apply_mask oct1 Two bit),
+                               octet2 = (apply_mask oct2 Zero bit),
+                               octet3 = (apply_mask oct3 Zero bit),
+                               octet4 = (apply_mask oct4 Zero bit)}
+        | mask == One = addr { octet1 = (apply_mask oct1 One bit),
+                               octet2 = (apply_mask oct2 Zero bit),
+                               octet3 = (apply_mask oct3 Zero bit),
+                               octet4 = (apply_mask oct4 Zero bit)}
+        | mask == Zero = addr { octet1 = (apply_mask oct1 Zero bit),
+                                octet2 = (apply_mask oct2 Zero bit),
+                                octet3 = (apply_mask oct3 Zero bit),
+                                octet4 = (apply_mask oct4 Zero bit)}
         | otherwise = IPv4Address.None
         where
           oct1 = (octet1 addr)
@@ -105,6 +153,16 @@ ipv4address_from_octets oct1 oct2 oct3 oct4
     | otherwise = IPv4Address oct1 oct2 oct3 oct4
 
 
+-- The minimum possible IPv4 address, 0.0.0.0.
+min_address :: IPv4Address
+min_address = IPv4Address min_octet min_octet min_octet min_octet
+
+
+-- The maximum possible IPv4 address, 255.255.255.255.
+max_address :: IPv4Address
+max_address = IPv4Address max_octet max_octet max_octet max_octet
+
+
 -- Given two addresses, find the number of the most significant bit
 -- where they differ. If the addresses are the same, return
 -- Maskbits.Zero.