X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FHttpd.hs;h=0bb92b1635c74a1498b1ee2936f807d6153d356d;hb=07b641d6c0a4ba07a07ede4d746dfb08a5ed0730;hp=c5e8f04981ee7845e9049feacbfe0d43121efa77;hpb=a827a5e1ba744d89c5b2396bb195e344ae892306;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Httpd.hs b/Network/HTTP/Lucu/Httpd.hs
index c5e8f04..0bb92b1 100644
--- a/Network/HTTP/Lucu/Httpd.hs
+++ b/Network/HTTP/Lucu/Httpd.hs
@@ -1,26 +1,33 @@
--- | The entry point of Lucu httpd.
+-- |The entry point of Lucu httpd.
 module Network.HTTP.Lucu.Httpd
-    ( runHttpd
+    ( FallbackHandler
+    , runHttpd
     )
     where
 
 import           Control.Concurrent
-import           Network
+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           Network.HTTP.Lucu.SocketLike as SL
 import           System.Posix.Signals
 
--- | This is the entry point of Lucu httpd. It listens to a socket and
+-- |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 @installHandler sigPIPE Ignore Nothing@. This can hardly
--- cause a problem but it may do.
+-- 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.
 --
 -- Example:
 --
@@ -31,31 +38,84 @@ import           System.Posix.Signals
 -- > main = let config    = defaultConfig
 -- >            resources = mkResTree [ ([], helloWorld) ]
 -- >        in
--- >          runHttpd config resourcees
+-- >          runHttpd config resourcees []
 -- >
 -- > helloWorld :: ResourceDef
 -- > helloWorld = ResourceDef {
 -- >                resUsesNativeThread = False
 -- >              , resIsGreedy         = False
 -- >              , resGet
--- >                  = Just $ do setContentType $ "text" </> "plain"
+-- >                  = Just $ do setContentType $ read "text/plain"
 -- >                              output "Hello, world!"
 -- >              , resHead   = Nothing
 -- >              , resPost   = Nothing
 -- >              , resPut    = Nothing
 -- >              , resDelete = Nothing
 -- >              }
-runHttpd :: Config -> ResTree -> IO ()
-runHttpd cnf tree
+runHttpd :: Config -> ResTree -> [FallbackHandler] -> IO ()
+runHttpd cnf tree fbs
     = withSocketsDo $
-      do installHandler sigPIPE Ignore Nothing
-         so <- listenOn (cnfServerPort cnf)
-         loop so
+      do _ <- installHandler sigPIPE Ignore Nothing
+
+         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
-      loop :: Socket -> IO ()
-      loop so
-          = do (h, host, _) <- accept so
-               tQueue       <- newInteractionQueue
-               readerTID    <- forkIO $ requestReader cnf tree h host tQueue
-               writerTID    <- forkIO $ responseWriter cnf h tQueue readerTID
-               loop 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 ()
+
+      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     <- newInteractionQueue
+               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)