Add support for network-3.0 API

Author: hvr

CHANGES.md

@@ -4,6 +4,7 @@
 - Drop redundant dependency on `HUnit`
 - Add more explicit `SafeHaskell` annotations to modules; all modules
   except for `System.Debian` are now explicitly either `Safe` or `Trustworthy`
+- Add support for `network-3.0` and `network-3.1`
 
 ## 1.4.1.0
 

MissingH.cabal

@@ -45,6 +45,11 @@ extra-source-files:
   winbuild.bat
   wintest.bat
 
+flag network--GE-3_0_0
+  description: [network](http://hackage.haskell.org/package/network) ≥ 3.0.0
+  default: True
+  manual: False
+
 source-repository head
   type: git
   location: https://github.com/hvr/missingh.git
@@ -122,7 +127,6 @@ library
     , filepath            >= 1.3.0.0 && < 1.5
     , hslogger            >= 1.3.0.0 && < 1.4
     , mtl                 >= 1.1.1.0 && < 2.3
-    , network             >= 2.6.3.1 && < 2.9
     , old-locale          == 1.0.*
     , old-time            == 1.1.*
     , parsec              == 3.1.*   && (< 3.1.12 || >= 3.1.13)
@@ -131,6 +135,12 @@ library
     , regex-compat        >= 0.95.1  && < 0.96
     , time                >= 1.4     && < 1.10
 
+  if flag(network--GE-3_0_0)
+    build-depends: network-bsd >= 2.8.1 && <2.9,
+                   network >= 3.0 && <3.2
+  else
+    build-depends: network >= 2.6.3.1 && <2.9
+
   If !os(windows)
     Build-Depends: unix   >= 2.5.1.0 && < 2.8
 

src/Network/SocketServer.hs

@@ -78,7 +78,7 @@ simpleTCPOptions :: Int                -- ^ Port Number
                  -> InetServerOptions
 simpleTCPOptions p = InetServerOptions {listenQueueSize = 5,
                                         portNumber = (fromIntegral p),
-                                        interface = iNADDR_ANY,
+                                        interface = 0,
                                         reuse = False,
                                         family = AF_INET,
                                         sockType = Stream,
@@ -98,7 +98,7 @@ setupSocketServer opts =
        setSocketOption s ReuseAddr (case (reuse opts) of
                                     True  -> 1
                                     False -> 0)
-       bindSocket s (SockAddrInet (portNumber opts)
+       bind s (SockAddrInet (portNumber opts)
                      (interface opts))
        listen s (listenQueueSize opts)
        return $ SocketServer {optionsSS = opts, sockSS = s}
@@ -107,7 +107,7 @@ setupSocketServer opts =
 handlers, if any. -}
 closeSocketServer :: SocketServer -> IO ()
 closeSocketServer ss =
-    sClose (sockSS ss)
+    close (sockSS ss)
 
 {- | Handle one incoming request from the given 'SocketServer'. -}
 handleOne :: SocketServer -> HandlerT -> IO ()

src/Network/Utils.hs

@@ -26,7 +26,6 @@ module Network.Utils (niceSocketsDo, connectTCP, connectTCPAddr,
                         listenTCPAddr, showSockAddr)
     where
 
-import           Network
 import           Network.BSD
 import           Network.Socket
 import           System.IO
@@ -72,14 +71,14 @@ listenTCPAddr :: SockAddr -> Int -> IO Socket
 listenTCPAddr addr queuelen = do
                      proto <- getProtocolNumber "tcp"
                      s <- socket AF_INET Stream proto
-                     bindSocket s addr
+                     bind s addr
                      listen s queuelen
                      return s
 
 showSockAddr :: SockAddr -> IO String
 #if !(defined(mingw32_HOST_OS) || defined(mingw32_TARGET_OS) || defined(__MINGW32__))
 showSockAddr (SockAddrUnix x) = return $ "UNIX socket at " ++ x
 #endif
-showSockAddr (SockAddrInet port host) =
-    do h <- inet_ntoa host
+showSockAddr sa@(SockAddrInet port host) =
+    do (Just h,_) <- getNameInfo [NI_NUMERICHOST] True False sa
        return $ "IPv4 host " ++ h ++ ", port " ++ (show port)