Configurable bind-addresses for xmpp.

1 files changed, 6 insertions, 11 deletions

diff --git a/Connection/Tcp.hs b/Connection/Tcp.hs
index 01e0f473..2c2c8d76 100644
--- a/Connection/Tcp.hs
+++ b/Connection/Tcp.hs
@@ -139,16 +139,16 @@ data ServerInstruction conkey u
     = Quit
     -- ^ kill the server.  This command is automatically issued when
     -- the server is released.
-    | Listen PortNumber (ConnectionParameters conkey u)
-    -- ^ listen for incoming connections
+    | Listen SockAddr (ConnectionParameters conkey u)
+    -- ^ listen for incoming connections on the given bind address.
     | Connect SockAddr  (ConnectionParameters conkey u)
     -- ^ connect to addresses
     | ConnectWithEndlessRetry SockAddr
                               (ConnectionParameters conkey u)
                               Miliseconds
     -- ^ keep retrying the connection
-    | Ignore PortNumber
-    -- ^ stop listening on specified port
+    | Ignore SockAddr
+    -- ^ stop listening on specified bind address
     | Send conkey ByteString
     -- ^ send bytes to an established connection
 
@@ -201,7 +201,7 @@ data Server a u releaseKey b
           , serverEvent      :: TChan ((a,u), ConnectionEvent b)
           , serverReleaseKey :: releaseKey
           , conmap           :: TVar (Map a (ConnectionRecord u))
-          , listenmap        :: TVar (Map PortNumber ServerHandle)
+          , listenmap        :: TVar (Map SockAddr ServerHandle)
           , retrymap         :: TVar (Map SockAddr (TVar Bool,InterruptibleDelay))
           }
 
@@ -300,12 +300,7 @@ server allocate sessionConduits = do
 
     hPutStrLn stderr $ "Started listening on "++show port
 
-    let family  = AF_INET6
-        address = case family of
-            AF_INET  -> SockAddrInet port iNADDR_ANY
-            AF_INET6 -> SockAddrInet6 port 0 iN6ADDR_ANY 0
-
-    sserv <- flip streamServer address ServerConfig
+    sserv <- flip streamServer port ServerConfig
         { serverWarn    = hPutStrLn stderr
         , serverSession = \sock _ h -> do
             (conkey,u) <- makeConnKey params sock