Code clean-up (and close ditz/lucu-1)

[Lucu.git] / Network / HTTP / Lucu / Httpd.hs

diff --git a/Network/HTTP/Lucu/Httpd.hs b/Network/HTTP/Lucu/Httpd.hs
index bab8d72ff5639362d1aee310ef7e189c5fc4bf84..0bb92b1635c74a1498b1ee2936f807d6153d356d 100644 (file)
--- a/Network/HTTP/Lucu/Httpd.hs
+++ b/Network/HTTP/Lucu/Httpd.hs
@@ -6,15 +6,17 @@ module Network.HTTP.Lucu.Httpd
     where
 
 import           Control.Concurrent
-import           Network
-import qualified Network.Socket as So
+import           Control.Exception
+import           Control.Monad
+import           Data.Maybe
+import           Network.BSD
+import           Network.Socket
 import           Network.HTTP.Lucu.Config
 import           Network.HTTP.Lucu.Interaction
 import           Network.HTTP.Lucu.RequestReader
 import           Network.HTTP.Lucu.Resource.Tree
 import           Network.HTTP.Lucu.ResponseWriter
-import qualified OpenSSL.Session as SSL
-import           System.IO
+import           Network.HTTP.Lucu.SocketLike as SL
 import           System.Posix.Signals
 
 -- |This is the entry point of Lucu httpd. It listens to a socket and
@@ -55,41 +57,65 @@ runHttpd cnf tree fbs
     = withSocketsDo $
       do _ <- installHandler sigPIPE Ignore Nothing
 
-         case cnfSSLConfig cnf of
-           Nothing
-               -> return ()
-           Just scnf
-               -> do so       <- listenOn (sslServerPort scnf)
-                     _loopTID <- forkIO $ httpsLoop (sslContext scnf) so
-                     return ()
-         
-         httpLoop =<< listenOn (cnfServerPort cnf)
+         let launchers
+                 = catMaybes
+                   [ do scnf <- cnfSSLConfig    cnf
+                        addr <- cnfServerV4Addr cnf
+                        return ( do so <- listenOn AF_INET addr (sslServerPort scnf)
+                                    launchListener (sslContext scnf, so)
+                               )
+                   , do scnf <- cnfSSLConfig    cnf
+                        addr <- cnfServerV6Addr cnf
+                        return ( do so <- listenOn AF_INET6 addr (sslServerPort scnf)
+                                    launchListener (sslContext scnf, so)
+                               )
+                   , do addr <- cnfServerV4Addr cnf
+                        return ( launchListener =<< listenOn AF_INET addr (cnfServerPort cnf)
+                               )
+                   , do addr <- cnfServerV6Addr cnf
+                        return ( launchListener =<< listenOn AF_INET6 addr (cnfServerPort cnf)
+                               )
+                   ]
+
+         sequence_ launchers
+         waitForever
     where
-      httpLoop :: Socket -> IO ()
-      httpLoop so
-          = do (h, addr)  <- acceptHTTP so
-               tQueue     <- newInteractionQueue
-               readerTID  <- forkIO $ requestReader cnf tree fbs h addr tQueue
-               _writerTID <- forkIO $ responseWriter cnf h tQueue readerTID
-               httpLoop so
+      launchListener :: SocketLike s => s -> IO ()
+      launchListener so
+          = do p <- SL.socketPort so
+               -- FIXME: Don't throw away the thread ID as we can't
+               -- kill it later then. [1]
+               _ <- forkIO $ httpLoop p so
+               return ()
 
-      httpsLoop :: SSL.SSLContext -> Socket -> IO ()
-      httpsLoop ctx so
-          = do (ssl, addr) <- acceptHTTPS ctx so
-               tQueue      <- newInteractionQueue
-               readerTID   <- forkIO $ requestReader cnf tree fbs ssl addr tQueue
-               _writerTID  <- forkIO $ responseWriter cnf ssl tQueue readerTID
-               httpsLoop ctx so
+      listenOn :: Family -> HostName -> ServiceName -> IO Socket
+      listenOn fam host srv
+          = do proto <- getProtocolNumber "tcp"
+               let hints = defaultHints {
+                             addrFlags      = [AI_PASSIVE]
+                           , addrFamily     = fam
+                           , addrSocketType = Stream
+                           , addrProtocol   = proto
+                           }
+               addrs <- getAddrInfo (Just hints) (Just host) (Just srv)
+               let addr = head addrs
+               bracketOnError
+                   (socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr))
+                   (sClose)
+                   (\ sock ->
+                        do setSocketOption sock ReuseAddr 1
+                           bindSocket sock (addrAddress addr)
+                           listen sock maxListenQueue
+                           return sock
+                   )
 
-      acceptHTTP :: Socket -> IO (Handle, So.SockAddr)
-      acceptHTTP soSelf
-          = do (soPeer, addr) <- So.accept soSelf
-               hPeer          <- So.socketToHandle soPeer ReadWriteMode
-               return (hPeer, addr)
+      httpLoop :: SocketLike s => PortNumber -> s -> IO ()
+      httpLoop port so
+          = do (h, addr)  <- SL.accept so
+               tQueue     <- newInteractionQueue
+               readerTID  <- forkIO $ requestReader cnf tree fbs h port addr tQueue
+               _writerTID <- forkIO $ responseWriter cnf h tQueue readerTID
+               httpLoop port so
 
-      acceptHTTPS :: SSL.SSLContext -> Socket -> IO (SSL.SSL, So.SockAddr)
-      acceptHTTPS ctx so
-          = do (so', addr) <- So.accept so
-               ssl         <- SSL.connection ctx so'
-               SSL.accept ssl
-               return (ssl, addr)
+      waitForever :: IO ()
+      waitForever = forever (threadDelay 1000000)