From: "Xiaokang Wang (Shelikhoo)" Date: Mon, 30 Jun 2025 05:13:51 +0100 Subject: Update quic version to v0.53.0 (#3435) Closes: #1114137 (cherry picked from commit eff7df91d094eb8276ae0dbd9f6b83009724c0fa) --- app/dns/nameserver_quic.go | 12 ++++++------ transport/internet/quic/conn.go | 2 +- transport/internet/quic/dialer.go | 4 ++-- transport/internet/quic/hub.go | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/dns/nameserver_quic.go b/app/dns/nameserver_quic.go index 0e9d0fd..5dc6aa6 100644 --- a/app/dns/nameserver_quic.go +++ b/app/dns/nameserver_quic.go @@ -38,7 +38,7 @@ type QUICNameServer struct { reqID uint32 name string destination net.Destination - connection quic.Connection + connection *quic.Conn } // NewQUICNameServer creates DNS-over-QUIC client object for local resolving @@ -316,7 +316,7 @@ func (s *QUICNameServer) QueryIP(ctx context.Context, domain string, clientIP ne } } -func isActive(s quic.Connection) bool { +func isActive(s *quic.Conn) bool { select { case <-s.Context().Done(): return false @@ -325,8 +325,8 @@ func isActive(s quic.Connection) bool { } } -func (s *QUICNameServer) getConnection() (quic.Connection, error) { - var conn quic.Connection +func (s *QUICNameServer) getConnection() (*quic.Conn, error) { + var conn *quic.Conn s.RLock() conn = s.connection if conn != nil && isActive(conn) { @@ -359,7 +359,7 @@ func (s *QUICNameServer) getConnection() (quic.Connection, error) { return conn, nil } -func (s *QUICNameServer) openConnection() (quic.Connection, error) { +func (s *QUICNameServer) openConnection() (*quic.Conn, error) { tlsConfig := tls.Config{ ServerName: func() string { switch s.destination.Address.Family() { @@ -384,7 +384,7 @@ func (s *QUICNameServer) openConnection() (quic.Connection, error) { return conn, nil } -func (s *QUICNameServer) openStream(ctx context.Context) (quic.Stream, error) { +func (s *QUICNameServer) openStream(ctx context.Context) (*quic.Stream, error) { conn, err := s.getConnection() if err != nil { return nil, err diff --git a/transport/internet/quic/conn.go b/transport/internet/quic/conn.go index c951ada..b67a942 100644 --- a/transport/internet/quic/conn.go +++ b/transport/internet/quic/conn.go @@ -142,7 +142,7 @@ func (c *sysConn) SetWriteDeadline(t time.Time) error { } type interConn struct { - stream quic.Stream + stream *quic.Stream local net.Addr remote net.Addr } diff --git a/transport/internet/quic/dialer.go b/transport/internet/quic/dialer.go index b0d1677..c8b5830 100644 --- a/transport/internet/quic/dialer.go +++ b/transport/internet/quic/dialer.go @@ -17,7 +17,7 @@ import ( type connectionContext struct { rawConn *sysConn - conn quic.Connection + conn *quic.Conn } var errConnectionClosed = newError("connection closed") @@ -47,7 +47,7 @@ type clientConnections struct { cleanup *task.Periodic } -func isActive(s quic.Connection) bool { +func isActive(s *quic.Conn) bool { select { case <-s.Context().Done(): return false diff --git a/transport/internet/quic/hub.go b/transport/internet/quic/hub.go index eba02da..4aaaea4 100644 --- a/transport/internet/quic/hub.go +++ b/transport/internet/quic/hub.go @@ -23,7 +23,7 @@ type Listener struct { addConn internet.ConnHandler } -func (l *Listener) acceptStreams(conn quic.Connection) { +func (l *Listener) acceptStreams(conn *quic.Conn) { for { stream, err := conn.AcceptStream(context.Background()) if err != nil {