Renamed streamServer to forkStreamServer.

2 files changed, 20 insertions, 12 deletions

diff --git a/server/src/Connection/Tcp.hs b/server/src/Connection/Tcp.hs
index 7d93e7de..72b51191 100644
--- a/server/src/Connection/Tcp.hs
+++ b/server/src/Connection/Tcp.hs
@@ -300,7 +300,7 @@ server allocate sessionConduits = do
 
     dput XMisc $ "Started listening on "++show port
 
-    sserv <- flip streamServer [port] ServerConfig
+    sserv <- flip forkStreamServer [port] ServerConfig
         { serverWarn    = dput XMisc
         , serverSession = \sock _ h -> do
             (conkey,u) <- makeConnKey params sock
diff --git a/server/src/Network/StreamServer.hs b/server/src/Network/StreamServer.hs
index 4fc477c5..c60ba99d 100644
--- a/server/src/Network/StreamServer.hs
+++ b/server/src/Network/StreamServer.hs
@@ -5,7 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 module Network.StreamServer
-    ( streamServer
+    ( forkStreamServer
     , ServerHandle
     , getAcceptLoopThreadId
     , ServerConfig(..)
@@ -71,8 +71,9 @@ dummyServerHandle = do
 -}
 
 removeSocketFile :: SockAddr -> IO ()
-removeSocketFile (SockAddrUnix fname) = removeFile fname
-removeSocketFile _                    = return ()
+removeSocketFile (SockAddrUnix ('\0':_)) = return ()
+removeSocketFile (SockAddrUnix fname)    = removeFile fname
+removeSocketFile _                       = return ()
 
 -- | Terminate the server accept-loop.  Call this to shut down the server.
 quitListening :: ServerHandle -> IO ()
@@ -106,15 +107,22 @@ data ServerConfig = ServerConfig
 withSession :: ((RestrictedSocket,(Local SockAddr,Remote SockAddr)) -> Int -> Handle -> IO ()) -> ServerConfig
 withSession session = ServerConfig warnStderr session
 
--- | Launch a thread to listen at the given bind address and dispatch
--- to session handler threads on every incoming connection. Supports
--- IPv4 and IPv6, TCP and unix sockets.
+-- | Launch a thread to listen at the given bind address and dispatch to
+-- session handler threads on every incoming connection. Supports IPv4 and
+-- IPv6, TCP and unix sockets.
 --
--- The returned handle can be used with 'quitListening' to terminate the
--- thread and prevent any new sessions from starting.  Currently active
--- session threads will not be terminated or signaled in any way.
-streamServer :: ServerConfig -> [SockAddr] -> IO ServerHandle
-streamServer cfg addrs0 = do
+-- Arguments:
+--
+--   [cfg]   Functions for handling incomming sessions and logging prints.
+--
+--   [addrs] A list of bind addresses that will be tried one after another
+--   until a successful listening socket is created.
+--
+-- The returned handle can be used with 'quitListening' to terminate the thread
+-- and prevent any new sessions from starting.  Currently active session
+-- threads will not be terminated or signaled in any way.
+forkStreamServer :: ServerConfig -> [SockAddr] -> IO ServerHandle
+forkStreamServer cfg addrs0 = do
     let warn   = serverWarn cfg
         family = case addrs0 of
                     SockAddrInet  {}:_ -> AF_INET