GuanM/hysteria-dev
1
0
Fork 0
mirror of https://github.com/cmz0228/hysteria-dev.git synced 2025-06-27 23:10:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: minor code tweaks

Browse Source
This commit is contained in:
Toby 2022-10-08 15:47:24 -07:00
parent 4cd18e6685
commit 4b2fd55060
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/client.go
View File

@ -75,14 +75,14 @@ func client(config *clientConfig) {
MaxStreamReceiveWindow: config.ReceiveWindowConn,
InitialConnectionReceiveWindow: config.ReceiveWindow,
MaxConnectionReceiveWindow: config.ReceiveWindow,
HandshakeIdleTimeout: time.Duration(config.QUICSettings.HandshakeIdleTimeout) * time.Second,
MaxIdleTimeout: time.Duration(config.QUICSettings.MaxIdleTimeout) * time.Second,
HandshakeIdleTimeout: time.Duration(config.Connectivity.HandshakeIdleTimeout) * time.Second,
MaxIdleTimeout: time.Duration(config.Connectivity.MaxIdleTimeout) * time.Second,
DisablePathMTUDiscovery: config.DisableMTUDiscovery,
EnableDatagrams: true,
}
quicConfig.KeepAlivePeriod = quicConfig.MaxIdleTimeout / 2
if quicConfig.KeepAlivePeriod == 0 || quicConfig.KeepAlivePeriod > KeepAlivePeriod {
quicConfig.KeepAlivePeriod = KeepAlivePeriod
if quicConfig.KeepAlivePeriod == 0 {
quicConfig.KeepAlivePeriod = DefaultKeepAlivePeriod
}
if config.ReceiveWindowConn == 0 {
quicConfig.InitialStreamReceiveWindow = DefaultStreamReceiveWindow
@ -147,14 +147,16 @@ func client(config *clientConfig) {
func(refBPS uint64) congestion.CongestionControl {
return hyCongestion.NewBrutalSender(congestion.ByteCount(refBPS))
}, obfuscator, func(err error) {
if config.QUICSettings.DisableAutoReconnect {
if config.Connectivity.DisableAutoReconnect {
logrus.WithFields(logrus.Fields{
"addr": config.Server,
"error": err,
}).Fatal("QUIC connection lost, exiting...")
}).Fatal("Connection to server lost, exiting...")
} else {
logrus.WithFields(logrus.Fields{
"addr": config.Server,
"error": err,
}).Info("QUIC connection lost, reconnecting...")
}).Info("Connection to server lost, reconnecting...")
}
})
if err != nil {

12
cmd/config.go
View File

@ -23,7 +23,7 @@ const (
DefaultMMDBFilename = "GeoLite2-Country.mmdb"
KeepAlivePeriod = 10 * time.Second
DefaultKeepAlivePeriod = 10 * time.Second
)
var rateStringRegexp = regexp.MustCompile(`^(\d+)\s*([KMGT]?)([Bb])ps$`)
@ -147,11 +147,11 @@ type clientConfig struct {
Retry int `json:"retry"`
RetryInterval int `json:"retry_interval"`
// Optional below
QUICSettings struct {
Connectivity struct {
DisableAutoReconnect bool `json:"disable_auto_reconnect"`
HandshakeIdleTimeout int `json:"handshake_idle_timeout"`
MaxIdleTimeout int `json:"max_idle_timeout"`
} `json:"quic_settings"`
} `json:"connectivity"`
SOCKS5 struct {
Listen string `json:"listen"`
Timeout int `json:"timeout"`
@ -236,6 +236,12 @@ func (c *clientConfig) Check() error {
len(c.TCPRedirect.Listen) == 0 {
return errors.New("please enable at least one mode")
}
if c.Connectivity.HandshakeIdleTimeout != 0 && c.Connectivity.HandshakeIdleTimeout <= 2 {
return errors.New("invalid handshake idle timeout")
}
if c.Connectivity.MaxIdleTimeout != 0 && c.Connectivity.MaxIdleTimeout <= 4 {
return errors.New("invalid max idle timeout")
}
if c.SOCKS5.Timeout != 0 && c.SOCKS5.Timeout <= 4 {
return errors.New("invalid SOCKS5 timeout")
}

2
cmd/server.go
View File

@ -77,7 +77,7 @@ func server(config *serverConfig) {
InitialConnectionReceiveWindow: config.ReceiveWindowClient,
MaxConnectionReceiveWindow: config.ReceiveWindowClient,
MaxIncomingStreams: int64(config.MaxConnClient),
KeepAlivePeriod: KeepAlivePeriod,
KeepAlivePeriod: DefaultKeepAlivePeriod,
DisablePathMTUDiscovery: config.DisableMTUDiscovery,
EnableDatagrams: true,
}