dandri/simplexmq
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplexmq.git synced 2026-05-30 18:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

transport: extend connection timeout for socks

Browse Source
This commit is contained in:
Alexander Bondarenko
2024-04-21 21:05:00 +03:00
parent 3d40393ae8
commit 33bd0ab42d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Messaging/Client.hs
+6 -2
View File
@@ -360,13 +360,17 @@ getProtocolClient g transportSession@(_, srv, _) cfg@ProtocolClientConfig {qSize
runClient :: (ServiceName, ATransport) -> TransportHost -> PClient v err msg -> IO (Either (ProtocolClientError err) (ProtocolClient v err msg))
runClient (port', ATransport t) useHost c = do
cVar <- newEmptyTMVarIO
let tcConfig = transportClientConfig networkConfig
let (connectTimeout, tcConfig) = case transportClientConfig networkConfig of
tcc@TransportClientConfig {socksProxy = Nothing} -> (tcpConnectTimeout, tcc)
tcc@TransportClientConfig {socksProxy = Just _} ->
let extended = tcpConnectTimeout + tcpTimeout -- typically, extra time for establishing TOR circuits
in (extended, tcc {tcpConnectTimeout = extended} :: TransportClientConfig)
username = proxyUsername transportSession
action <-
async $
runTransportClient tcConfig (Just username) useHost port' (Just $ keyHash srv) (client t c cVar)
`finally` atomically (tryPutTMVar cVar $ Left PCENetworkError)
c_ <- (tcpConnectTimeout + tcpTimeout) `timeout` atomically (takeTMVar cVar)
c_ <- (connectTimeout + tcpTimeout) `timeout` atomically (takeTMVar cVar)
case c_ of
Just (Right c') -> pure $ Right c' {action = Just action}
Just (Left e) -> pure $ Left e