diff --git a/adapter/outbound/singmux.go b/adapter/outbound/singmux.go index 44b03b64..0d923320 100644 --- a/adapter/outbound/singmux.go +++ b/adapter/outbound/singmux.go @@ -2,7 +2,6 @@ package outbound import ( "context" - "time" N "github.com/metacubex/mihomo/common/net" "github.com/metacubex/mihomo/component/proxydialer" @@ -29,7 +28,6 @@ type SingMuxOption struct { Padding bool `proxy:"padding,omitempty"` Statistic bool `proxy:"statistic,omitempty"` OnlyTcp bool `proxy:"only-tcp,omitempty"` - TCPTimeout int `proxy:"tcp-timeout,omitempty"` BrutalOpts BrutalOption `proxy:"brutal-opts,omitempty"` } @@ -105,7 +103,7 @@ func NewSingMux(option SingMuxOption, proxy ProxyAdapter) (ProxyAdapter, error) MinStreams: option.MinStreams, MaxStreams: option.MaxStreams, Padding: option.Padding, - TCPTimeout: time.Duration(option.TCPTimeout) * time.Second, + TCPTimeout: C.DefaultTCPTimeout, Brutal: mux.BrutalOptions{ Enabled: option.BrutalOpts.Enabled, SendBPS: StringToBps(option.BrutalOpts.Up), diff --git a/adapter/outbound/socks5.go b/adapter/outbound/socks5.go index 514223b9..912856fd 100644 --- a/adapter/outbound/socks5.go +++ b/adapter/outbound/socks5.go @@ -98,8 +98,6 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata) if ss.tls { cc := tls.Client(c, ss.tlsConfig) - ctx, cancel := context.WithTimeout(context.Background(), C.DefaultTLSTimeout) - defer cancel() err = cc.HandshakeContext(ctx) c = cc } diff --git a/listener/inbound/mux_test.go b/listener/inbound/mux_test.go index 841797e6..96841dbf 100644 --- a/listener/inbound/mux_test.go +++ b/listener/inbound/mux_test.go @@ -29,9 +29,8 @@ func testSingMux(t *testing.T, tunnel *TestTunnel, out outbound.ProxyAdapter) { protocol := protocol t.Run(protocol, func(t *testing.T) { singMuxOption := outbound.SingMuxOption{ - Enabled: true, - Protocol: protocol, - TCPTimeout: 30, // set a timeout value that is slightly larger than the default + Enabled: true, + Protocol: protocol, } out, err := outbound.NewSingMux(singMuxOption, ¬CloseProxyAdapter{out}) if !assert.NoError(t, err) {