DNSCrypt/dnscrypt-proxy
1
1
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2024-09-17 16:09:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix DoH3 connections piling up (#2337)

Browse Source 
DoH3 creates a new connection for each request without closing.

* `Conn` should be self maintained if it's created by customized `Dial` of `http3.RoundTripper`.
https://pkg.go.dev/github.com/quic-go/quic-go#DialAddrEarlyContext

* http3 doesn't have a `CloseIdleConnections`.
https://pkg.go.dev/net/http#Client.CloseIdleConnections
This commit is contained in:
lifenjoiner 2023-02-24 23:14:43 +08:00 committed by GitHub
parent a8d1c2fd24
commit 24a301b1af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dnscrypt-proxy/xtransport.go
View File

@ -56,6 +56,7 @@ type AltSupport struct {
type XTransport struct {
transport *http.Transport
h3Transport *http3.RoundTripper
h3UDPConn *net.UDPConn
keepAlive time.Duration
timeout time.Duration
cachedIPs CachedIPs
@ -132,7 +133,15 @@ func (xTransport *XTransport) loadCachedIP(host string) (ip net.IP, expired bool
func (xTransport *XTransport) rebuildTransport() {
dlog.Debug("Rebuilding transport")
if xTransport.transport != nil {
(*xTransport.transport).CloseIdleConnections()
if xTransport.h3Transport != nil {
xTransport.h3Transport.Close()
if xTransport.h3UDPConn != nil {
xTransport.h3UDPConn.Close()
xTransport.h3UDPConn = nil
}
} else {
xTransport.transport.CloseIdleConnections()
}
}
timeout := xTransport.timeout
transport := &http.Transport{
@ -243,11 +252,15 @@ func (xTransport *XTransport) rebuildTransport() {
if err != nil {
return nil, err
}
udpConn, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: 0})
if err != nil {
return nil, err
var udpConn *net.UDPConn
if xTransport.h3UDPConn == nil {
udpConn, err = net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4zero, Port: 0})
if err != nil {
return nil, err
}
xTransport.h3UDPConn = udpConn
}
return quic.DialEarlyContext(ctx, udpConn, udpAddr, host, tlsCfg, cfg)
return quic.DialEarlyContext(ctx, xTransport.h3UDPConn, udpAddr, host, tlsCfg, cfg)
}}
xTransport.h3Transport = h3Transport
}
@ -482,8 +495,13 @@ func (xTransport *XTransport) Fetch(
err = errors.New(resp.Status)
}
} else {
dlog.Debugf("HTTP client error: [%v] - closing idle H3 connections", err)
(*xTransport.transport).CloseIdleConnections()
if hasAltSupport {
dlog.Debugf("HTTP client error: [%v] - closing H3 connections", err)
xTransport.h3Transport.Close()
} else {
dlog.Debugf("HTTP client error: [%v] - closing idle connections", err)
xTransport.transport.CloseIdleConnections()
}
}
statusCode := 503
if resp != nil {