X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=d66b6009c5187b643b0ea12e588cda26873eb39e;hb=13b975060857b8acd64b7231074dc4a0c0a2915a;hp=45705be673f087d76d8e64ea61f16c086ac98632;hpb=a2fe46950a637e64fb5056fce091bf398b983a79;p=hath.git

diff --git a/src/Main.hs b/src/Main.hs
index 45705be..d66b600 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,9 +1,7 @@
 module Main
 where
 
-import Control.Concurrent.ParallelIO.Global ( stopGlobalPool )
 import Control.Monad (when)
-import qualified Data.ByteString.Char8 as BS (intercalate, pack, unpack)
 import Data.List ((\\), intercalate)
 import Data.Maybe (catMaybes, isNothing)
 import Data.String.Utils (splitWs)
@@ -24,12 +22,12 @@ import Cidr (
   min_octet3,
   min_octet4 )
 import CommandLine (Args(..), get_args)
-import DNS (Domain, PTRResult, lookup_ptrs)
 import ExitCodes ( exit_invalid_cidr )
 import Octet ()
 
 
 -- | A regular expression that matches a non-address character.
+--
 non_addr_char :: String
 non_addr_char = "[^\\.0-9]"
 
@@ -37,6 +35,7 @@ non_addr_char = "[^\\.0-9]"
 -- | Add non_addr_chars on either side of the given String. This
 --   prevents (for example) the regex '127.0.0.1' from matching
 --   '127.0.0.100'.
+--
 add_barriers :: String -> String
 add_barriers x = non_addr_char ++ x ++ non_addr_char
 
@@ -49,7 +48,8 @@ add_barriers x = non_addr_char ++ x ++ non_addr_char
 --   3. Generate a regex matching every value between those min and
 --      max values.
 --   4. Join the regexes from step 3 with regexes matching periods.
---   5. Stick an address boundary on either side of the result.
+--   5. Stick an address boundary on either side of the result if
+--      use_barriers is True.
 --
 cidr_to_regex :: Bool -> Cidr.Cidr -> String
 cidr_to_regex use_barriers cidr =
@@ -73,15 +73,22 @@ cidr_to_regex use_barriers cidr =
 
 -- | Take a list of Strings, and return a regular expression matching
 --   any of them.
+--
 alternate :: [String] -> String
 alternate terms = "(" ++ (intercalate "|" terms) ++ ")"
 
 
 -- | Take two Ints as parameters, and return a regex matching any
 --   integer between them (inclusive).
+--
+--   IMPORTANT: we match from max to min so that if e.g. the last
+--   octet is '255', we want '255' to match before '2' in the regex
+--   (255|254|...|3|2|1) which does not happen if we use
+--   (1|2|3|...|254|255).
+--
 numeric_range :: Int -> Int -> String
 numeric_range x y =
-    alternate (map show [lower..upper])
+    alternate (map show $ reverse [lower..upper])
      where
        lower = minimum [x,y]
        upper = maximum [x,y]
@@ -95,7 +102,7 @@ main = do
   input <- getContents
 
   let cidr_strings = splitWs input
-  let cidrs = map readMaybe cidr_strings
+  let cidrs = map readMaybe cidr_strings :: [Maybe Cidr]
 
   when (any isNothing cidrs) $ do
     hPutStrLn stderr "ERROR: not valid CIDR notation:"
@@ -134,23 +141,3 @@ main = do
       let combined_cidrs = combine_all valid_cidrs
       let addrs = concatMap enumerate combined_cidrs
       mapM_ print addrs
-    Reversed{} -> do
-      let combined_cidrs = combine_all valid_cidrs
-      let addrs = concatMap enumerate combined_cidrs
-      let addr_bytestrings = map (BS.pack . show) addrs
-      ptrs <- lookup_ptrs addr_bytestrings
-      let pairs = zip addr_bytestrings ptrs
-      mapM_ (putStrLn . show_pair) pairs
-
-  stopGlobalPool
-
-  where
-    show_pair :: (Domain, PTRResult) -> String
-    show_pair (s, eds) =
-      (BS.unpack s) ++ ": " ++ results
-      where
-        space = BS.pack " "
-        results =
-          case eds of
-            Left err -> "ERROR (" ++ (show err) ++ ")"
-            Right ds -> BS.unpack $ BS.intercalate space ds