X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FHttpd.hs;h=3f2d7330796d7acea4cebf8a39680a24a44fa0b9;hb=8a7649cdf5d96d511dd6e2dfa4e2b741ffac4f9a;hp=1d0f2b8a5c626d3aa8175c7d07927b88fdeff1cc;hpb=f504167b85561373b4c444e2d37a513e0ab504a9;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Httpd.hs b/Network/HTTP/Lucu/Httpd.hs
index 1d0f2b8..3f2d733 100644
--- a/Network/HTTP/Lucu/Httpd.hs
+++ b/Network/HTTP/Lucu/Httpd.hs
@@ -1,32 +1,35 @@
+{-# LANGUAGE
+    CPP
+  , UnicodeSyntax
+  #-}
 -- |The entry point of Lucu httpd.
 module Network.HTTP.Lucu.Httpd
     ( FallbackHandler
     , runHttpd
     )
     where
-
-import           Control.Concurrent
-import           Network hiding (accept)
-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           Network.HTTP.Lucu.SocketLike
-import           System.Posix.Signals
+import Control.Concurrent
+import Control.Exception
+import Control.Monad
+import Control.Monad.Unicode
+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 Network.HTTP.Lucu.SocketLike as SL
 
 -- |This is the entry point of Lucu httpd. It listens to a socket and
--- waits for clients. Computation of 'runHttpd' never stops by itself
--- so the only way to stop it is to raise an exception in the thread
--- computing it.
---
--- Note that 'runHttpd' automatically makes SIGPIPE be ignored by
--- computing @'System.Posix.Signals.installHandler'
--- 'System.Posix.Signals.sigPIPE' 'System.Posix.Signals.Ignore'
--- 'Prelude.Nothing'@. This can hardly cause a problem but it may do.
+-- waits for clients. 'runHttpd' never stops by itself so the only way
+-- to stop it is to raise an exception in the thread running it.
 --
 -- Example:
 --
+-- > {-# LANGUAGE OverloadedStrings #-}
+-- > {-# LANGUAGE QuasiQuotes #-}
 -- > module Main where
 -- > import Network.HTTP.Lucu
 -- > 
@@ -37,36 +40,73 @@ import           System.Posix.Signals
 -- >          runHttpd config resourcees []
 -- >
 -- > helloWorld :: ResourceDef
--- > helloWorld = ResourceDef {
--- >                resUsesNativeThread = False
--- >              , resIsGreedy         = False
--- >              , resGet
--- >                  = Just $ do setContentType $ read "text/plain"
--- >                              output "Hello, world!"
--- >              , resHead   = Nothing
--- >              , resPost   = Nothing
--- >              , resPut    = Nothing
--- >              , resDelete = Nothing
+-- > helloWorld = emptyResource {
+-- >                resGet
+-- >                  = Just $ do setContentType [mimeType| text/plain |]
+-- >                              putChunk "Hello, world!"
 -- >              }
-runHttpd :: Config -> ResTree -> [FallbackHandler] -> IO ()
+runHttpd ∷ Config → ResTree → [FallbackHandler] → IO ()
 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 $ httpLoop (sslContext scnf, so)
-                     return ()
-         
-         httpLoop =<< listenOn (cnfServerPort cnf)
+      do let launchers
+                 = catMaybes
+                   [ do addr ← cnfServerV4Addr cnf
+                        return ( launchListener =≪ listenOn AF_INET addr (cnfServerPort cnf)
+                               )
+                   , do addr ← cnfServerV6Addr cnf
+                        return ( launchListener =≪ listenOn AF_INET6 addr (cnfServerPort cnf)
+                               )
+#if defined(HAVE_SSL)
+                   , 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)
+                               )
+#endif
+                   ]
+         sequence_ launchers
+         waitForever
     where
-      httpLoop :: SocketLike s => s -> IO ()
-      httpLoop so
-          = do (h, addr)  <- accept 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]
+               void $ forkIO $ httpLoop p 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
+                   )
+
+      httpLoop ∷ SocketLike s ⇒ PortNumber → s → IO ()
+      httpLoop port so
+          = do (h, addr)  ← SL.accept so
+               tQueue     ← mkInteractionQueue
+               readerTID  ← forkIO $ requestReader cnf tree fbs h port addr tQueue
+               _writerTID ← forkIO $ responseWriter cnf h tQueue readerTID
+               httpLoop port so
+
+      waitForever ∷ IO ()
+      waitForever = forever (threadDelay 1000000)