chore: update to [email protected]

go.mod

@@ -29,7 +29,7 @@ require (
 	github.com/pborman/getopt/v2 v2.1.0
 	github.com/pion/stun v0.6.1
 	github.com/pkg/errors v0.9.1
-	github.com/quic-go/quic-go v0.39.0
+	github.com/quic-go/quic-go v0.40.1
 	github.com/rogpeppe/go-internal v1.11.0
 	github.com/rubenv/sql-migrate v1.5.2
 	github.com/schollz/progressbar/v3 v3.14.1
@@ -68,7 +68,7 @@ require (
 	github.com/pion/transport/v2 v2.2.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
-	github.com/quic-go/qtls-go1-20 v0.3.4 // indirect
+	github.com/quic-go/qtls-go1-20 v0.4.1 // indirect
 	github.com/refraction-networking/conjure v0.7.10-0.20231110193225-e4749a9dedc9 // indirect
 	github.com/refraction-networking/ed25519 v0.1.2 // indirect
 	github.com/refraction-networking/obfs4 v0.1.2 // indirect

go.sum

@@ -415,10 +415,10 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
-github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg=
-github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
-github.com/quic-go/quic-go v0.39.0 h1:AgP40iThFMY0bj8jGxROhw3S0FMGa8ryqsmi9tBH3So=
-github.com/quic-go/quic-go v0.39.0/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q=
+github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
+github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
+github.com/quic-go/quic-go v0.40.1 h1:X3AGzUNFs0jVuO3esAGnTfvdgvL4fq655WaOi1snv1Q=
+github.com/quic-go/quic-go v0.40.1/go.mod h1:PeN7kuVJ4xZbxSv/4OX6S1USOX8MJvydwpTx31vx60c=
 github.com/refraction-networking/conjure v0.7.10-0.20231110193225-e4749a9dedc9 h1:46+z0lVJL5ynP09dtThex4GiowaANoBk7DsNF0+a+7Q=
 github.com/refraction-networking/conjure v0.7.10-0.20231110193225-e4749a9dedc9/go.mod h1:O5u/Mpg5b3whLF8L701pTMQW23SviS+rDKdWbY/BM0Q=
 github.com/refraction-networking/ed25519 v0.1.2 h1:08kJZUkAlY7a7cZGosl1teGytV+QEoNxPO7NnRvAB+g=

internal/mocks/quic.go

@@ -49,8 +49,8 @@ type QUICEarlyConnection struct {
 	MockConnectionState   func() quic.ConnectionState
 	MockHandshakeComplete func() <-chan struct{}
 	MockNextConnection    func() quic.Connection
-	MockSendMessage       func(b []byte) error
-	MockReceiveMessage    func(ctx context.Context) ([]byte, error)
+	MockSendDatagram      func(b []byte) error
+	MockReceiveDatagram   func(ctx context.Context) ([]byte, error)
 }
 
 var _ quic.EarlyConnection = &QUICEarlyConnection{}
@@ -121,14 +121,14 @@ func (s *QUICEarlyConnection) NextConnection() quic.Connection {
 	return s.MockNextConnection()
 }
 
-// SendMessage calls MockSendMessage.
-func (s *QUICEarlyConnection) SendMessage(b []byte) error {
-	return s.MockSendMessage(b)
+// SendDatagram calls MockSendDatagram.
+func (s *QUICEarlyConnection) SendDatagram(b []byte) error {
+	return s.MockSendDatagram(b)
 }
 
-// ReceiveMessage calls MockReceiveMessage.
-func (s *QUICEarlyConnection) ReceiveMessage(ctx context.Context) ([]byte, error) {
-	return s.MockReceiveMessage(ctx)
+// ReceiveDatagram calls MockReceiveDatagram.
+func (s *QUICEarlyConnection) ReceiveDatagram(ctx context.Context) ([]byte, error) {
+	return s.MockReceiveDatagram(ctx)
 }
 
 // UDPLikeConn is an UDP conn used by QUIC.

internal/mocks/quic_test.go

@@ -239,29 +239,29 @@ func TestQUICEarlyConnection(t *testing.T) {
 		}
 	})
 
-	t.Run("SendMessage", func(t *testing.T) {
+	t.Run("SendDatagram", func(t *testing.T) {
 		expected := errors.New("mocked error")
 		qconn := &QUICEarlyConnection{
-			MockSendMessage: func(b []byte) error {
+			MockSendDatagram: func(b []byte) error {
 				return expected
 			},
 		}
 		b := make([]byte, 17)
-		err := qconn.SendMessage(b)
+		err := qconn.SendDatagram(b)
 		if !errors.Is(err, expected) {
 			t.Fatal("not the error we expected", err)
 		}
 	})
 
-	t.Run("ReceiveMessage", func(t *testing.T) {
+	t.Run("ReceiveDatagram", func(t *testing.T) {
 		expected := errors.New("mocked error")
 		ctx := context.Background()
 		qconn := &QUICEarlyConnection{
-			MockReceiveMessage: func(ctx context.Context) ([]byte, error) {
+			MockReceiveDatagram: func(ctx context.Context) ([]byte, error) {
 				return nil, expected
 			},
 		}
-		b, err := qconn.ReceiveMessage(ctx)
+		b, err := qconn.ReceiveDatagram(ctx)
 		if !errors.Is(err, expected) {
 			t.Fatal("not the error we expected", err)
 		}

internal/netemx/http3.go

@@ -104,10 +104,14 @@ func (srv *http3Server) mustListenPortLocked(handler http.Handler, ipAddr net.IP
 	}
 	go srvr.Serve(listener)
 
-	// make sure we track and close the listener: assuming the server was closing the
-	// listener seems to be the root cause of https://github.com/ooni/probe/issues/2527
-	// and closing the listener completely fixes the issue.
-	srv.closers = append(srv.closers, listener)
+	// For quic-go < 0.40.0, we needed the following fix as documented by the
+	// https://github.com/ooni/probe/issues/2527 issue.
+	//
+	//	srv.closers = append(srv.closers, listener)
+	//
+	// After upgrading to quic-go/[email protected] (https://github.com/ooni/probe-cli/pull/1428)
+	// the above fix actually makes the code hang forever. We want to keep this message
+	// around for a couple of cycles (say until ooni/probe-cli < 3.22).
 
 	// make sure we track the server
 	srv.closers = append(srv.closers, srvr)