From 0cde4f405fe517c132f130fcc72f839f94af08c3 Mon Sep 17 00:00:00 2001
From: Haruue <i@haruue.moe>
Date: Tue, 19 Mar 2024 15:48:57 +0800
Subject: [PATCH] feat(tun): use time.Duration for timeout config

matches timeout config of other inbounds
---
 app/cmd/client.go          | 17 +++++++++--------
 app/internal/tun/server.go |  8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/cmd/client.go b/app/cmd/client.go
index 5c6868d..dca5ab0 100644
--- a/app/cmd/client.go
+++ b/app/cmd/client.go
@@ -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},
 	}
diff --git a/app/internal/tun/server.go b/app/internal/tun/server.go
index 452a42f..f1816e1 100644
--- a/app/internal/tun/server.go
+++ b/app/internal/tun/server.go
@@ -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",