passing Config to newConfig

Network/HTTP2/Client/Run.hs

@@ -102,15 +102,11 @@ getResponse strm = do
 setup :: ClientConfig -> Config -> IO (Context, Manager)
 setup ClientConfig{..} conf@Config{..} = do
     let clientInfo = newClientInfo scheme authority
-        myAlist = makeMySettingsList conf concurrentStreams windowSize
     ctx <-
         newContext
             clientInfo
+            conf
             cacheLimit
-            confBufferSize
-            confMySockAddr
-            confPeerSockAddr
-            myAlist
             concurrentStreams
             windowSize
     mgr <- start confTimeoutManager

Network/HTTP2/H2/Config.hs

@@ -1,6 +1,5 @@
 module Network.HTTP2.H2.Config where
 
-import Data.ByteString (ByteString)
 import Data.IORef
 import Foreign.Marshal.Alloc (free, mallocBytes)
 import Network.Socket
@@ -10,26 +9,7 @@ import qualified System.TimeManager as T
 import Network.HPACK
 import Network.HTTP2.H2.File
 import Network.HTTP2.H2.ReadN
-
--- | HTTP/2 configuration.
-data Config = Config
-    { confWriteBuffer :: Buffer
-    -- ^ This is used only by frameSender.
-    -- This MUST be freed after frameSender is terminated.
-    , confBufferSize :: BufferSize
-    -- ^ The size of the write buffer.
-    --   We assume that the read buffer is the same size.
-    --   So, this value is announced via SETTINGS_MAX_FRAME_SIZE
-    --   to the peer.
-    , confSendAll :: ByteString -> IO ()
-    , confReadN :: Int -> IO ByteString
-    , confPositionReadMaker :: PositionReadMaker
-    , confTimeoutManager :: T.Manager
-    , confMySockAddr :: SockAddr
-    -- ^ This is copied into 'Aux', if exist, on server.
-    , confPeerSockAddr :: SockAddr
-    -- ^ This is copied into 'Aux', if exist, on server.
-    }
+import Network.HTTP2.H2.Types
 
 -- | Making simple configuration whose IO is not efficient.
 --   A write buffer is allocated internally.

Network/HTTP2/H2/Context.hs

@@ -92,15 +92,12 @@ data Context = Context
 
 newContext
     :: RoleInfo
+    -> Config
     -> Int
-    -> BufferSize
-    -> SockAddr
-    -> SockAddr
-    -> SettingsList
     -> Int
     -> WindowSize
     -> IO Context
-newContext rinfo cacheSiz siz mysa peersa settingAlist maxConc rxws =
+newContext rinfo conf@Config{..} cacheSiz maxConc rxws =
     Context rl rinfo settingAlist
         <$> newIORef False
         <*> newIORef Nothing
@@ -128,8 +125,8 @@ newContext rinfo cacheSiz siz mysa peersa settingAlist maxConc rxws =
         <*> newRate
         <*> newRate
         <*> newRate
-        <*> return mysa
-        <*> return peersa
+        <*> return confMySockAddr
+        <*> return confPeerSockAddr
   where
     rl = case rinfo of
         RIC{} -> Client
@@ -139,8 +136,23 @@ newContext rinfo cacheSiz siz mysa peersa settingAlist maxConc rxws =
         | otherwise = 2
     dlim = defaultPayloadLength + frameHeaderLength
     buflim
-        | siz >= dlim = dlim
-        | otherwise = siz
+        | confBufferSize >= dlim = dlim
+        | otherwise = confBufferSize
+    settingAlist = makeMySettingsList conf maxConc rxws
+
+makeMySettingsList :: Config -> Int -> WindowSize -> [(SettingsKey, Int)]
+makeMySettingsList Config{..} maxConc winSiz = myInitialAlist
+  where
+    -- confBufferSize is the size of the write buffer.
+    -- But we assume that the size of the read buffer is the same size.
+    -- So, the size is announced to via SETTINGS_MAX_FRAME_SIZE.
+    len = confBufferSize - frameHeaderLength
+    payloadLen = max defaultPayloadLength len
+    myInitialAlist =
+        [ (SettingsMaxFrameSize, payloadLen)
+        , (SettingsMaxConcurrentStreams, maxConc)
+        , (SettingsInitialWindowSize, winSiz)
+        ]
 
 ----------------------------------------------------------------
 

