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

feat: bump quic-go version to v0.35.1 (mod wip), change client config format for sni

Browse source
This commit is contained in:
tobyxdd 2023-06-02 16:51:17 -07:00
parent 41f10a22c4
commit 5586303825
16 changed files with 31 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/client/client.go
View file

@ -136,6 +136,7 @@ func (c *clientImpl) connect() (quic.Connection, func(), error) {
}
// Convert config to TLS config & QUIC config
tlsConfig := &tls.Config{
ServerName: c.config.TLSConfig.ServerName,
InsecureSkipVerify: c.config.TLSConfig.InsecureSkipVerify,
RootCAs: c.config.TLSConfig.RootCAs,
}
@ -156,7 +157,7 @@ func (c *clientImpl) connect() (quic.Connection, func(), error) {
TLSClientConfig: tlsConfig,
QuicConfig: quicConfig,
Dial: func(ctx context.Context, _ string, tlsCfg *tls.Config, cfg *quic.Config) (quic.EarlyConnection, error) {
qc, err := quic.DialEarlyContext(ctx, pktConn, c.config.ServerAddr, c.config.ServerName, tlsCfg, cfg)
qc, err := quic.DialEarly(ctx, pktConn, c.config.ServerAddr, tlsCfg, cfg)
if err != nil {
return nil, err
}

5
core/client/config.go
View file

@ -19,7 +19,6 @@ const (
type Config struct {
ConnFactory ConnFactory
ServerAddr net.Addr
ServerName string // host or host:port
Auth string
TLSConfig TLSConfig
QUICConfig QUICConfig
@ -36,9 +35,6 @@ func (c *Config) fill() error {
if c.ServerAddr == nil {
return errors.ConfigError{Field: "ServerAddr", Reason: "must be set"}
}
if c.ServerName == "" {
return errors.ConfigError{Field: "ServerName", Reason: "must be set"}
}
if c.QUICConfig.InitialStreamReceiveWindow == 0 {
c.QUICConfig.InitialStreamReceiveWindow = defaultStreamReceiveWindow
} else if c.QUICConfig.InitialStreamReceiveWindow < 16384 {
@ -85,6 +81,7 @@ func (f *udpConnFactory) New(addr net.Addr) (net.PacketConn, error) {
// TLSConfig contains the TLS configuration fields that we want to expose to the user.
type TLSConfig struct {
ServerName string
InsecureSkipVerify bool
RootCAs *x509.CertPool
}