diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-01-26 08:48:14 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-01-26 08:48:23 -0400 |
| commit | 24590d731eba893cf11ce5651af6c47cb6f8d93f (patch) | |
| tree | ef9e0d248e136cf22a391939c3b033d1b2710350 /Utility | |
| parent | eac4fed035aada22e0a0b5fde7fc7f8b4d1f14f0 (diff) | |
Roll the dns build flag into the assistant build flag.
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/SRV.hs | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/Utility/SRV.hs b/Utility/SRV.hs index 991f3a3d6..033064a27 100644 --- a/Utility/SRV.hs +++ b/Utility/SRV.hs @@ -1,7 +1,5 @@ {- SRV record lookup - - - Uses either the the standalone Haskell DNS package, or the host command. - - - Copyright 2012 Joey Hess <id@joeyh.name> - - License: BSD-2-clause @@ -13,26 +11,15 @@ module Utility.SRV ( mkSRVTcp, mkSRV, lookupSRV, - lookupSRVHost, HostPort, ) where -import Utility.Process -import Utility.Exception -import Utility.PartialPrelude - -import Network import Data.Function import Data.List -import Data.Maybe -import Control.Applicative -import Prelude - -#ifdef WITH_DNS +import Network import qualified Network.DNS.Lookup as DNS import Network.DNS.Resolver import qualified Data.ByteString.UTF8 as B8 -#endif newtype SRV = SRV String deriving (Show, Eq) @@ -52,7 +39,6 @@ mkSRVTcp = mkSRV "tcp" - - On error, returns an empty list. -} lookupSRV :: SRV -> IO [HostPort] -#ifdef WITH_DNS lookupSRV (SRV srv) = do seed <- makeResolvSeed defaultResolvConf r <- withResolver seed $ flip DNS.lookupSRV $ B8.fromString srv @@ -68,33 +54,6 @@ lookupSRV (SRV srv) = do ( (priority, weight) , (B8.toString hostname, PortNumber $ fromIntegral port) ) -#else -lookupSRV = lookupSRVHost -#endif - -lookupSRVHost :: SRV -> IO [HostPort] -lookupSRVHost (SRV srv) = catchDefaultIO [] $ - parseSrvHost <$> readProcessEnv "host" ["-t", "SRV", "--", srv] - -- clear environment, to avoid LANG affecting output - (Just []) - -parseSrvHost :: String -> [HostPort] -parseSrvHost = orderHosts . catMaybes . map parse . lines - where - parse l = case words l of - [_, _, _, _, spriority, sweight, sport, hostname] -> do - let v = - ( readish sport :: Maybe Int - , readish spriority :: Maybe Int - , readish sweight :: Maybe Int - ) - case v of - (Just port, Just priority, Just weight) -> Just - ( (priority, weight) - , (hostname, PortNumber $ fromIntegral port) - ) - _ -> Nothing - _ -> Nothing orderHosts :: [(PriorityWeight, HostPort)] -> [HostPort] orderHosts = map snd . sortBy (compare `on` fst) |