mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 04:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: update in quic-go (http3) broke UDP functionality

Browse source
This commit is contained in:
Toby 2024-04-28 20:22:11 -07:00
parent d2805577ff
commit b79c43171a
10 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/client/client.go
View file

@ -87,7 +87,6 @@ func (c *clientImpl) connect() (*HandshakeInfo, error) {
// Prepare RoundTripper
var conn quic.EarlyConnection
rt := &http3.RoundTripper{
EnableDatagrams: true,
TLSClientConfig: tlsConfig,
QUICConfig: quicConfig,
Dial: func(ctx context.Context, _ string, tlsCfg *tls.Config, cfg *quic.Config) (quic.EarlyConnection, error) {

2
core/go.mod
View file

@ -3,7 +3,7 @@ module github.com/apernet/hysteria/core
go 1.21
require (
github.com/apernet/quic-go v0.43.1-0.20240427194602-3797cae21bac
github.com/apernet/quic-go v0.43.1-0.20240429030958-51a0843014d6
github.com/stretchr/testify v1.8.4
go.uber.org/goleak v1.2.1
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db

4
core/go.sum
View file

@ -1,5 +1,5 @@
github.com/apernet/quic-go v0.43.1-0.20240427194602-3797cae21bac h1:mL7OmpIRnux5nkKC4801CzwNmhlIzzejN5H5AfmVFWc=
github.com/apernet/quic-go v0.43.1-0.20240427194602-3797cae21bac/go.mod h1:j3QaAM7sVJqptDQyIQRWA6mASCfuxoHJszn67JQh1GE=
github.com/apernet/quic-go v0.43.1-0.20240429030958-51a0843014d6 h1:ZfaQo52EyyhNCxfMNk64W1YHcIh+0rCkp3e0gR7BO5E=
github.com/apernet/quic-go v0.43.1-0.20240429030958-51a0843014d6/go.mod h1:j3QaAM7sVJqptDQyIQRWA6mASCfuxoHJszn67JQh1GE=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=

1
core/internal/integration_tests/masq_test.go
View file

@ -41,7 +41,6 @@ func TestServerMasquerade(t *testing.T) {
// QUIC connection & RoundTripper
var conn quic.EarlyConnection
rt := &http3.RoundTripper{
EnableDatagrams: true,
TLSClientConfig: &tls.Config{
InsecureSkipVerify: true,
},

5
core/server/server.go
View file

@ -77,9 +77,8 @@ func (s *serverImpl) Close() error {
func (s *serverImpl) handleClient(conn quic.Connection) {
handler := newH3sHandler(s.config, conn)
h3s := http3.Server{
EnableDatagrams: true,
Handler: handler,
StreamHijacker: handler.ProxyStreamHijacker,
Handler: handler,
StreamHijacker: handler.ProxyStreamHijacker,
}
err := h3s.ServeQUICConn(conn)
// If the client is authenticated, we need to log the disconnect event