Skip to content

Commit 90bb5ef

Browse files
MarcoPoloMarcoPolo
authored
chore: update quic-go to v0.50.0 (#3204)
1 parent 8c6f0a7 commit 90bb5ef

File tree

7 files changed

+56
-24
lines changed

7 files changed

+56
-24
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ require (
5555
github.com/pion/webrtc/v4 v4.0.9
5656
github.com/prometheus/client_golang v1.20.5
5757
github.com/prometheus/client_model v0.6.1
58-
github.com/quic-go/quic-go v0.49.0
58+
github.com/quic-go/quic-go v0.50.0
5959
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66
6060
github.com/raulk/go-watchdog v1.3.0
6161
github.com/stretchr/testify v1.10.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg
330330
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
331331
github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
332332
github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
333-
github.com/quic-go/quic-go v0.49.0 h1:w5iJHXwHxs1QxyBv1EHKuC50GX5to8mJAxvtnttJp94=
334-
github.com/quic-go/quic-go v0.49.0/go.mod h1:s2wDnmCdooUQBmQfpUSTCYBl1/D4FcqbULMMkASvR6s=
333+
github.com/quic-go/quic-go v0.50.0 h1:3H/ld1pa3CYhkcc20TPIyG1bNsdhn9qZBGN3b9/UyUo=
334+
github.com/quic-go/quic-go v0.50.0/go.mod h1:Vim6OmUvlYdwBhXP9ZVrtGmCMWa3wEqhq3NgYrI8b4E=
335335
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 h1:4WFk6u3sOT6pLa1kQ50ZVdm8BQFgJNA117cepZxtLIg=
336336
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66/go.mod h1:Vp72IJajgeOL6ddqrAhmp7IM9zbTcgkQxD/YdxrVwMw=
337337
github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=

‎p2p/transport/quic/conn_test.go

+23-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"context"
66
"crypto/rand"
77
"errors"
8-
"fmt"
98
"io"
109
mrand "math/rand"
1110
"net"
@@ -564,6 +563,13 @@ func TestStatelessReset(t *testing.T) {
564563
}
565564
}
566565

566+
func newUDPConnLocalhost(t testing.TB, port int) (*net.UDPConn, func()) {
567+
t.Helper()
568+
conn, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: port})
569+
require.NoError(t, err)
570+
return conn, func() { conn.Close() }
571+
}
572+
567573
func testStatelessReset(t *testing.T, tc *connTestCase) {
568574
serverID, serverKey := createPeer(t)
569575
_, clientKey := createPeer(t)
@@ -575,12 +581,14 @@ func testStatelessReset(t *testing.T, tc *connTestCase) {
575581

576582
var drop uint32
577583
dropCallback := func(quicproxy.Direction, []byte) bool { return atomic.LoadUint32(&drop) > 0 }
578-
proxy, err := quicproxy.NewQuicProxy("localhost:0", &quicproxy.Opts{
579-
RemoteAddr: fmt.Sprintf("localhost:%d", ln.Addr().(*net.UDPAddr).Port),
584+
proxyConn, cleanup := newUDPConnLocalhost(t, 0)
585+
proxy := quicproxy.Proxy{
586+
Conn: proxyConn,
587+
ServerAddr: ln.Addr().(*net.UDPAddr),
580588
DropPacket: dropCallback,
581-
})
589+
}
590+
err = proxy.Start()
582591
require.NoError(t, err)
583-
proxyLocalAddr := proxy.LocalAddr()
584592

585593
// establish a connection
586594
clientTransport, err := NewTransport(clientKey, newConnManager(t, tc.Options...), nil, nil, nil)
@@ -612,7 +620,9 @@ func testStatelessReset(t *testing.T, tc *connTestCase) {
612620
atomic.StoreUint32(&drop, 1)
613621
ln.Close()
614622
(<-connChan).Close()
623+
proxyLocalPort := proxy.LocalAddr().(*net.UDPAddr).Port
615624
proxy.Close()
625+
cleanup()
616626

617627
// Start another listener (on a different port).
618628
ln, err = serverTransport.Listen(ma.StringCast("/ip4/127.0.0.1/udp/0/quic-v1"))
@@ -621,13 +631,17 @@ func testStatelessReset(t *testing.T, tc *connTestCase) {
621631
// Now that the new server is up, re-enable packet forwarding.
622632
atomic.StoreUint32(&drop, 0)
623633

634+
proxyConn, cleanup = newUDPConnLocalhost(t, proxyLocalPort)
635+
defer cleanup()
624636
// Recreate the proxy, such that its client-facing port stays constant.
625-
proxy, err = quicproxy.NewQuicProxy(proxyLocalAddr.String(), &quicproxy.Opts{
626-
RemoteAddr: fmt.Sprintf("localhost:%d", ln.Addr().(*net.UDPAddr).Port),
637+
proxyBis := quicproxy.Proxy{
638+
Conn: proxyConn,
639+
ServerAddr: ln.Addr().(*net.UDPAddr),
627640
DropPacket: dropCallback,
628-
})
641+
}
642+
err = proxyBis.Start()
629643
require.NoError(t, err)
630-
defer proxy.Close()
644+
defer proxyBis.Close()
631645

632646
// Trigger something (not too small) to be sent, so that we receive the stateless reset.
633647
// The new server doesn't have any state for the previously established connection.

‎p2p/transport/webrtc/transport_test.go

+13-4
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,14 @@ func TestTransportWebRTC_PeerConnectionDTLSFailed(t *testing.T) {
776776
require.Nil(t, conn)
777777
}
778778

779+
func newUDPConnLocalhost(t testing.TB) *net.UDPConn {
780+
t.Helper()
781+
conn, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 0})
782+
require.NoError(t, err)
783+
t.Cleanup(func() { conn.Close() })
784+
return conn
785+
}
786+
779787
func TestConnectionTimeoutOnListener(t *testing.T) {
780788
tr, listeningPeer := getTransport(t)
781789
tr.peerConnectionTimeouts.Disconnect = 100 * time.Millisecond
@@ -788,11 +796,12 @@ func TestConnectionTimeoutOnListener(t *testing.T) {
788796
defer ln.Close()
789797

790798
var drop atomic.Bool
791-
proxy, err := quicproxy.NewQuicProxy("127.0.0.1:0", &quicproxy.Opts{
792-
RemoteAddr: fmt.Sprintf("127.0.0.1:%d", ln.Addr().(*net.UDPAddr).Port),
799+
proxy := quicproxy.Proxy{
800+
Conn: newUDPConnLocalhost(t),
801+
ServerAddr: ln.Addr().(*net.UDPAddr),
793802
DropPacket: func(quicproxy.Direction, []byte) bool { return drop.Load() },
794-
})
795-
require.NoError(t, err)
803+
}
804+
require.NoError(t, proxy.Start())
796805
defer proxy.Close()
797806

798807
tr1, connectingPeer := getTransport(t)

‎p2p/transport/webtransport/transport_test.go

+14-5
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,14 @@ func (s *reportingScope) ReserveMemory(size int, _ uint8) error {
540540
return nil
541541
}
542542

543+
func newUDPConnLocalhost(t testing.TB) *net.UDPConn {
544+
t.Helper()
545+
conn, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 0})
546+
require.NoError(t, err)
547+
t.Cleanup(func() { conn.Close() })
548+
return conn
549+
}
550+
543551
func TestFlowControlWindowIncrease(t *testing.T) {
544552
if runtime.GOOS == "windows" {
545553
t.Skip("this test is flaky on Windows")
@@ -573,11 +581,12 @@ func TestFlowControlWindowIncrease(t *testing.T) {
573581
str.CloseWrite()
574582
}()
575583

576-
proxy, err := quicproxy.NewQuicProxy("localhost:0", &quicproxy.Opts{
577-
RemoteAddr: ln.Addr().String(),
584+
proxy := quicproxy.Proxy{
585+
Conn: newUDPConnLocalhost(t),
586+
ServerAddr: ln.Addr().(*net.UDPAddr),
578587
DelayPacket: func(quicproxy.Direction, []byte) time.Duration { return rtt / 2 },
579-
})
580-
require.NoError(t, err)
588+
}
589+
require.NoError(t, proxy.Start())
581590
defer proxy.Close()
582591

583592
_, clientKey := newIdentity(t)
@@ -590,7 +599,7 @@ func TestFlowControlWindowIncrease(t *testing.T) {
590599
var addr ma.Multiaddr
591600
for _, comp := range ma.Split(ln.Multiaddr()) {
592601
if _, err := comp.ValueForProtocol(ma.P_UDP); err == nil {
593-
addr = addr.Encapsulate(ma.StringCast(fmt.Sprintf("/udp/%d", proxy.LocalPort())))
602+
addr = addr.Encapsulate(ma.StringCast(fmt.Sprintf("/udp/%d", proxy.LocalAddr().(*net.UDPAddr).Port)))
594603
continue
595604
}
596605
if addr == nil {

‎test-plans/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ require (
8888
github.com/prometheus/common v0.62.0 // indirect
8989
github.com/prometheus/procfs v0.15.1 // indirect
9090
github.com/quic-go/qpack v0.5.1 // indirect
91-
github.com/quic-go/quic-go v0.49.0 // indirect
91+
github.com/quic-go/quic-go v0.50.0 // indirect
9292
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 // indirect
9393
github.com/raulk/go-watchdog v1.3.0 // indirect
9494
github.com/spaolacci/murmur3 v1.1.0 // indirect

‎test-plans/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg
276276
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
277277
github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
278278
github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
279-
github.com/quic-go/quic-go v0.49.0 h1:w5iJHXwHxs1QxyBv1EHKuC50GX5to8mJAxvtnttJp94=
280-
github.com/quic-go/quic-go v0.49.0/go.mod h1:s2wDnmCdooUQBmQfpUSTCYBl1/D4FcqbULMMkASvR6s=
279+
github.com/quic-go/quic-go v0.50.0 h1:3H/ld1pa3CYhkcc20TPIyG1bNsdhn9qZBGN3b9/UyUo=
280+
github.com/quic-go/quic-go v0.50.0/go.mod h1:Vim6OmUvlYdwBhXP9ZVrtGmCMWa3wEqhq3NgYrI8b4E=
281281
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66 h1:4WFk6u3sOT6pLa1kQ50ZVdm8BQFgJNA117cepZxtLIg=
282282
github.com/quic-go/webtransport-go v0.8.1-0.20241018022711-4ac2c9250e66/go.mod h1:Vp72IJajgeOL6ddqrAhmp7IM9zbTcgkQxD/YdxrVwMw=
283283
github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=

0 commit comments

Comments
 (0)