@@ -85,7 +85,8 @@ mkTransport (TCPConfig _hints host service) = withSocketsDo $ do
85 , newMulticastWith = error "newMulticastWith: not defined"
85 , newMulticastWith = error "newMulticastWith: not defined"
86 , deserialize = {-# SCC "deserialize" #-} \bs ->
86 , deserialize = {-# SCC "deserialize" #-} \bs ->
87 let (host, service, chanId) =
87 let (host, service, chanId) =
88− either (error $ printf "deserialize: %s") id $ decode bs in
88+ either (\m -> error $ printf "deserialize: %s" m)
89 Just $ mkSourceAddr host service chanId
90 Just $ mkSourceAddr host service chanId
90 , closeTransport = {-# SCC "closeTransport" #-} do
91 , closeTransport = {-# SCC "closeTransport" #-} do
91 -- Kill the transport channel process
92 -- Kill the transport channel process
@@ -107,7 +108,7 @@ mkSourceAddr host service chanId = SourceAddr
108mkSourceEnd :: HostName -> ServiceName -> ChanId -> IO SourceEnd
109mkSourceEnd :: HostName -> ServiceName -> ChanId -> IO SourceEnd
109mkSourceEnd host service chanId = withSocketsDo $ do
110mkSourceEnd host service chanId = withSocketsDo $ do
110− let err = error $ printf "mkSourceEnd: %s"
111+ let err m = error $ printf "mkSourceEnd: %s" m
111 serverAddrs <- getAddrInfo Nothing (Just host) (Just service)
112 serverAddrs <- getAddrInfo Nothing (Just host) (Just service)
112 let serverAddr = case serverAddrs of
113 let serverAddr = case serverAddrs of
113 [] -> err "getAddrInfo returned []"
114 [] -> err "getAddrInfo returned []"
@@ -145,7 +146,7 @@ mkTargetEnd chans chanId chan = TargetEnd
145-- for some reason, an error is raised.
146-- for some reason, an error is raised.
146procConnections :: Chans -> Socket -> IO ()
147procConnections :: Chans -> Socket -> IO ()
147procConnections chans sock = forever $ do
148procConnections chans sock = forever $ do
148− let err = error $ printf "procConnections: %s"
149+ let err m = error $ printf "procConnections: %s" m
149 (clientSock, _clientAddr) <- accept sock
150 (clientSock, _clientAddr) <- accept sock
150 -- decode the first message to find the correct chanId
151 -- decode the first message to find the correct chanId
151 bss <- recvExact clientSock 8
152 bss <- recvExact clientSock 8
@@ -184,7 +185,7 @@ procMessages chans chanId chan sock = do
184 Right sizeBS' -> procMessage $ decode sizeBS'
185 Right sizeBS' -> procMessage $ decode sizeBS'
185 esize -> procMessage (fromIntegral <$> esize)
186 esize -> procMessage (fromIntegral <$> esize)
187− err = error $ printf "procMessages: %s"
188+ err m = error $ printf "procMessages: %s" m
188 closeSocket :: IO ()
189 closeSocket :: IO ()
189 closeSocket = do
190 closeSocket = do
190 (chanId', chanMap) <- takeMVar chans
191 (chanId', chanMap) <- takeMVar chans