Move to network 3.

Author: facundominguez

ChangeLog

@@ -1,6 +1,6 @@
 next release
 
-*
+* Move to network 3.
 
 2019-12-31 FacundoDominguez <facundo.dominguez@tweag.io> 0.7.0
 

network-transport-tcp.cabal

@@ -31,7 +31,7 @@ Library
                    data-accessor >= 0.2 && < 0.3,
                    containers >= 0.4 && < 0.7,
                    bytestring >= 0.9 && < 0.11,
-                   network >= 2.6.2 && < 2.9,
+                   network >= 3.1 && < 3.2,
                    uuid >= 1.3 && < 1.4
   Exposed-modules: Network.Transport.TCP,
                    Network.Transport.TCP.Internal
@@ -51,7 +51,7 @@ Test-Suite TestTCP
   Build-Depends:   base >= 4.3 && < 5,
                    bytestring >= 0.9 && < 0.11,
                    network-transport-tests >= 0.2.1.0 && < 0.3,
-                   network >= 2.3 && < 2.9,
+                   network >= 3.1 && < 3.2,
                    network-transport,
                    network-transport-tcp
   ghc-options:     -threaded -rtsopts -with-rtsopts=-N

src/Network/Transport/TCP.hs

@@ -89,6 +89,7 @@ import qualified Network.Socket as N
   , ServiceName
   , Socket
   , getAddrInfo
+  , maxListenQueue
   , socket
   , addrFamily
   , addrAddress
@@ -98,7 +99,6 @@ import qualified Network.Socket as N
   , SocketOption(ReuseAddr, NoDelay, UserTimeout, KeepAlive)
   , isSupportedSocketOption
   , connect
-  , sOMAXCONN
   , AddrInfo
   , SockAddr(..)
   )
