normalize
) where
-import Data.List (nubBy)
+import Data.List (nub)
import Data.List.Split (splitOneOf)
import Data.Maybe (catMaybes, mapMaybe)
instance Eq Cidr where
- cidr1 == cidr2 = (cidr1 `equivalent` cidr2)
+ -- | Two CIDRs are equal if they have the same network bits and if
+ -- their masks are the same. In other words, if they are the same
+ -- after normalization.
+ cidr1 == cidr2 = (cidr1 <= cidr2) && (cidr2 <= cidr1)
-
--- | Two CIDR ranges are equivalent if they have the same network bits
--- and the masks are the same.
-equivalent :: Cidr -> Cidr -> Bool
-equivalent (Cidr addr1 mbits1) (Cidr addr2 mbits2) =
- (mbits1 == mbits2) && ((apply_mask addr1 mbits1 B.Zero) == (apply_mask addr2 mbits2 B.Zero))
+instance Ord Cidr where
+ cidr1 <= cidr2 = if addr1 == addr2 then mask1 <= mask2 else addr1 <= addr2
+ where
+ Cidr addr1 mask1 = normalize cidr1
+ Cidr addr2 mask2 = normalize cidr2
-- | Returns the mask portion of a CIDR address. That is, everything
-- after the trailing slash.
| cidrs == (combine_contained unique_cidrs) = cidrs
| otherwise = combine_all (combine_contained unique_cidrs)
where
- unique_cidrs = nubBy equivalent cidr_combinations
+ unique_cidrs = nub cidr_combinations
cidr_combinations =
cidrs ++ (catMaybes [ (combine_adjacent x y) | x <- cidrs, y <- cidrs ])
testGroup "CIDR Properties" [
prop_all_cidrs_contain_themselves,
prop_contains_proper_antisymmetric,
- prop_normalize_idempotent ]
+ prop_normalize_idempotent,
+ prop_normalize_preserves_equality ]
-- HUnit Tests
where
prop :: Cidr -> Bool
prop cidr = (normalize cidr) == (normalize (normalize cidr))
+
+-- Normalization should not affect equality of two CIDRs.
+prop_normalize_preserves_equality :: TestTree
+prop_normalize_preserves_equality =
+ testProperty "The CIDR \"normalize\" function preserves equality " prop
+ where
+ prop :: Cidr -> Cidr -> Bool
+ prop cidr1 cidr2 = (cidr1 == cidr2) == (normalize cidr1 == normalize cidr2)