From: Shengjing Zhu Date: Wed, 16 Aug 2023 17:44:36 +0800 Subject: bump quic-go to 0.37.4 Based on https://github.com/v2fly/v2ray-core/pull/2561 --- app/dns/nameserver_quic.go | 17 ++++++++++++++--- transport/internet/quic/conn.go | 2 +- transport/internet/quic/dialer.go | 10 +++++++--- transport/internet/quic/hub.go | 12 ++++++++---- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/app/dns/nameserver_quic.go b/app/dns/nameserver_quic.go index 7acfc24..0e9d0fd 100644 --- a/app/dns/nameserver_quic.go +++ b/app/dns/nameserver_quic.go @@ -9,7 +9,7 @@ import ( "sync/atomic" "time" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" "golang.org/x/net/dns/dnsmessage" "golang.org/x/net/http2" "v2ray.com/core/common" @@ -360,12 +360,23 @@ func (s *QUICNameServer) getConnection() (quic.Connection, error) { } func (s *QUICNameServer) openConnection() (quic.Connection, error) { - tlsConfig := tls.Config{} + tlsConfig := tls.Config{ + ServerName: func() string { + switch s.destination.Address.Family() { + case net.AddressFamilyIPv4, net.AddressFamilyIPv6: + return s.destination.Address.IP().String() + case net.AddressFamilyDomain: + return s.destination.Address.Domain() + default: + panic("unknown address family") + } + }(), + } quicConfig := &quic.Config{ HandshakeIdleTimeout: handshakeIdleTimeout, } - conn, err := quic.DialAddrContext(context.Background(), s.destination.NetAddr(), tlsConfig.GetTLSConfig(tls.WithNextProto("http/1.1", http2.NextProtoTLS, NextProtoDQ)), quicConfig) + conn, err := quic.DialAddr(context.Background(), s.destination.NetAddr(), tlsConfig.GetTLSConfig(tls.WithNextProto("http/1.1", http2.NextProtoTLS, NextProtoDQ)), quicConfig) if err != nil { return nil, err } diff --git a/transport/internet/quic/conn.go b/transport/internet/quic/conn.go index c59b2a7..c951ada 100644 --- a/transport/internet/quic/conn.go +++ b/transport/internet/quic/conn.go @@ -8,7 +8,7 @@ import ( "errors" "time" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" "v2ray.com/core/common" "v2ray.com/core/common/buf" "v2ray.com/core/common/net" diff --git a/transport/internet/quic/dialer.go b/transport/internet/quic/dialer.go index 7dc891b..b0d1677 100644 --- a/transport/internet/quic/dialer.go +++ b/transport/internet/quic/dialer.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" "v2ray.com/core/common" "v2ray.com/core/common/net" "v2ray.com/core/common/task" @@ -149,7 +149,6 @@ func (s *clientConnections) openConnection(destAddr net.Addr, config *Config, tl } quicConfig := &quic.Config{ - ConnectionIDLength: 12, HandshakeIdleTimeout: time.Second * 8, MaxIdleTimeout: time.Second * 30, } @@ -160,7 +159,12 @@ func (s *clientConnections) openConnection(destAddr net.Addr, config *Config, tl return nil, err } - conn, err := quic.DialContext(context.Background(), sysConn, destAddr, "", tlsConfig.GetTLSConfig(tls.WithDestination(dest)), quicConfig) + tr := quic.Transport{ + Conn: sysConn, + ConnectionIDLength: 12, + } + + conn, err := tr.Dial(context.Background(), destAddr, tlsConfig.GetTLSConfig(tls.WithDestination(dest)), quicConfig) if err != nil { sysConn.Close() return nil, err diff --git a/transport/internet/quic/hub.go b/transport/internet/quic/hub.go index d3e0622..eba02da 100644 --- a/transport/internet/quic/hub.go +++ b/transport/internet/quic/hub.go @@ -6,7 +6,7 @@ import ( "context" "time" - "github.com/lucas-clemente/quic-go" + "github.com/quic-go/quic-go" "v2ray.com/core/common" "v2ray.com/core/common/net" "v2ray.com/core/common/protocol/tls/cert" @@ -18,7 +18,7 @@ import ( // Listener is an internet.Listener that listens for TCP connections. type Listener struct { rawConn *sysConn - listener quic.Listener + listener *quic.Listener done *done.Instance addConn internet.ConnHandler } @@ -104,7 +104,6 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti } quicConfig := &quic.Config{ - ConnectionIDLength: 12, HandshakeIdleTimeout: time.Second * 8, MaxIdleTimeout: time.Second * 45, MaxIncomingStreams: 32, @@ -117,7 +116,12 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti return nil, err } - qListener, err := quic.Listen(conn, tlsConfig.GetTLSConfig(), quicConfig) + tr := quic.Transport{ + Conn: conn, + ConnectionIDLength: 12, + } + + qListener, err := tr.Listen(tlsConfig.GetTLSConfig(), quicConfig) if err != nil { conn.Close() return nil, err