Browse Source

network 2.3.1.0 support

master
Michael Snoyman 12 years ago
parent
commit
193e79c051
  1. 2
      pontarius-xmpp.cabal
  2. 13
      source/Network/Xmpp/Stream.hs

2
pontarius-xmpp.cabal

@ -56,7 +56,7 @@ Library
, iproute >=1.2.4 , iproute >=1.2.4
, lifted-base >=0.1.0.1 , lifted-base >=0.1.0.1
, mtl >=2.0.0.0 , mtl >=2.0.0.0
, network >=2.4.1.0 , network >=2.3.1.0
, pureMD5 >=2.1.2.1 , pureMD5 >=2.1.2.1
, resourcet >=0.3.0 , resourcet >=0.3.0
, random >=1.0.0.0 , random >=1.0.0.0

13
source/Network/Xmpp/Stream.hs

@ -608,6 +608,17 @@ connectSrv config host = do
"The hostname could not be validated." "The hostname could not be validated."
throwError XmppIllegalTcpDetails throwError XmppIllegalTcpDetails
showPort :: PortID -> String
#if MIN_VERSION_network(2, 4, 1)
showPort = show
#else
showPort (PortNumber x) = "PortNumber " ++ show x
showPort (Service x) = "Service " ++ show x
#if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)
showPort (UnixSocket x) = "UnixSocket " ++ show x
#endif
#endif
-- Connects to a list of addresses and ports. Surpresses any exceptions from -- Connects to a list of addresses and ports. Surpresses any exceptions from
-- connectTcp. -- connectTcp.
connectTcp :: [(HostName, PortID)] -> IO (Maybe Handle) connectTcp :: [(HostName, PortID)] -> IO (Maybe Handle)
@ -615,7 +626,7 @@ connectTcp [] = return Nothing
connectTcp ((address, port):remainder) = do connectTcp ((address, port):remainder) = do
result <- Ex.try $ (do result <- Ex.try $ (do
debugM "Pontarius.Xmpp" $ "Connecting to " ++ address ++ " on port " ++ debugM "Pontarius.Xmpp" $ "Connecting to " ++ address ++ " on port " ++
(show port) ++ "." (showPort port) ++ "."
connectTo address port) :: IO (Either Ex.IOException Handle) connectTo address port) :: IO (Either Ex.IOException Handle)
case result of case result of
Right handle -> do Right handle -> do

Loading…
Cancel
Save