connect' takes a port number now

1 files changed, 6 insertions, 7 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index be59ac02..3684925a 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -588,7 +588,7 @@ sendMessage cons msg peer = do
         readTVar cons >>= writeTVar cons . Map.insert peer entry
 
 connect_to_server chan peer = (>> return ()) . runMaybeT $ do
-    let port = "5269"
+    let port = 5269 :: Int
 
     connected <- liftIO . async $ connect' (peerAddr peer) port
 
@@ -695,8 +695,8 @@ socketFamily (SockAddrInet _ _)      = AF_INET
 socketFamily (SockAddrInet6 _ _ _ _) = AF_INET6
 socketFamily (SockAddrUnix _)        = AF_UNIX
 
-connect' :: SockAddr -> ServiceName -> IO (Maybe Socket)
-connect' addr serv = do
+connect' :: SockAddr -> Int -> IO (Maybe Socket)
+connect' addr port = do
     proto <- getProtocolNumber "tcp"
     {-
     -- Given (host :: HostName) ...
@@ -708,14 +708,13 @@ connect' addr serv = do
     -}
     let getport (SockAddrInet port _) = port
         getport (SockAddrInet6 port _ _ _) = port
-    let port = getport addr
-    let withPort (SockAddrInet _ a)      port = SockAddrInet port a
-        withPort (SockAddrInet6 _ a b c) port = SockAddrInet6 port a b c
+    let withPort (SockAddrInet _ a)      port = SockAddrInet (toEnum port) a
+        withPort (SockAddrInet6 _ a b c) port = SockAddrInet6 (toEnum port) a b c
     let doException (SomeException e) = do
             L.putStrLn $  "\nFailed to reach "<++> showPeer (RemotePeer addr) <++> " on port "<++>bshow port<++>": " <++> bshow e
             return Nothing
     handle doException
-         $ tryToConnect proto (addr `withPort` 5269)
+         $ tryToConnect proto (addr `withPort` port)
   where
   tryToConnect proto addr =
     bracketOnError