Skip to content

Commit 86b4b81

Browse files
dependabot[bot]yuhan6665
dependabot[bot]
authored and
yuhan6665
committed
Bump github.com/quic-go/quic-go from 0.34.0 to 0.35.1
Bumps [github.com/quic-go/quic-go](https://github.com/quic-go/quic-go) from 0.34.0 to 0.35.1. - [Release notes](https://github.com/quic-go/quic-go/releases) - [Changelog](https://github.com/quic-go/quic-go/blob/master/Changelog.md) - [Commits](quic-go/quic-go@v0.34.0...v0.35.1) --- updated-dependencies: - dependency-name: github.com/quic-go/quic-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent 6b8e36f commit 86b4b81

File tree

6 files changed

+24
-21
lines changed

6 files changed

+24
-21
lines changed

‎app/dns/nameserver_quic.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ func (s *QUICNameServer) openConnection() (quic.Connection, error) {
374374
HandshakeIdleTimeout: handshakeTimeout,
375375
}
376376

377-
conn, err := quic.DialAddrContext(context.Background(), s.destination.NetAddr(), tlsConfig.GetTLSConfig(tls.WithNextProto("http/1.1", http2.NextProtoTLS, NextProtoDQ)), quicConfig)
377+
conn, err := quic.DialAddr(context.Background(), s.destination.NetAddr(), tlsConfig.GetTLSConfig(tls.WithNextProto("http/1.1", http2.NextProtoTLS, NextProtoDQ)), quicConfig)
378378
log.Record(&log.AccessMessage{
379379
From: "DNS",
380380
To: s.destination,

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/miekg/dns v1.1.54
1212
github.com/pelletier/go-toml v1.9.5
1313
github.com/pires/go-proxyproto v0.7.0
14-
github.com/quic-go/quic-go v0.34.0
14+
github.com/quic-go/quic-go v0.35.1
1515
github.com/refraction-networking/utls v1.3.2
1616
github.com/sagernet/sing v0.2.4
1717
github.com/sagernet/sing-shadowsocks v0.2.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc8
135135
github.com/quic-go/qtls-go1-19 v0.3.2/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI=
136136
github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E=
137137
github.com/quic-go/qtls-go1-20 v0.2.2/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM=
138-
github.com/quic-go/quic-go v0.34.0 h1:OvOJ9LFjTySgwOTYUZmNoq0FzVicP8YujpV0kB7m2lU=
139-
github.com/quic-go/quic-go v0.34.0/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g=
138+
github.com/quic-go/quic-go v0.35.1 h1:b0kzj6b/cQAf05cT0CkQubHM31wiA+xH3IBkxP62poo=
139+
github.com/quic-go/quic-go v0.35.1/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g=
140140
github.com/refraction-networking/utls v1.3.2 h1:o+AkWB57mkcoW36ET7uJ002CpBWHu0KPxi6vzxvPnv8=
141141
github.com/refraction-networking/utls v1.3.2/go.mod h1:fmoaOww2bxzzEpIKOebIsnBvjQpqP7L2vcm/9KUfm/E=
142142
github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=

‎transport/internet/quic/dialer.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package quic
22

33
import (
44
"context"
5-
"io"
65
"sync"
76
"time"
87

@@ -140,15 +139,13 @@ func (s *clientConnections) openConnection(ctx context.Context, destAddr net.Add
140139
}
141140

142141
quicConfig := &quic.Config{
143-
ConnectionIDLength: 12,
144142
KeepAlivePeriod: 0,
145143
HandshakeIdleTimeout: time.Second * 8,
146144
MaxIdleTimeout: time.Second * 300,
147-
Tracer: qlog.NewTracer(func(_ logging.Perspective, connID []byte) io.WriteCloser {
148-
return &QlogWriter{connID: connID}
149-
}),
145+
Tracer: func(ctx context.Context, p logging.Perspective, ci quic.ConnectionID) logging.ConnectionTracer {
146+
return qlog.NewConnectionTracer( &QlogWriter{connID: ci}, p, ci);
147+
},
150148
}
151-
152149
udpConn, _ := rawConn.(*net.UDPConn)
153150
if udpConn == nil {
154151
udpConn = rawConn.(*internet.PacketConnWrapper).Conn.(*net.UDPConn)
@@ -158,8 +155,11 @@ func (s *clientConnections) openConnection(ctx context.Context, destAddr net.Add
158155
rawConn.Close()
159156
return nil, err
160157
}
161-
162-
conn, err := quic.DialContext(context.Background(), sysConn, destAddr, "", tlsConfig.GetTLSConfig(tls.WithDestination(dest)), quicConfig)
158+
tr := quic.Transport{
159+
ConnectionIDLength: 12,
160+
Conn: sysConn,
161+
}
162+
conn, err := tr.Dial(context.Background(), destAddr, tlsConfig.GetTLSConfig(tls.WithDestination(dest)), quicConfig)
163163
if err != nil {
164164
sysConn.Close()
165165
return nil, err

‎transport/internet/quic/hub.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package quic
22

33
import (
44
"context"
5-
"io"
65
"time"
76

87
"github.com/quic-go/quic-go"
@@ -19,7 +18,7 @@ import (
1918
// Listener is an internet.Listener that listens for TCP connections.
2019
type Listener struct {
2120
rawConn *sysConn
22-
listener quic.Listener
21+
listener *quic.Listener
2322
done *done.Instance
2423
addConn internet.ConnHandler
2524
}
@@ -104,24 +103,26 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti
104103
}
105104

106105
quicConfig := &quic.Config{
107-
ConnectionIDLength: 12,
108106
KeepAlivePeriod: 0,
109107
HandshakeIdleTimeout: time.Second * 8,
110108
MaxIdleTimeout: time.Second * 300,
111109
MaxIncomingStreams: 32,
112110
MaxIncomingUniStreams: -1,
113-
Tracer: qlog.NewTracer(func(_ logging.Perspective, connID []byte) io.WriteCloser {
114-
return &QlogWriter{connID: connID}
115-
}),
111+
Tracer: func(ctx context.Context, p logging.Perspective, ci quic.ConnectionID) logging.ConnectionTracer {
112+
return qlog.NewConnectionTracer( &QlogWriter{connID: ci}, p, ci);
113+
},
116114
}
117115

118116
conn, err := wrapSysConn(rawConn.(*net.UDPConn), config)
119117
if err != nil {
120118
conn.Close()
121119
return nil, err
122120
}
123-
124-
qListener, err := quic.Listen(conn, tlsConfig.GetTLSConfig(), quicConfig)
121+
tr := quic.Transport{
122+
ConnectionIDLength: 12,
123+
Conn: conn,
124+
}
125+
qListener, err := tr.Listen(tlsConfig.GetTLSConfig(), quicConfig)
125126
if err != nil {
126127
conn.Close()
127128
return nil, err

‎transport/internet/quic/qlogWriter.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package quic
22

3+
import "github.com/quic-go/quic-go"
4+
35
type QlogWriter struct {
4-
connID []byte
6+
connID quic.ConnectionID
57
}
68

79
func (w *QlogWriter) Write(b []byte) (int, error) {

0 commit comments

Comments
 (0)