Code cleanup (preparation for 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 f7f8a1d8d4c4ddcb5ede9e817cdfc2d2396e41f6..1d0f2b8a5c626d3aa8175c7d07927b88fdeff1cc 100644 (file)
--- a/Network/HTTP/Lucu/Httpd.hs
+++ b/Network/HTTP/Lucu/Httpd.hs
@@ -6,14 +6,13 @@ module Network.HTTP.Lucu.Httpd
     where
 
 import           Control.Concurrent
-import           Network
-import qualified Network.Socket as So
+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           System.IO
+import           Network.HTTP.Lucu.SocketLike
 import           System.Posix.Signals
 
 -- |This is the entry point of Lucu httpd. It listens to a socket and
@@ -52,22 +51,22 @@ import           System.Posix.Signals
 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
+
+         case cnfSSLConfig cnf of
+           Nothing
+               -> return ()
+           Just scnf
+               -> do so       <- listenOn (sslServerPort scnf)
+                     _loopTID <- forkIO $ httpLoop (sslContext scnf, so)
+                     return ()
+         
+         httpLoop =<< listenOn (cnfServerPort cnf)
     where
-      loop :: Socket -> IO ()
-      loop so
-          -- 本當は Network.accept を使ひたいが、このアクションは勝手に
-          -- リモートのIPを逆引きするので、使へない。
-          = do (h, addr)  <- accept' so
+      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
-               loop so
-
-      accept' :: Socket -> IO (Handle, So.SockAddr)
-      accept' soSelf
-          = do (soPeer, addr) <- So.accept soSelf
-               hPeer          <- So.socketToHandle soPeer ReadWriteMode
-               return (hPeer, addr)
+               httpLoop so