X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Network%2FHTTP%2FLucu%2FHttpd.hs;h=d9f28f110e5f1c668a3fc9f539b9f2c4981e3959;hb=0214f070b80791323430e21b53bcbe8a77b71b23;hp=654e50d43c46b1043f55cf0eeaa49032d6e26046;hpb=73b5fba4907604681d778d3bd54cd65fd84b4454;p=Lucu.git

diff --git a/Network/HTTP/Lucu/Httpd.hs b/Network/HTTP/Lucu/Httpd.hs
index 654e50d..d9f28f1 100644
--- a/Network/HTTP/Lucu/Httpd.hs
+++ b/Network/HTTP/Lucu/Httpd.hs
@@ -6,15 +6,16 @@ module Network.HTTP.Lucu.Httpd
     where
 
 import           Control.Concurrent
-import           Network
-import qualified Network.Socket as So
+import           Control.Exception
+import           Control.Monad
+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
@@ -53,43 +54,85 @@ import           System.Posix.Signals
 runHttpd :: Config -> ResTree -> [FallbackHandler] -> IO ()
 runHttpd cnf tree fbs
     = withSocketsDo $
-      do installHandler sigPIPE Ignore Nothing
+      do _ <- installHandler sigPIPE Ignore Nothing
 
+         -- FIXME: TERRIBLE CODE. NEED MAJOR REWRITE.
          case cnfSSLConfig cnf of
            Nothing
                -> return ()
            Just scnf
-               -> do so       <- listenOn (sslServerPort scnf)
-                     _loopTID <- forkIO $ httpsLoop (sslContext scnf) so
-                     return ()
+               -> do case cnfServerV4Addr cnf of
+                       Nothing
+                           -> return ()
+                       Just v4addr
+                           -> do so <- listenOn AF_INET v4addr (sslServerPort scnf)
+                                 p  <- socketPort so
+                                 -- FIXME: Don't throw away the thread
+                                 -- ID as we can't kill it later
+                                 -- then. [1]
+                                 _  <- forkIO $ httpLoop p (sslContext scnf, so)
+                                 return ()
+
+                     case cnfServerV6Addr cnf of
+                       Nothing
+                           -> return ()
+                       Just v6addr
+                           -> do so <- listenOn AF_INET6 v6addr (sslServerPort scnf)
+                                 p  <- socketPort so
+                                 -- FIXME: [1]
+                                 _  <- forkIO $ httpLoop p (sslContext scnf, so)
+                                 return ()
          
-         httpLoop =<< listenOn (cnfServerPort cnf)
+         case cnfServerV4Addr cnf of
+           Nothing
+               -> return ()
+           Just v4addr
+               -> do so <- listenOn AF_INET v4addr (cnfServerPort cnf)
+                     p  <- socketPort so
+                     -- FIXME: [1]
+                     _  <- forkIO $ httpLoop p so
+                     return ()
+
+         case cnfServerV6Addr cnf of
+           Nothing
+               -> return ()
+           Just v6addr
+               -> do so <- listenOn AF_INET6 v6addr (cnfServerPort cnf)
+                     p  <- socketPort so
+                     -- FIXME: [1]
+                     _  <- forkIO $ httpLoop p so
+                     return ()
+
+         waitForever
     where
-      httpLoop :: Socket -> IO ()
-      httpLoop so
-          = do (h, addr)  <- acceptHTTP 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     <- newInteractionQueue
-               readerTID  <- forkIO $ requestReader cnf tree fbs h addr tQueue
+               readerTID  <- forkIO $ requestReader cnf tree fbs h port addr tQueue
                _writerTID <- forkIO $ responseWriter cnf h tQueue readerTID
-               httpLoop so
-
-      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
-
-      acceptHTTP :: Socket -> IO (Handle, So.SockAddr)
-      acceptHTTP soSelf
-          = do (soPeer, addr) <- So.accept soSelf
-               hPeer          <- So.socketToHandle soPeer ReadWriteMode
-               return (hPeer, addr)
+               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)