chore: remove unused timeout in socks5 over tls

This commit is contained in:
wwqgtxx
2026-04-17 14:36:25 +08:00
parent 49858024ef
commit 37942ce9d8
3 changed files with 3 additions and 8 deletions
+1 -3
View File
@@ -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),
-2
View File
@@ -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
}
+2 -3
View File
@@ -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, &notCloseProxyAdapter{out})
if !assert.NoError(t, err) {