X-Git-Url: http://gitweb.michael.orlitzky.com/?p=haeredes.git;a=blobdiff_plain;f=src%2FMain.hs;h=4e0da6b6dc0296e730025f5295219eeaae254fe1;hp=5c6f401f7a5e839b6f5545bd4e4bba91cd6b3195;hb=f9610a6d357f2ed79f2f18baa477244970f8b40f;hpb=7cc26ab4bfa90c4abe0c741d5a3eaf575544466a

diff --git a/src/Main.hs b/src/Main.hs
index 5c6f401..4e0da6b 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -14,7 +14,7 @@ import Data.String.Utils (join)
 import Network.DNS (
   Domain,
   FileOrNumericHost(RCHostName),
-  ResolvConf(resolvInfo),
+  ResolvConf(resolvInfo, resolvTimeout),
   defaultResolvConf,
   makeResolvSeed,
   withResolver )
@@ -31,8 +31,14 @@ import DNS (
   normalize_case,
   resolve_address )
 import ExitCodes (exit_bad_server)
+import Timeout (Timeout(..))
 
-report :: (Domain, Maybe [Domain]) -> IO ()
+
+-- | Report results for this LookupResult. If there's a Nothing in the
+--   second component, there were no query results, so we report that
+--   the domain was not delegated. If there were some results and
+--   there are leftovers (after "cleaning"), we report those as well.
+report :: LookupResult -> IO ()
 report (d, Nothing) =
   putStrLn $ "Domain " ++ (show d) ++ " not delegated."
 report (d, Just leftovers) =
@@ -42,6 +48,11 @@ report (d, Just leftovers) =
                " delegates somewhere else: " ++
                (join " " (map show leftovers))
 
+
+-- | "Clean" a lookup result by subtracting out the list of delegates.
+--   There shouldn't be anything left over. If there were no lookup
+--   results, we leave the Nothing in place so that 'report' can
+--   pattern match on it.
 clean :: [Domain] -- ^ List of delegates, @ds@
       -> LookupResult
       -> LookupResult
@@ -73,23 +84,26 @@ main = do
   let nrml_domains   = map normalize_function raw_domains
   let nrml_delegates = map normalize_function raw_delegates
 
-  rc <- case (server cfg) of
-          Nothing -> return defaultResolvConf
-          Just s -> do
-            s' <- resolve_address s
-            case s' of
-              Nothing -> do
-                hPutStrLn stderr ("Bad DNS server or lookup error: " ++ s)
-                exitWith (ExitFailure exit_bad_server)
-              Just s'' ->
-                return $ defaultResolvConf { resolvInfo =
-                                               RCHostName (show s'') }
-
+  rc' <- case (server cfg) of
+           Nothing -> return defaultResolvConf
+           Just s -> do
+             s' <- resolve_address s
+             case s' of
+               Nothing -> do
+                 hPutStrLn stderr ("Bad DNS server or lookup error: " ++ s)
+                 exitWith (ExitFailure exit_bad_server)
+               Just s'' ->
+                 return $ defaultResolvConf { resolvInfo =
+                                                RCHostName (show s'') }
+
+  -- Set the timeout from the command line. The resolvTimeout field is
+  -- in microseconds, so we multiply by one million.
+  let rc = rc' { resolvTimeout = 1000 * 1000 * (seconds $ timeout cfg) }
   rs <- makeResolvSeed rc
 
   let lookup_function = case cfg of
-                          (NS _ _ _) -> lookupNS'
-                          (MX _ _ _) -> lookupMX'
+                          NS{} -> lookupNS'
+                          MX{} -> lookupMX'
 
   _ <- withResolver rs $ \resolver -> do
          -- Bad stuff happens if we try to run these lookups in parallel