From f44596eb9832292007dd7a330748ffc001c89007 Mon Sep 17 00:00:00 2001 From: Philipp Balzarek Date: Sun, 18 Nov 2012 00:20:22 +0100 Subject: [PATCH] add port argument to connect methods --- source/Network/Xmpp.hs | 5 +++-- source/Network/Xmpp/Monad.hs | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/Network/Xmpp.hs b/source/Network/Xmpp.hs index 5b23db8..fd8b19e 100644 --- a/source/Network/Xmpp.hs +++ b/source/Network/Xmpp.hs @@ -238,13 +238,14 @@ simpleAuth username passwd resource = flip auth resource $ -- Note that the server might assign a different resource even when we send -- a preference. simpleConnect :: HostName -- ^ Target host name + -> PortID -> Text -- ^ User name (authcid) -> Text -- ^ Password -> Maybe Text -- ^ Desired resource (or Nothing to let the server -- decide) -> XmppConMonad Jid -simpleConnect host username password resource = do - connect host username +simpleConnect host port username password resource = do + connect host port username startTLS exampleParams saslResponse <- simpleAuth username password resource case saslResponse of diff --git a/source/Network/Xmpp/Monad.hs b/source/Network/Xmpp/Monad.hs index 97fcbe5..a90e059 100644 --- a/source/Network/Xmpp/Monad.hs +++ b/source/Network/Xmpp/Monad.hs @@ -138,10 +138,10 @@ xmppNoConnection = XmppConnection -- Connects to the given hostname on port 5222 (TODO: Make this dynamic) and -- updates the XmppConMonad XmppConnection state. -xmppRawConnect :: HostName -> Text -> XmppConMonad () -xmppRawConnect host hostname = do +xmppRawConnect :: HostName -> PortID -> Text -> XmppConMonad () +xmppRawConnect host port hostname = do con <- liftIO $ do - con <- connectTo host (PortNumber 5222) + con <- connectTo host port hSetBuffering con NoBuffering return con let raw = if debug