use openSocket in echo examples

Author: complyue

Network/Socket.hs

@@ -52,14 +52,12 @@
 -- >               , addrSocketType = Stream
 -- >               }
 -- >         head <$> getAddrInfo (Just hints) mhost (Just port)
--- >     open addr = E.bracketOnError
--- >         (socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr))
--- >         close $ \sock -> do
--- >             setSocketOption sock ReuseAddr 1
--- >             withFdSocket sock setCloseOnExecIfNeeded
--- >             bind sock $ addrAddress addr
--- >             listen sock 1024
--- >             return sock
+-- >     open addr = E.bracketOnError (openSocket addr) close $ \sock -> do
+-- >         setSocketOption sock ReuseAddr 1
+-- >         withFdSocket sock setCloseOnExecIfNeeded
+-- >         bind sock $ addrAddress addr
+-- >         listen sock 1024
+-- >         return sock
 -- >     loop sock = forever $ E.bracketOnError (accept sock) (close . fst)
 -- >         $ \(conn, _peer) -> void $
 -- >             -- 'forkFinally' alone is unlikely to fail thus leaking @conn@,
@@ -93,11 +91,9 @@
 -- >     resolve = do
 -- >         let hints = defaultHints { addrSocketType = Stream }
 -- >         head <$> getAddrInfo (Just hints) (Just host) (Just port)
--- >     open addr = E.bracketOnError
--- >         (socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr))
--- >         close $ \sock -> do
--- >             connect sock $ addrAddress addr
--- >             return sock
+-- >     open addr = E.bracketOnError (openSocket addr) close $ \sock -> do
+-- >         connect sock $ addrAddress addr
+-- >         return sock
 --
 -- The proper programming model is that one 'Socket' is handled by
 -- a single thread. If multiple threads use one 'Socket' concurrently,

examples/EchoClient.hs

@@ -23,8 +23,6 @@ runTCPClient host port client = withSocketsDo $ do
     resolve = do
         let hints = defaultHints { addrSocketType = Stream }
         head <$> getAddrInfo (Just hints) (Just host) (Just port)
-    open addr = E.bracketOnError
-        (socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr))
-        close $ \sock -> do
-            connect sock $ addrAddress addr
-            return sock
+    open addr = E.bracketOnError (openSocket addr) close $ \sock -> do
+        connect sock $ addrAddress addr
+        return sock

examples/EchoServer.hs

@@ -29,14 +29,12 @@ runTCPServer mhost port server = withSocketsDo $ do
               , addrSocketType = Stream
               }
         head <$> getAddrInfo (Just hints) mhost (Just port)
-    open addr = E.bracketOnError
-        (socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr))
-        close $ \sock -> do
-            setSocketOption sock ReuseAddr 1
-            withFdSocket sock setCloseOnExecIfNeeded
-            bind sock $ addrAddress addr
-            listen sock 1024
-            return sock
+    open addr = E.bracketOnError (openSocket addr) close $ \sock -> do
+        setSocketOption sock ReuseAddr 1
+        withFdSocket sock setCloseOnExecIfNeeded
+        bind sock $ addrAddress addr
+        listen sock 1024
+        return sock
     loop sock = forever $ E.bracketOnError (accept sock) (close . fst)
         $ \(conn, _peer) -> void $
             -- 'forkFinally' alone is unlikely to fail thus leaking @conn@,