@@ -23,8 +23,8 @@ module Streamly.Internal.Network.Socket
2323 , useSocketM
2424 , useSocket
2525
26− -- * Listen for incoming connections
27− , listen
26+ -- * Accept connections
27+ , accept
2828 , connections
2929
3030 -- * Read from connection
@@ -73,10 +73,9 @@ import Foreign.Storable (Storable(..))
7373import GHC.ForeignPtr (mallocPlainForeignPtrBytes)
7474import Network.Socket (sendBuf, recvBuf)
7575import Network.Socket
76− (Socket, PortNumber, SocketOption(..), Family(..), SockAddr(..),
77− ProtocolNumber,
78− withSocketsDo, SocketType(..), socket, accept, bind,
79− defaultProtocol, setSocketOption, maxListenQueue, tupleToHostAddress)
76+ (Socket, SocketOption(..), Family(..), SockAddr(..),
77+ ProtocolNumber, withSocketsDo, SocketType(..), socket, bind,
78+ setSocketOption)
8079#if MIN_VERSION_network(3,1,0)
8180import Network.Socket (withFdSocket)
8281#else
@@ -124,7 +123,7 @@ useSocket :: (IsStream t, MonadCatch m, MonadIO m)
124123useSocket sk f = S.finally (liftIO $ Net.close sk) (f sk)
125124
126125-------------------------------------------------------------------------------
127−-- Listen (Unfolds)
126+-- Accept (Unfolds)
128127-------------------------------------------------------------------------------
129128
130129-- XXX Protocol specific socket options should be separated from socket level
@@ -158,20 +157,20 @@ listenTuples = Unfold step inject
158157 return listener
159158
160159 step listener = do
161− r <- liftIO $ accept listener
160+ r <- liftIO $ Net.accept listener
162161 -- XXX error handling
163162 return $ D.Yield r listener
164163
165164-- | Unfold a three tuple @(listenQLen, spec, addr)@ into a stream of connected
166−-- protocol sockets. @listenQLen@ is the maximum number of pending connections
167−-- in the backlog. @spec@ is the socket protocol and options specification and
168−-- @addr@ is the protocol address where the server listens for incoming
169−-- connections.
165+-- protocol sockets corresponding to incoming connections. @listenQLen@ is the
166+-- maximum number of pending connections in the backlog. @spec@ is the socket
167+-- protocol and options specification and @addr@ is the protocol address where
168+-- the server listens for incoming connections.
170169--
171170-- @since 0.7.0
172−{-# INLINE listen #-}
173−listen :: MonadIO m => Unfold m (Int, SockSpec, SockAddr) Socket
174−listen = UF.map fst listenTuples
171+{-# INLINE accept #-}
172+accept :: MonadIO m => Unfold m (Int, SockSpec, SockAddr) Socket
173+accept = UF.map fst listenTuples
175174
176175-------------------------------------------------------------------------------
177176-- Listen (Streams)
@@ -184,12 +183,12 @@ recvConnectionTuplesWith tcpListenQ spec addr = S.unfoldrM step Nothing
184183 where
185184 step Nothing = do
186185 listener <- liftIO $ initListener tcpListenQ spec addr
187− r <- liftIO $ accept listener
186+ r <- liftIO $ Net.accept listener
188187 -- XXX error handling
189188 return $ Just (r, Just listener)
190189
191190 step (Just listener) = do
192− r <- liftIO $ accept listener
191+ r <- liftIO $ Net.accept listener
193192 -- XXX error handling
194193 return $ Just (r, Just listener)
195194