X-Git-Url: http://gitweb.michael.orlitzky.com/?p=haeredes.git;a=blobdiff_plain;f=src%2FDNS.hs;h=2ebde3c2d537f2a2a2808ca0fb22232800b19b9c;hp=3c89ff4a78a423de3b31848470d4b82165d88ae7;hb=78aed23927af1734e0adf03095a617ba5ddbea01;hpb=e862342c38e41176a7ab300b6d7ed03cf0ffd6b2 diff --git a/src/DNS.hs b/src/DNS.hs index 3c89ff4..2ebde3c 100644 --- a/src/DNS.hs +++ b/src/DNS.hs @@ -5,7 +5,6 @@ module DNS ( resolve_address ) where -import Control.Monad ( liftM ) import qualified Data.ByteString.Char8 as BS ( pack ) import Data.IP (IPv4) import Network.DNS ( @@ -31,9 +30,9 @@ type LookupResult = (Domain, Either DNSError [Domain]) -- Examples: -- -- >>> resolve_address "example.com" --- Right [93.184.216.119] --- >>> resolve_address "93.184.216.119" --- Right [93.184.216.119] +-- Right [93.184.216.34] +-- >>> resolve_address "93.184.216.34" +-- Right [93.184.216.34] -- resolve_address :: String -> IO (Either DNSError [IPv4]) resolve_address s = @@ -63,7 +62,7 @@ resolve_address s = -- lookupMX' :: Resolver -> Domain -> IO LookupResult lookupMX' resolver domain = - liftM (pair_em . drop_priority) $ lookupMX resolver domain + fmap (pair_em . drop_priority) $ lookupMX resolver domain where drop_priority :: Either DNSError [(Domain, Int)] -> Either DNSError [Domain] @@ -96,7 +95,7 @@ lookupNS' :: Resolver -> Domain -> IO LookupResult lookupNS' resolver domain = do answer_result <- lookupNS resolver domain auth_result <- lookupNSAuth resolver domain - liftM pair_em $ return $ combine answer_result auth_result + fmap pair_em $ return $ combine answer_result auth_result where pair_em :: a -> (Domain, a) pair_em = (,) domain