package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-05 08:47:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Feature: cli tcp-wait-timeout option (#156)

Browse Source 
Co-authored-by: xjasonlyu <xjasonlyu@gmail.com>
This commit is contained in:
Solyn
2023-03-29 17:41:01 +08:00
committed by GitHub
parent fb9ca95909
commit 2c51a65685
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/engine.go
View File

@@ -123,6 +123,10 @@ func general(k *Key) error {
log.Infof("[DIALER] set fwmark: %#x", k.Mark) log.Infof("[DIALER] set fwmark: %#x", k.Mark)
} }
if k.TCPWaitTimeout > 0 {
tunnel.SetTCPWaitTimeout(k.TCPWaitTimeout)
}
if k.UDPTimeout > 0 { if k.UDPTimeout > 0 {
if k.UDPTimeout < time.Second { if k.UDPTimeout < time.Second {
return errors.New("invalid udp timeout value") return errors.New("invalid udp timeout value")

1
engine/key.go
View File

@@ -13,6 +13,7 @@ type Key struct {
TCPModerateReceiveBuffer bool `yaml:"tcp-moderate-receive-buffer"` TCPModerateReceiveBuffer bool `yaml:"tcp-moderate-receive-buffer"`
TCPSendBufferSize string `yaml:"tcp-send-buffer-size"` TCPSendBufferSize string `yaml:"tcp-send-buffer-size"`
TCPReceiveBufferSize string `yaml:"tcp-receive-buffer-size"` TCPReceiveBufferSize string `yaml:"tcp-receive-buffer-size"`
TCPWaitTimeout time.Duration `yaml:"tcp-wait-timeout"`
UDPRelayBufferSize string `yaml:"udp-relay-buffer-size"` UDPRelayBufferSize string `yaml:"udp-relay-buffer-size"`
UDPTimeout time.Duration `yaml:"udp-timeout"` UDPTimeout time.Duration `yaml:"udp-timeout"`
TUNPreUp string `yaml:"tun-pre-up"` TUNPreUp string `yaml:"tun-pre-up"`

1
main.go
View File

@@ -37,6 +37,7 @@ func init() {
flag.StringVar(&key.TCPReceiveBufferSize, "tcp-rcvbuf", "", "Set TCP receive buffer size for netstack") flag.StringVar(&key.TCPReceiveBufferSize, "tcp-rcvbuf", "", "Set TCP receive buffer size for netstack")
flag.StringVar(&key.UDPRelayBufferSize, "udp-rlybuf", "", "Set UDP relay buffer size for tunnel") flag.StringVar(&key.UDPRelayBufferSize, "udp-rlybuf", "", "Set UDP relay buffer size for tunnel")
flag.BoolVar(&key.TCPModerateReceiveBuffer, "tcp-auto-tuning", false, "Enable TCP receive buffer auto-tuning") flag.BoolVar(&key.TCPModerateReceiveBuffer, "tcp-auto-tuning", false, "Enable TCP receive buffer auto-tuning")
flag.DurationVar(&key.TCPWaitTimeout, "tcp-wait-timeout", 0, "Set timeout before closing each TCP connection")
flag.StringVar(&key.TUNPreUp, "tun-pre-up", "", "Execute a command before TUN device setup") flag.StringVar(&key.TUNPreUp, "tun-pre-up", "", "Execute a command before TUN device setup")
flag.StringVar(&key.TUNPostUp, "tun-post-up", "", "Execute a command after TUN device setup") flag.StringVar(&key.TUNPostUp, "tun-post-up", "", "Execute a command after TUN device setup")
flag.BoolVar(&versionFlag, "version", false, "Show version and then quit") flag.BoolVar(&versionFlag, "version", false, "Show version and then quit")

12
tunnel/tcp.go
View File

@@ -16,9 +16,11 @@ import (
"github.com/xjasonlyu/tun2socks/v2/tunnel/statistic" "github.com/xjasonlyu/tun2socks/v2/tunnel/statistic"
) )
const ( var _tcpWaitTimeout = 5 * time.Second
tcpWaitTimeout = 5 * time.Second
) func SetTCPWaitTimeout(t time.Duration) {
_tcpWaitTimeout = t
}
func handleTCPConn(localConn adapter.TCPConn) { func handleTCPConn(localConn adapter.TCPConn) {
defer localConn.Close() defer localConn.Close()
@@ -60,7 +62,7 @@ func relay(left, right net.Conn) error {
if err := copyBuffer(right, left); err != nil { if err := copyBuffer(right, left); err != nil {
leftErr = errors.Join(leftErr, err) leftErr = errors.Join(leftErr, err)
} }
right.SetReadDeadline(time.Now().Add(tcpWaitTimeout)) right.SetReadDeadline(time.Now().Add(_tcpWaitTimeout))
}() }()
go func() { go func() {
@@ -68,7 +70,7 @@ func relay(left, right net.Conn) error {
if err := copyBuffer(left, right); err != nil { if err := copyBuffer(left, right); err != nil {
rightErr = errors.Join(rightErr, err) rightErr = errors.Join(rightErr, err)
} }
left.SetReadDeadline(time.Now().Add(tcpWaitTimeout)) left.SetReadDeadline(time.Now().Add(_tcpWaitTimeout))
}() }()
wg.Wait() wg.Wait()