X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=a86eebf90081f0807a8628d35cff6c7a677d20c2;hb=3e3eff58c713987a442b418a3db01335307ac079;hp=7686ae30fb989e0cd3ee51d2dca2ac9e6980629b;hpb=3296c2f6578001f6a40de1b1e1f79b25c987d3af;p=hath.git

diff --git a/src/Main.hs b/src/Main.hs
index 7686ae3..a86eebf 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -2,18 +2,9 @@ import Data.List (intercalate, intersperse)
 import System.Exit (ExitCode(..), exitWith)
 import System.IO (stderr, hPutStrLn)
 
-import Text.Regex.Posix
-
-import Cidr (Cidr,
-             from_string,
-             min_first_octet,
-             min_second_octet,
-             min_third_octet,
-             min_fourth_octet,
-             max_first_octet,
-             max_second_octet,
-             max_third_octet,
-             max_fourth_octet)
+import Cidr (Cidr(..),
+             cidr_from_string,
+             is_valid_cidr)
 
 import CommandLine (help_set,
                     help_text,
@@ -21,7 +12,10 @@ import CommandLine (help_set,
                     Mode(..),
                     parse_errors,
                     parse_mode)
-
+    
+import IPv4Address
+import Octet
+    
 -- Some exit codes, used in the ExitFailure constructor.
 exit_invalid_cidr :: Int
 exit_invalid_cidr = 1
@@ -60,20 +54,15 @@ cidr_to_regex cidr =
       range2 = numeric_range min2 max2
       range3 = numeric_range min3 max3
       range4 = numeric_range min4 max4
-      min1   = min_first_octet cidr
-      min2   = min_second_octet cidr
-      min3   = min_third_octet cidr
-      min4   = min_fourth_octet cidr
-      max1   = max_first_octet cidr
-      max2   = max_second_octet cidr
-      max3   = max_third_octet cidr
-      max4   = max_fourth_octet cidr
-
+      min1   = octet_to_int (min_octet1 (ipv4address cidr) (maskbits cidr))
+      min2   = octet_to_int (min_octet2 (ipv4address cidr) (maskbits cidr))
+      min3   = octet_to_int (min_octet3 (ipv4address cidr) (maskbits cidr))
+      min4   = octet_to_int (min_octet4 (ipv4address cidr) (maskbits cidr))
+      max1   = octet_to_int (max_octet1 (ipv4address cidr) (maskbits cidr))
+      max2   = octet_to_int (max_octet2 (ipv4address cidr) (maskbits cidr))
+      max3   = octet_to_int (max_octet3 (ipv4address cidr) (maskbits cidr))
+      max4   = octet_to_int (max_octet4 (ipv4address cidr) (maskbits cidr))
 
--- Will return True if the passed String is in CIDR notation, False
--- otherwise.
-is_valid_cidr :: String -> Bool
-is_valid_cidr cidr = cidr =~ "([0-9]{1,3}\\.){3}[0-9]{1,3}/[0-9]{1,2}"
 
 
 -- Take a list of Strings, and return a regular expression matching
@@ -95,7 +84,7 @@ numeric_range x y =
 -- Take a CIDR String, and exit with a failure if it's invalid.
 validate_or_die :: String -> IO ()
 validate_or_die cidr = do
-  if (is_valid_cidr cidr)
+  if (Cidr.is_valid_cidr cidr)
     then do
       return ()
     else do
@@ -131,7 +120,7 @@ main = do
 
   let cidr_strings = lines input
   mapM validate_or_die cidr_strings
-  let cidrs = map Cidr.from_string cidr_strings
+  let cidrs = map Cidr.cidr_from_string cidr_strings
 
   -- Get the mode of operation.
   mode <- CommandLine.parse_mode