X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FCidr.hs;h=1b7d1dd0892c2536e09cf9fb5e97a132a02cfdb8;hb=cbb5c7ddfee2f5061f247cbed0b4a5d790c14db0;hp=266b7c57f8a8e8318124a2518900de75a4d166ca;hpb=b22b30048819a3a53517e44370a97a2e37ba3f10;p=hath.git

diff --git a/src/Cidr.hs b/src/Cidr.hs
index 266b7c5..1b7d1dd 100644
--- a/src/Cidr.hs
+++ b/src/Cidr.hs
@@ -13,7 +13,12 @@ import Octet
 
 data Cidr = None | Cidr { ipv4address :: IPv4Address,
                           maskbits :: Maskbits }
-            deriving (Eq, Show)
+            deriving (Eq)
+
+
+instance Show Cidr where
+    show Cidr.None = "None"
+    show cidr = (show (ipv4address cidr)) ++ "/" ++ (show (maskbits cidr))
 
 
 -- Returns the mask portion of a CIDR address. That is, everything
@@ -109,3 +114,21 @@ redundant cidrlist cidr = any ((flip contains_proper) cidr) cidrlist
 combine_all :: [Cidr] -> [Cidr]
 combine_all cidrs =
     filter (not . (redundant cidrs)) cidrs
+
+
+-- Determine whether or not two CIDR ranges are adjacent. If two
+-- ranges lie consecutively within the IP space, they can be
+-- combined. For example, 10.1.0.0/24 and 10.0.1.0/24 are adjacent,
+-- and can be combined in to 10.1.0.0/23.
+adjacent :: Cidr -> Cidr -> Bool
+adjacent Cidr.None _ = False
+adjacent _ Cidr.None = False
+adjacent cidr1 cidr2
+  | mbits1 /= mbits2 = False
+  | mbits1 == Maskbits.Zero = False -- They're equal.
+  | otherwise = (mbits1 == (most_sig_bit_different addr1 addr2))
+  where
+    addr1 = ipv4address cidr1
+    addr2 = ipv4address cidr2
+    mbits1 = maskbits cidr1
+    mbits2 = maskbits cidr2