Skip to content

Commit

Permalink
Pull request 345: upd-quic-go
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 21a2b13
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 26 14:01:20 2024 +0300

    all: upd to quic-go master

commit 69feed2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 24 14:24:57 2024 +0300

    all: upd quic-go
  • Loading branch information
ainar-g committed Apr 26, 2024
1 parent 7d83299 commit c0b7b50
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 9 deletions.
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ require (
github.com/jessevdk/go-flags v1.5.0
github.com/miekg/dns v1.1.58
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/quic-go/quic-go v0.42.0
// TODO(a.garipov): Update to a tag when released.
github.com/quic-go/quic-go v0.42.1-0.20240424141022-12aa63824c7f
github.com/stretchr/testify v1.9.0
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8
golang.org/x/net v0.24.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
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/quic-go v0.42.0 h1:uSfdap0eveIl8KXnipv9K7nlwZ5IqLlYOpJ58u5utpM=
github.com/quic-go/quic-go v0.42.0/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
github.com/quic-go/quic-go v0.42.1-0.20240424141022-12aa63824c7f h1:L7x60Z6AW2giF/SvbDpMglGHJxtmFJV03khPwXLDScU=
github.com/quic-go/quic-go v0.42.1-0.20240424141022-12aa63824c7f/go.mod h1:132kz4kL3F9vxhW3CtQJLDVwcFe5wdWeJXXijhsO57M=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
Expand Down
2 changes: 1 addition & 1 deletion proxy/server_https_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ func createTestHTTPClient(dnsProxy *Proxy, caPem []byte, http3Enabled bool) (cli
return quic.DialAddrEarly(ctx, addr, tlsCfg, cfg)
},
TLSClientConfig: tlsClientConfig,
QuicConfig: &quic.Config{},
QUICConfig: &quic.Config{},
DisableCompression: true,
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion upstream/doh.go
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ func (p *dnsOverHTTPS) createTransportH3(
},
DisableCompression: true,
TLSClientConfig: tlsConfig,
QuicConfig: p.getQUICConfig(),
QUICConfig: p.getQUICConfig(),
}

return &http3Transport{baseTransport: rt}, nil
Expand Down
4 changes: 0 additions & 4 deletions upstream/doh_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,6 @@ func TestUpstreamDoH_raceReconnect(t *testing.T) {
// important to test for race conditions.
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
if t.Name() == "TestUpstreamDoH_raceReconnect/http3" {
t.Skip("TODO(e.burkov): remove the skip when quic-go is fixed")
}

const timeout = time.Millisecond * 100
var requestsCount int32

Expand Down

0 comments on commit c0b7b50

Please sign in to comment.