Added listening on port 5269 for remote peers.

2 files changed, 24 insertions, 1 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 660853b6..6d7841ff 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -319,8 +319,9 @@ xmppParse ls = runTryParse $ do
     
 
 listenForXmppClients session_factory port st = do
+    -- standard port: 5222
     let (start,dopkt) = 
-            adaptServer ( xmlLex "stream" . unpack
+            adaptServer ( xmlLex "local-client" . unpack
                         , xmppParse)
                         (startCon session_factory,doCon)
     doServer (port .*. st)
@@ -328,3 +329,23 @@ listenForXmppClients session_factory port st = do
              start
 
 
+startPeer session_factory sock st = do
+    let h = hOccursFst st :: Handle 
+    name <- fmap bshow $ getPeerName sock
+    L.putStrLn $ "REMOTE: connected " <++> name
+    let quit = L.putStrLn $ "REMOTE: disconnected " <++> name
+    return ( ConnectionFinalizer quit .*. st )
+
+doPeer st elem cont = do
+    cont ()
+
+listenForRemotePeers session_factory port st = do
+    -- standard port: 5269
+    let (start,dopkt) = 
+            adaptServer ( xmlLex "remote-peer" . unpack
+                        , xmppParse)
+                        (startPeer session_factory,doPeer)
+    doServer (port .*. st)
+             dopkt
+             start
+
diff --git a/Presence/main.hs b/Presence/main.hs
index 44af40e3..211d7df9 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -198,12 +198,14 @@ start = do
             dologin
 #endif
     sock <- listenForXmppClients (UnixSessions tracked) 5222 HNil
+    sockRemotes <- listenForRemotePeers (UnixSessions tracked) 5269 HNil
 
     threadDelay 1000 -- wait a moment to obtain current tty
     dologin ()
     putStrLn "\nHit enter to terminate...\n"
     getLine
     sClose sock
+    sClose sockRemotes
     -- threadDelay 1000
     putStrLn "closed listener."
     unmonitorTTY mtty