Add MX support (untested).

[haeredes.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index d425734c275404e24310edb650ac33c9b4fe0b67..0c215b758a59501b6d4c8bd049a5dd4cab53e9ee 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -16,12 +16,15 @@ import Network.DNS (
   FileOrNumericHost(RCHostName),
   ResolvConf(resolvInfo),
   defaultResolvConf,
-  lookupNS,
   makeResolvSeed,
   withResolver )
 
 import CommandLine (Args(..), get_args)
-import DNS (normalize)
+import DNS (
+  LookupResult,
+  lookupMX',
+  lookupNS',
+  normalize )
 
 report :: (Domain, Maybe [Domain]) -> IO ()
 report (d, Nothing) =
@@ -35,11 +38,12 @@ report (d, Just leftovers) =
                   (join " " (map show leftovers))
 
 clean :: [Domain] -- ^ List of delegates, @ds@
-      -> (Domain, Maybe [Domain]) -- ^ Pairs of (domain name, lookup result)
-      -> (Domain, Maybe [Domain])
+      -> LookupResult
+      -> LookupResult
 clean _ p@(_, Nothing) = p
-clean ds (d, Just targets) =
-  (d, Just $ targets \\ ds)
+clean delgts (d, Just targets) =
+  (d, Just $ targets \\ delgts)
+
 
 
 main :: IO ()
@@ -64,20 +68,16 @@ main = do
              Just s -> defaultResolvConf { resolvInfo = RCHostName s }
 
   rs <- makeResolvSeed rc
-  withResolver rs $ \resolver -> do
-    -- This function keeps the domain matches with its NS records.
-    let lookupNS' = \d -> (lookupNS resolver d) >>= (return . ((,) d))
-
-    -- Bad stuff happens if we try to run these lookups in parallel
-    -- instead of the reports.
-    domains_ns <- mapM lookupNS' nrml_domains
-    let cdns = map (clean nrml_delegates) domains_ns
-
-    _ <- case cfg of
-           (NS _ _) ->
-             -- We're only checking NS records, so report what we found.
-             parallel (map report cdns)
-           (MX _ _) ->
-             return [()]
-
-    stopGlobalPool
+
+  let lookup_function = case cfg of
+                          (NS _ _) -> lookupNS'
+                          (MX _ _) -> lookupMX'
+
+  _ <- withResolver rs $ \resolver -> do
+         -- Bad stuff happens if we try to run these lookups in parallel
+         -- instead of the reports.
+         records <- mapM (lookup_function resolver) nrml_domains
+         let cleaned_records = map (clean nrml_delegates) records
+         parallel (map report cleaned_records)
+
+  stopGlobalPool