zhsj/wghttp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: always close client connections for socks5

Browse Source 
Cherry-pick https://github.com/tailscale/tailscale/commit/2fb08789
This commit is contained in:
Shengjing Zhu
2022-03-19 22:21:10 +08:00
parent e0249d22ba
commit 647790e5fe
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/third_party/tailscale/socks5/socks5.go vendored
View File

@@ -77,7 +77,7 @@ const (
type Server struct {
// Logf optionally specifies the logger to use.
// If nil, the standard logger is used.
Logf func(format string, args ...interface{})
Logf func(format string, args ...any)
// Dialer optionally specifies the dialer to use for outgoing connections.
// If nil, the net package's standard dialer is used.
@@ -93,7 +93,7 @@ func (s *Server) dial(ctx context.Context, network, addr string) (net.Conn, erro
return dial(ctx, network, addr)
}
func (s *Server) logf(format string, args ...interface{}) {
func (s *Server) logf(format string, args ...any) {
logf := s.Logf
if logf == nil {
logf = log.Printf
@@ -110,11 +110,11 @@ func (s *Server) Serve(l net.Listener) error {
return err
}
go func() {
defer c.Close()
conn := &Conn{clientConn: c, srv: s}
err := conn.Run()
if err != nil {
s.logf("client connection failed: %v", err)
conn.clientConn.Close()
}
}()
}