@@ -675,7 +675,7 @@ createTransportExposeInternals addr params = do
 -- | Default TCP parameters
 defaultTCPParameters :: TCPParameters
 defaultTCPParameters = TCPParameters {
-    tcpBacklog         = N.sOMAXCONN
+    tcpBacklog         = N.maxListenQueue
   , tcpReuseServerAddr = True
   , tcpReuseClientAddr = True
   , tcpNoDelay         = False

src/Network/Transport/TCP/Internal.hs

@@ -42,26 +42,26 @@ import qualified Network.Transport.TCP.Mock.Socket as N
 import qualified Network.Socket as N
 #endif
   ( HostName
+  , NameInfoFlag(NI_NUMERICHOST)
   , ServiceName
   , Socket
   , SocketType(Stream)
   , SocketOption(ReuseAddr)
   , getAddrInfo
   , defaultHints
   , socket
-  , bindSocket
+  , bind
   , listen
   , addrFamily
   , addrAddress
   , defaultProtocol
   , setSocketOption
   , accept
-  , sClose
+  , close
   , socketPort
   , shutdown
   , ShutdownCmd(ShutdownBoth)
   , SockAddr(..)
-  , inet_ntoa
   , getNameInfo
   )
 
@@ -235,13 +235,13 @@ forkServer host port backlog reuseAddr errorHandler terminationHandler requestHa
     bracketOnError (N.socket (N.addrFamily addr) N.Stream N.defaultProtocol)
                    tryCloseSocket $ \sock -> do
       when reuseAddr $ N.setSocketOption sock N.ReuseAddr 1
-      N.bindSocket sock (N.addrAddress addr)
+      N.bind sock (N.addrAddress addr)
       N.listen sock backlog
 
       -- Close up and fill the synchonizing MVar.
       let release :: ((N.Socket, N.SockAddr), MVar ()) -> IO ()
           release ((sock, _), socketClosed) =
-            N.sClose sock `finally` putMVar socketClosed ()
+            N.close sock `finally` putMVar socketClosed ()
 
       -- Run the request handler.
       let act restore (sock, sockAddr) = do
@@ -263,7 +263,7 @@ forkServer host port backlog reuseAddr errorHandler terminationHandler requestHa
             -- Looks like 'act' will never throw an exception, but to be
             -- safe we'll close the socket if it does.
             let handler :: SomeException -> IO ()
-                handler _ = N.sClose sock
+                handler _ = N.close sock
             catch (act restore (sock, sockAddr)) handler
 
       -- We start listening for incoming requests in a separate thread. When
@@ -296,7 +296,7 @@ recvWord32 = fmap (decodeWord32 . BS.concat) . flip recvExact 4
 -- | Close a socket, ignoring I/O exceptions.
 tryCloseSocket :: N.Socket -> IO ()
 tryCloseSocket sock = void . tryIO $
-  N.sClose sock
+  N.close sock
 
 -- | Shutdown socket sends and receives, ignoring I/O exceptions.
 tryShutdownSocketBoth :: N.Socket -> IO ()
@@ -330,7 +330,7 @@ resolveSockAddr sockAddr = case sockAddr of
     (mResolvedHost, mResolvedPort) <- N.getNameInfo [] True False sockAddr
     case (mResolvedHost, mResolvedPort) of
       (Just resolvedHost, Nothing) -> do
-        numericHost <- N.inet_ntoa host
+        (Just numericHost, _) <- N.getNameInfo [N.NI_NUMERICHOST] True False sockAddr
         return $ Just (numericHost, resolvedHost, show port)
       _ -> error $ concat [
           "decodeSockAddr: unexpected resolution "

tests/TestTCP.hs

@@ -64,7 +64,7 @@ import qualified Network.Transport.TCP.Mock.Socket as N
 #else
 import qualified Network.Socket as N
 #endif
-  ( sClose
+  ( close
   , ServiceName
   , Socket
   , AddrInfo
@@ -199,7 +199,7 @@ testEarlyDisconnect = do
         sendMany sock (encodeWord32 10002 : prependLength ["pong"])
 
         -- Close the socket
-        N.sClose sock
+        N.close sock
 
       let ourAddress = encodeEndPointAddress "127.0.0.1" clientPort 0
       putMVar clientAddr ourAddress
@@ -215,7 +215,7 @@ testEarlyDisconnect = do
 
       -- Close the socket without closing the connection explicitly
       -- The server should receive an error event
-      N.sClose sock
+      N.close sock
 
 -- | Test the behaviour of a premature CloseSocket request
 testEarlyCloseSocket :: IO ()
@@ -316,7 +316,7 @@ testEarlyCloseSocket = do
             encodeWord32 (encodeControlHeader CloseSocket)
           , encodeWord32 1024
           ]
-        N.sClose sock
+        N.close sock
 
       let ourAddress = encodeEndPointAddress "127.0.0.1" clientPort 0
       putMVar clientAddr ourAddress
@@ -336,7 +336,7 @@ testEarlyCloseSocket = do
           encodeWord32 (encodeControlHeader CloseSocket)
         , encodeWord32 0
         ]
-      N.sClose sock
+      N.close sock
 
 -- | Test the creation of a transport with an invalid address
 testInvalidAddress :: IO ()
@@ -451,7 +451,7 @@ testIgnoreCloseSocket = do
         encodeWord32 (encodeControlHeader CloseSocket)
       , encodeWord32 1024
       ]
-    N.sClose sock
+    N.close sock
 
     putMVar clientDone ()
 
@@ -576,9 +576,9 @@ testUnnecessaryConnect numThreads = do
           -- We might get either Invalid or Crossed (the transport does not
           -- maintain enough history to be able to tell)
           Right (_, sock, ConnectionRequestInvalid) ->
-            N.sClose sock
+            N.close sock
           Right (_, sock, ConnectionRequestCrossed) ->
-            N.sClose sock
+            N.close sock
           Left _ ->
             return ()
         putMVar done ()