X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FCidr.hs;h=12d9689df71a7cbe955f4be1edb74c934263ef65;hb=df31e221bd5df65c8d6d506fa84f84639f964d97;hp=ab1ef51cce7af37bb5e3bdbec269a512ca59976f;hpb=fbd4a98a9a0996d41e3715a2698114b8a061f2cd;p=hath.git diff --git a/src/Cidr.hs b/src/Cidr.hs index ab1ef51..12d9689 100644 --- a/src/Cidr.hs +++ b/src/Cidr.hs @@ -85,9 +85,9 @@ contains _ (Cidr IPv4Address.None _) = False -- address and see if the result is the same as cidr1's mask applied -- to cidr1's address. -- -contains (Cidr addr1 (Maskbits mbits1)) (Cidr addr2 (Maskbits mbits2)) +contains (Cidr addr1 mbits1) (Cidr addr2 mbits2) | mbits1 > mbits2 = False | otherwise = addr1masked == addr2masked where - addr1masked = apply_mask addr1 (Maskbits mbits1) - addr2masked = apply_mask addr2 (Maskbits mbits1) + addr1masked = apply_mask addr1 mbits1 + addr2masked = apply_mask addr2 mbits1