Daemon options to enable or disable XMPP.

2 files changed, 8 insertions, 6 deletions

diff --git a/Presence/Presence.hs b/Presence/Presence.hs
index c556a170..97b9d5b8 100644
--- a/Presence/Presence.hs
+++ b/Presence/Presence.hs
@@ -13,7 +13,7 @@ import Control.Concurrent.STM.TMVar
 import Control.Monad.Trans.Resource (runResourceT)
 import Control.Monad.Trans
 import Control.Monad.IO.Class (MonadIO, liftIO)
-import Network.Socket ( SockAddr(..) )
+import Network.Socket ( SockAddr(..), PortNumber )
 import System.Endian (fromBE32)
 import Data.List (nub, (\\), intersect, groupBy, sort, sortBy )
 import Data.Ord (comparing )
@@ -124,8 +124,8 @@ newPresenceState cw toxman xmpp = atomically $ do
             }
 
 
-presenceHooks :: PresenceState -> Int -> XMPPServerParameters
-presenceHooks state verbosity = XMPPServerParameters
+presenceHooks :: PresenceState -> Int -> Maybe PortNumber -> XMPPServerParameters
+presenceHooks state verbosity mport = XMPPServerParameters
     { xmppChooseResourceName        = chooseResourceName state
     , xmppTellClientHisName         = tellClientHisName state
     , xmppTellMyNameToClient        = textHostName
@@ -148,6 +148,7 @@ presenceHooks state verbosity = XMPPServerParameters
     , xmppClientInformSubscription  = clientInformSubscription state
     , xmppPeerInformSubscription    = peerInformSubscription state
     , xmppVerbosity                 = return verbosity
+    , xmppClientPort                = fromMaybe 5222 mport
     }
 
 
diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index ea1500d4..c9132d0f 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -92,8 +92,8 @@ import qualified Connection
 
 peerport :: PortNumber
 peerport = 5269
-clientport :: PortNumber
-clientport = 5222
+-- clientport :: PortNumber
+-- clientport = 5222
 
 my_uuid :: Text
 my_uuid = "154ae29f-98f2-4af4-826d-a40c8a188574"
@@ -213,6 +213,7 @@ data XMPPServerParameters =
     , -- | Called when a remote peer informs us of our subscription status.
       xmppPeerInformSubscription :: IO () -> ConnectionKey -> Stanza -> IO ()
     , xmppVerbosity          :: IO Int
+    , xmppClientPort :: PortNumber -- 5222
     }
 
 
@@ -1841,7 +1842,7 @@ xmppServer xmpp = do
         hPutStrLn stderr $ "Starting peer listen"
         control sv (Listen peerport peer_params)
         hPutStrLn stderr $ "Starting client listen"
-        control sv (Listen clientport client_params)
+        control sv (Listen (xmppClientPort xmpp) client_params)
     return XMPPServer { _xmpp_sv = sv, _xmpp_peer_params = peer_params }
 
 #if MIN_VERSION_stm(2,4,0)