yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: Don't try proxy if dial was cancelled

Browse Source
This commit is contained in:
James Houlahan
2022-10-28 17:22:38 +02:00
parent a797c01943
commit 34e4625b64
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/dialer/dialer_proxy.go
View File

@ -86,8 +86,12 @@ func (d *ProxyTLSDialer) DialTLSContext(ctx context.Context, network, address st
conn, err := d.dialer.DialTLSContext(ctx, network, address) conn, err := d.dialer.DialTLSContext(ctx, network, address)
if err == nil || !d.allowProxy { if err == nil || !d.allowProxy {
return conn, err return conn, err
} else if errors.Is(err, context.Canceled) {
return nil, err
} }
logrus.WithError(err).Debug("DialTLS failed, trying proxy")
if err := d.switchToReachableServer(); err != nil { if err := d.switchToReachableServer(); err != nil {
return nil, err return nil, err
} }