fumiama/terasu
1
0
Fork 0
mirror of https://github.com/fumiama/terasu.git synced 2026-06-05 01:00:23 +08:00
Code Activity

fix(tlsconn): clear deadline after tcp dial

Browse Source
This commit is contained in:
源文雨
2025-10-06 14:02:48 +08:00
parent d81a14f444
commit 48a5909e84
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dns/dns.go
View File

@@ -207,6 +207,16 @@ func (ds *DNSList) DialContext(ctx context.Context, dialer *net.Dialer, firstFra
MinVersion: tls.VersionTLS12, MinVersion: tls.VersionTLS12,
NextProtos: []string{"dns"}, NextProtos: []string{"dns"},
}) })
// re-init ctx due to deadline settings in tcp dial
if dialer.Timeout != 0 {
var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(context.Background(), dialer.Timeout)
defer cancel()
} else if !dialer.Deadline.IsZero() {
var cancel context.CancelFunc
ctx, cancel = context.WithDeadline(context.Background(), dialer.Deadline)
defer cancel()
}
if firstFragmentLen > 0 { if firstFragmentLen > 0 {
logrus.Debugln("[terasu.dns] -- hs tls", host, addr, "use first frag len", firstFragmentLen) logrus.Debugln("[terasu.dns] -- hs tls", host, addr, "use first frag len", firstFragmentLen)
err = terasu.Use(tlsConn).HandshakeContext(ctx, firstFragmentLen) err = terasu.Use(tlsConn).HandshakeContext(ctx, firstFragmentLen)
@@ -218,9 +228,10 @@ func (ds *DNSList) DialContext(ctx context.Context, dialer *net.Dialer, firstFra
logrus.Debugln("[terasu.dns] <- hs tls", host, addr, "succeeded") logrus.Debugln("[terasu.dns] <- hs tls", host, addr, "succeeded")
return ErrSuccess return ErrSuccess
} }
logrus.Debugln("[terasu.dns] hs tls", host, addr, "err:", err) logrus.Debugln("[terasu.dns] -- hs tls", host, addr, "err:", err)
_ = tlsConn.Close() _ = tlsConn.Close()
if !errors.Is(err, context.DeadlineExceeded) && !errors.Is(err, context.Canceled) { if !errors.Is(err, context.DeadlineExceeded) && !errors.Is(err, context.Canceled) {
logrus.Debugln("[terasu.dns] == disable", host, addr)
addr.disable(time.Hour) // no need to acquire write lock addr.disable(time.Hour) // no need to acquire write lock
} }
} }

10
http/http.go
View File

@@ -62,6 +62,16 @@ var DefaultClient = http.Client{
ServerName: host, ServerName: host,
MinVersion: tls.VersionTLS12, MinVersion: tls.VersionTLS12,
}) })
// re-init ctx due to deadline settings in tcp dial
if defaultDialer.Timeout != 0 {
var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(context.Background(), defaultDialer.Timeout)
defer cancel()
} else if !defaultDialer.Deadline.IsZero() {
var cancel context.CancelFunc
ctx, cancel = context.WithDeadline(context.Background(), defaultDialer.Deadline)
defer cancel()
}
if terasu.DefaultFirstFragmentLen > 0 { if terasu.DefaultFirstFragmentLen > 0 {
err = terasu.Use(tlsConn).HandshakeContext(ctx, terasu.DefaultFirstFragmentLen) err = terasu.Use(tlsConn).HandshakeContext(ctx, terasu.DefaultFirstFragmentLen)
} else { } else {

10
http2/http2.go
View File

@@ -59,6 +59,16 @@ var DefaultClient = http.Client{
continue continue
} }
tlsConn = tls.Client(conn, cfg) tlsConn = tls.Client(conn, cfg)
// re-init ctx due to deadline settings in tcp dial
if defaultDialer.Timeout != 0 {
var cancel context.CancelFunc
ctx, cancel = context.WithTimeout(context.Background(), defaultDialer.Timeout)
defer cancel()
} else if !defaultDialer.Deadline.IsZero() {
var cancel context.CancelFunc
ctx, cancel = context.WithDeadline(context.Background(), defaultDialer.Deadline)
defer cancel()
}
if terasu.DefaultFirstFragmentLen > 0 { if terasu.DefaultFirstFragmentLen > 0 {
err = terasu.Use(tlsConn).HandshakeContext(ctx, terasu.DefaultFirstFragmentLen) err = terasu.Use(tlsConn).HandshakeContext(ctx, terasu.DefaultFirstFragmentLen)
} else { } else {