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

feat(tun): use time.Duration for timeout config

Browse source 
matches timeout config of other inbounds
This commit is contained in:
Haruue 2024-03-19 15:48:57 +08:00
parent 4aec8166b3
commit 0cde4f405f
No known key found for this signature in database
GPG key ID: F6083B28CBCBC148
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/cmd/client.go
View file

@ -150,11 +150,11 @@ type tcpRedirectConfig struct {
}
type tunConfig struct {
Name string `mapstructure:"name"`
MTU uint32 `mapstructure:"mtu"`
UDPTimeout int64 `mapstructure:"udpTimeout"`
Prefix4 string `mapstructure:"prefix4"`
Prefix6 string `mapstructure:"prefix6"`
Name string `mapstructure:"name"`
MTU uint32 `mapstructure:"mtu"`
Timeout time.Duration `mapstructure:"timeout"`
Prefix4 string `mapstructure:"prefix4"`
Prefix6 string `mapstructure:"prefix6"`
}
func (c *clientConfig) fillServerAddr(hyConfig *client.Config) error {
@ -680,8 +680,9 @@ func clientTUN(config tunConfig, c client.Client) error {
if config.MTU == 0 {
config.MTU = 1500
}
if config.UDPTimeout == 0 {
config.UDPTimeout = 300
timeout := int64(config.Timeout.Seconds())
if timeout == 0 {
timeout = 300
}
if config.Prefix4 == "" {
config.Prefix4 = "100.100.100.101/30"
@ -703,7 +704,7 @@ func clientTUN(config tunConfig, c client.Client) error {
Logger: logger,
IfName: config.Name,
MTU: config.MTU,
UDPTimeout: config.UDPTimeout,
Timeout: timeout,
Inet4Address: []netip.Prefix{prefix4},
Inet6Address: []netip.Prefix{prefix6},
}

8
app/internal/tun/server.go
View file

@ -22,9 +22,9 @@ type Server struct {
// for debugging
Logger *zap.Logger
IfName string
MTU uint32
UDPTimeout int64 // in seconds
IfName string
MTU uint32
Timeout int64 // in seconds, also applied to TCP in system stack
// required by system stack
Inet4Address []netip.Prefix
@ -60,7 +60,7 @@ func (s *Server) Serve() error {
Context: context.Background(),
Tun: tunIf,
TunOptions: tunOpts,
UDPTimeout: s.UDPTimeout,
UDPTimeout: s.Timeout,
Handler: &tunHandler{s},
Logger: &singLogger{
tag: "tun-stack",