1 files changed, 8 insertions, 5 deletions

diff --git a/xmppServer.hs b/xmppServer.hs
index d67b7552..464d3b1d 100644
--- a/xmppServer.hs
+++ b/xmppServer.hs
@@ -11,18 +11,21 @@ import Network.Socket
     , AddrInfoFlag(AI_CANONNAME)
     )
 import Data.Monoid ( (<>) )
+import qualified Data.Text as Text
 import qualified Data.Text.IO as Text
 import Control.Monad
+import qualified Network.BSD as BSD
 
 
 import XMPPServer
 import Server
 
 main = runResourceT $ do
-    (sv,peer_params) <- xmppServer
+    hostname <- fmap Text.pack $ liftIO BSD.getHostName
+    sv <- xmppServer
         XMPPServerParameters
-        { xmppChooseResourceName = \k sock desired -> return "nobody@localhost/tty666"
-        , xmppTellMyNameToClient = return "localhost"
+        { xmppChooseResourceName = \k sock desired -> return $ "nobody@" <> hostname <> "/tty666"
+        , xmppTellMyNameToClient = return hostname
         , xmppTellMyNameToPeer = \addr -> return "localhost"
         , xmppNewConnection = \k outchan -> return ()
         , xmppEOF = \k -> return ()
@@ -32,7 +35,7 @@ main = runResourceT $ do
         , xmppRosterOthers = \k -> return []
         , xmppSubscribeToRoster = \k -> return ()
         , xmppLookupPeerName = \k ->  return "localhost"
-        , xmppLookupClientJID = \k -> return "nobody@localhost/tty666"
+        , xmppLookupClientJID = \k -> return $ "nobody@" <> hostname <> "/tty666"
         , xmppDeliverMessage = \fail msg -> do
             let msgs = msgLangMap (stanzaType msg)
                 body = fmap (maybe "" id . msgBody . snd) $ take 1 msgs
@@ -49,7 +52,7 @@ main = runResourceT $ do
                 (Just testaddr0)
                 (Just "5269")
     putStrLn $ "Connecting to "++show testaddr
-    control sv (ConnectWithEndlessRetry testaddr peer_params 10000)
+    addPeer sv testaddr
 
     quitVar <- newEmptyTMVarIO
     installHandler sigTERM (CatchOnce (atomically $ putTMVar quitVar True)) Nothing