X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=7017a191b85530f639b822acd19b5143fb8cf5ee;hb=76b555ca0ff80d36b481d1b86900bf1683d57081;hp=7b3bd7b0884847a456545903594130e9a8504539;hpb=706e492881f05238ace00fefc6ec9cb0000ea2e9;p=hath.git

diff --git a/src/Main.hs b/src/Main.hs
index 7b3bd7b..7017a19 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -2,17 +2,9 @@ import Data.List (intercalate, intersperse)
 import System.Exit (ExitCode(..), exitWith)
 import System.IO (stderr, hPutStrLn)
 
-import Cidr (Cidr,
-             from_string,
-             is_valid_cidr,
-             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,
+             combine_all)
 
 import CommandLine (help_set,
                     help_text,
@@ -20,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
@@ -59,14 +54,14 @@ 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))
 
 
 
@@ -86,18 +81,6 @@ numeric_range x y =
        upper = maximum [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 (Cidr.is_valid_cidr cidr)
-    then do
-      return ()
-    else do
-        putStrLn "Error: not valid CIDR notation."
-        exitWith (ExitFailure exit_invalid_cidr)
-
-
-
 main :: IO ()
 main = do
   -- First, check for any errors that occurred while parsing
@@ -124,8 +107,13 @@ main = do
   input <- inputfunc
 
   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
+
+  if (any (== Cidr.None) cidrs)
+    then do
+      putStrLn "Error: not valid CIDR notation."
+      exitWith (ExitFailure exit_invalid_cidr)
+    else do -- Nothing
 
   -- Get the mode of operation.
   mode <- CommandLine.parse_mode
@@ -135,4 +123,5 @@ main = do
         let regexes = map cidr_to_regex cidrs
         putStrLn $ alternate regexes
     Reduce -> do
-        putStr input
+        mapM (putStrLn . show) (combine_all cidrs)
+        return ()