Network/HTTP2/H2/Receiver.hs

@@ -20,7 +20,6 @@ import Imports hiding (delete, insert)
 import Network.HPACK
 import Network.HPACK.Token
 import Network.HTTP2.Frame
-import Network.HTTP2.H2.Config
 import Network.HTTP2.H2.Context
 import Network.HTTP2.H2.EncodeFrame
 import Network.HTTP2.H2.HPACK

Network/HTTP2/H2/Sender.hs

@@ -24,7 +24,6 @@ import UnliftIO.STM
 import Imports
 import Network.HPACK (TokenHeaderList, setLimitForEncoding, toHeaderTable)
 import Network.HTTP2.Frame
-import Network.HTTP2.H2.Config
 import Network.HTTP2.H2.Context
 import Network.HTTP2.H2.EncodeFrame
 import Network.HTTP2.H2.File

Network/HTTP2/H2/Settings.hs

@@ -8,7 +8,6 @@ import Data.IntMap.Strict (IntMap)
 
 import Imports
 import Network.HTTP2.Frame
-import Network.HTTP2.H2.Config
 import Network.HTTP2.H2.Context
 import Network.HTTP2.H2.EncodeFrame
 import Network.HTTP2.H2.StreamTable
@@ -24,20 +23,6 @@ properWindowSize = 1048575
 properConcurrentStreams :: Int
 properConcurrentStreams = 64
 
-makeMySettingsList :: Config -> Int -> WindowSize -> [(SettingsKey, Int)]
-makeMySettingsList Config{..} maxConc winSiz = myInitialAlist
-  where
-    -- confBufferSize is the size of the write buffer.
-    -- But we assume that the size of the read buffer is the same size.
-    -- So, the size is announced to via SETTINGS_MAX_FRAME_SIZE.
-    len = confBufferSize - frameHeaderLength
-    payloadLen = max defaultPayloadLength len
-    myInitialAlist =
-        [ (SettingsMaxFrameSize, payloadLen)
-        , (SettingsMaxConcurrentStreams, maxConc)
-        , (SettingsInitialWindowSize, winSiz)
-        ]
-
 ----------------------------------------------------------------
 
 pendingMySettings :: Context -> IO [ByteString]

Network/HTTP2/H2/Types.hs

@@ -10,7 +10,9 @@ import Data.IORef
 import Data.Typeable
 import Network.Control
 import qualified Network.HTTP.Types as H
+import Network.Socket hiding (Stream)
 import System.IO.Unsafe
+import qualified System.TimeManager as T
 import UnliftIO.Concurrent
 import UnliftIO.Exception (SomeException)
 import UnliftIO.STM
@@ -370,3 +372,25 @@ checkSettingsValue (SettingsMaxFrameSize, v)
                 0
                 "Max frame size must be in between 16384 and 16777215"
 checkSettingsValue _ = Nothing
+
+----------------------------------------------------------------
+
+-- | HTTP/2 configuration.
+data Config = Config
+    { confWriteBuffer :: Buffer
+    -- ^ This is used only by frameSender.
+    -- This MUST be freed after frameSender is terminated.
+    , confBufferSize :: BufferSize
+    -- ^ The size of the write buffer.
+    --   We assume that the read buffer is the same size.
+    --   So, this value is announced via SETTINGS_MAX_FRAME_SIZE
+    --   to the peer.
+    , confSendAll :: ByteString -> IO ()
+    , confReadN :: Int -> IO ByteString
+    , confPositionReadMaker :: PositionReadMaker
+    , confTimeoutManager :: T.Manager
+    , confMySockAddr :: SockAddr
+    -- ^ This is copied into 'Aux', if exist, on server.
+    , confPeerSockAddr :: SockAddr
+    -- ^ This is copied into 'Aux', if exist, on server.
+    }

Network/HTTP2/Server/Run.hs

@@ -95,15 +95,11 @@ checkPreface conf@Config{..} = do
 setup :: ServerConfig -> Config -> IO (Context, Manager)
 setup ServerConfig{..} conf@Config{..} = do
     serverInfo <- newServerInfo
-    let myAlist = makeMySettingsList conf concurrentStreams windowSize
     ctx <-
         newContext
             serverInfo
+            conf
             0
-            confBufferSize
-            confMySockAddr
-            confPeerSockAddr
-            myAlist
             concurrentStreams
             windowSize
     -- Workers, worker manager and timer manager