X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FIPv4Address.hs;h=55602aa8a9616197d6ecf038e6b071eec87e79d3;hb=6257f1c59c5c9663f8d95996c1c35362417def71;hp=8c5d4837853cb3511f59c38049d98d29e5d144fb;hpb=df31e221bd5df65c8d6d506fa84f84639f964d97;p=hath.git

diff --git a/src/IPv4Address.hs b/src/IPv4Address.hs
index 8c5d483..55602aa 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,
@@ -9,12 +10,15 @@ module IPv4Address
   min_octet2,
   min_octet3,
   min_octet4,
+  most_sig_bit_different,
   octet1,
   octet2,
   octet3,
   octet4
-)
-  where
+) where
+
+import Test.HUnit
+import Test.QuickCheck
 
 import qualified Bit as B
 import Maskbits
@@ -24,7 +28,32 @@ data IPv4Address = None | IPv4Address { octet1 :: Octet,
                                         octet2 :: Octet,
                                         octet3 :: Octet,
                                         octet4 :: Octet }
-                 deriving (Eq, Show)
+                 deriving (Eq)
+
+
+instance Show IPv4Address where
+    show IPv4Address.None = "None"
+    show addr = concat [(show oct1) ++ ".",
+                        (show oct2) ++ ".",
+                        (show oct3) ++ ".",
+                        (show oct4)]
+        where
+          oct1 = (octet1 addr)
+          oct2 = (octet2 addr)
+          oct3 = (octet3 addr)
+          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
+
 
 
 -- We don't export our constructor so this function is the only
@@ -211,3 +240,144 @@ max_octet3 addr mask = octet3 (max_address addr mask)
 
 max_octet4 :: IPv4Address -> Maskbits -> Octet
 max_octet4 addr mask = octet4 (max_address addr mask)
+
+
+-- Given two addresses, find the number of the most significant bit
+-- where they differ. If the addresses are the same, return
+-- Maskbits.Zero.
+most_sig_bit_different :: IPv4Address -> IPv4Address -> Maskbits
+most_sig_bit_different addr1 addr2
+  | addr1 == addr2 = Maskbits.Zero
+  | m1  /= n1  = Maskbits.One
+  | m2  /= n2  = Two
+  | m3  /= n3  = Three
+  | m4  /= n4  = Four
+  | m5  /= n5  = Five
+  | m6  /= n6  = Six
+  | m7  /= n7  = Seven
+  | m8  /= n8  = Eight
+  | m9  /= n9  = Nine
+  | m10 /= n10 = Ten
+  | m11 /= n11 = Eleven
+  | m12 /= n12 = Twelve
+  | m13 /= n13 = Thirteen
+  | m14 /= n14 = Fourteen
+  | m15 /= n15 = Fifteen
+  | m16 /= n16 = Sixteen
+  | m17 /= n17 = Seventeen
+  | m18 /= n18 = Eighteen
+  | m19 /= n19 = Nineteen
+  | m20 /= n20 = Twenty
+  | m21 /= n21 = TwentyOne
+  | m22 /= n22 = TwentyTwo
+  | m23 /= n23 = TwentyThree
+  | m24 /= n24 = TwentyFour
+  | m25 /= n25 = TwentyFive
+  | m26 /= n26 = TwentySix
+  | m27 /= n27 = TwentySeven
+  | m28 /= n28 = TwentyEight
+  | m29 /= n29 = TwentyNine
+  | m30 /= n30 = Thirty
+  | m31 /= n31 = ThirtyOne
+  | m32 /= n32 = ThirtyTwo
+  | otherwise  = Maskbits.Zero
+  where
+    m1  = (b1 oct1a)
+    m2  = (b2 oct1a)
+    m3  = (b3 oct1a)
+    m4  = (b4 oct1a)
+    m5  = (b5 oct1a)
+    m6  = (b6 oct1a)
+    m7  = (b7 oct1a)
+    m8  = (b8 oct1a)
+    m9  = (b1 oct2a)
+    m10 = (b2 oct2a)
+    m11 = (b3 oct2a)
+    m12 = (b4 oct2a)
+    m13 = (b5 oct2a)
+    m14 = (b6 oct2a)
+    m15 = (b7 oct2a)
+    m16 = (b8 oct2a)
+    m17 = (b1 oct3a)
+    m18 = (b2 oct3a)
+    m19 = (b3 oct3a)
+    m20 = (b4 oct3a)
+    m21 = (b5 oct3a)
+    m22 = (b6 oct3a)
+    m23 = (b7 oct3a)
+    m24 = (b8 oct3a)
+    m25 = (b1 oct4a)
+    m26 = (b2 oct4a)
+    m27 = (b3 oct4a)
+    m28 = (b4 oct4a)
+    m29 = (b5 oct4a)
+    m30 = (b6 oct4a)
+    m31 = (b7 oct4a)
+    m32 = (b8 oct4a)
+    oct1a = (octet1 addr1)
+    oct2a = (octet2 addr1)
+    oct3a = (octet3 addr1)
+    oct4a = (octet4 addr1)
+    n1  = (b1 oct1b)
+    n2  = (b2 oct1b)
+    n3  = (b3 oct1b)
+    n4  = (b4 oct1b)
+    n5  = (b5 oct1b)
+    n6  = (b6 oct1b)
+    n7  = (b7 oct1b)
+    n8  = (b8 oct1b)
+    n9  = (b1 oct2b)
+    n10 = (b2 oct2b)
+    n11 = (b3 oct2b)
+    n12 = (b4 oct2b)
+    n13 = (b5 oct2b)
+    n14 = (b6 oct2b)
+    n15 = (b7 oct2b)
+    n16 = (b8 oct2b)
+    n17 = (b1 oct3b)
+    n18 = (b2 oct3b)
+    n19 = (b3 oct3b)
+    n20 = (b4 oct3b)
+    n21 = (b5 oct3b)
+    n22 = (b6 oct3b)
+    n23 = (b7 oct3b)
+    n24 = (b8 oct3b)
+    n25 = (b1 oct4b)
+    n26 = (b2 oct4b)
+    n27 = (b3 oct4b)
+    n28 = (b4 oct4b)
+    n29 = (b5 oct4b)
+    n30 = (b6 oct4b)
+    n31 = (b7 oct4b)
+    n32 = (b8 oct4b)
+    oct1b = (octet1 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 ]