chore: update quic-go, adapt to lack of write tracking (#10456)

Signed-off-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
Jakob Borg
2025-11-16 00:48:28 +01:00
committed by GitHub
parent 9241a475e9
commit 488c33aef5
5 changed files with 35 additions and 85 deletions
+2 -6
View File
@@ -102,14 +102,10 @@ func (t *quicListener) serve(ctx context.Context) error {
}
defer udpConn.Close()
tracer := &writeTrackingTracer{}
quicTransport := &quic.Transport{
Conn: udpConn,
Tracer: tracer.loggingTracer(),
}
quicTransport := &quic.Transport{Conn: udpConn}
defer quicTransport.Close()
svc := stun.New(t.cfg, t, &transportPacketConn{tran: quicTransport}, tracer)
svc := stun.New(t.cfg, t, &transportPacketConn{tran: quicTransport})
stunCtx, cancel := context.WithCancel(ctx)
defer cancel()
go svc.Serve(stunCtx)
+4 -24
View File
@@ -18,7 +18,6 @@ import (
"time"
"github.com/quic-go/quic-go"
"github.com/quic-go/quic-go/logging"
"github.com/syncthing/syncthing/lib/osutil"
)
@@ -40,8 +39,8 @@ func quicNetwork(uri *url.URL) string {
}
type quicTlsConn struct {
quic.Connection
quic.Stream
*quic.Conn
*quic.Stream
// If we created this connection, we should be the ones closing it.
createdConn net.PacketConn
@@ -49,7 +48,7 @@ type quicTlsConn struct {
func (q *quicTlsConn) Close() error {
sterr := q.Stream.Close()
seerr := q.Connection.CloseWithError(0, "closing")
seerr := q.Conn.CloseWithError(0, "closing")
var pcerr error
if q.createdConn != nil {
pcerr = q.createdConn.Close()
@@ -64,7 +63,7 @@ func (q *quicTlsConn) Close() error {
}
func (q *quicTlsConn) ConnectionState() tls.ConnectionState {
return q.Connection.ConnectionState().TLS
return q.Conn.ConnectionState().TLS
}
func transportConnUnspecified(conn any) bool {
@@ -77,25 +76,6 @@ func transportConnUnspecified(conn any) bool {
return err == nil && ip.IsUnspecified()
}
type writeTrackingTracer struct {
lastWrite atomic.Int64 // unix nanos
}
func (t *writeTrackingTracer) loggingTracer() *logging.Tracer {
return &logging.Tracer{
SentPacket: func(net.Addr, *logging.Header, logging.ByteCount, []logging.Frame) {
t.lastWrite.Store(time.Now().UnixNano())
},
SentVersionNegotiationPacket: func(net.Addr, logging.ArbitraryLenConnectionID, logging.ArbitraryLenConnectionID, []logging.Version) {
t.lastWrite.Store(time.Now().UnixNano())
},
}
}
func (t *writeTrackingTracer) LastWrite() time.Time {
return time.Unix(0, t.lastWrite.Load())
}
// A transportPacketConn is a net.PacketConn that uses a quic.Transport.
type transportPacketConn struct {
tran *quic.Transport