1 files changed, 14 insertions, 1 deletions

diff --git a/xmppServer.hs b/xmppServer.hs
index f91c20ce..40c423aa 100644
--- a/xmppServer.hs
+++ b/xmppServer.hs
@@ -298,6 +298,8 @@ monitor sv params = do
                  let (xsrc,xsnk) = xmlStream conread conwrite
                  forkConnection k pingflag xsrc xsnk stanzas
                  return ()
+            ConnectFailure addr -> do
+                wlog $ tomsg k "ConnectFailure"
             EOF        -> wlog $ tomsg k "EOF"
             HalfConnection In -> do
                 wlog $ tomsg k "ReadOnly"
@@ -323,11 +325,15 @@ data ConnectionKey
  deriving (Show, Ord, Eq)
 
 peerKey (sock,addr) = do
-    peer <- getPeerName sock
+    peer <- 
+      sIsBound sock >>= \c -> 
+        if c then getPeerName sock -- addr is normally socketName
+             else return addr      -- Weird hack: addr is would-be peer name
     return $ PeerKey (peer `withPort` fromIntegral peerport)
 
 clientKey (sock,addr) = return $ ClientKey addr
 
+
 peerport = 5269
 clientport = 5222
 
@@ -339,6 +345,13 @@ main = runResourceT $ do
                           , timeout = 10000
                           , duplex = False }
     client_params <- return $ connectionDefaults clientKey
+    let testaddr0 = "fd97:ca88:fa7c:b94b:c8b8:fad4:1021:a54d"
+    testaddr<- fmap (addrAddress . head) $
+        getAddrInfo (Just $ defaultHints { addrFlags = [ AI_CANONNAME ]})
+                (Just testaddr0)
+                (Just "5269")
+    putStrLn $ "Connecting to "++show testaddr
+    control sv (Connect testaddr peer_params)
     forkIO $ monitor sv peer_params
     control sv (Listen peerport peer_params)
     -- control sv (Listen clientport client_params)