github/tun2socks
4
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2024-12-30 02:37:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: defer func for safeConnClose (#309)

Browse Source
This commit is contained in:
Jason Lyu
2023-10-24 09:13:36 +08:00
committed by GitHub
parent 2283f82bbc
commit 47913b549f
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/http.go
+3 -1
View File
@@ -41,7 +41,9 @@ func (h *HTTP) DialContext(ctx context.Context, metadata *M.Metadata) (c net.Con
} }
setKeepAlive(c) setKeepAlive(c)
defer safeConnClose(c, err) defer func(c net.Conn) {
safeConnClose(c, err)
}(c)
err = h.shakeHand(metadata, c) err = h.shakeHand(metadata, c)
return return
proxy/shadowsocks.go
+3 -1
View File
@@ -49,7 +49,9 @@ func (ss *Shadowsocks) DialContext(ctx context.Context, metadata *M.Metadata) (c
} }
setKeepAlive(c) setKeepAlive(c)
defer safeConnClose(c, err) defer func(c net.Conn) {
safeConnClose(c, err)
}(c)
switch ss.obfsMode { switch ss.obfsMode {
case "tls": case "tls":
proxy/socks4.go
+3 -1
View File
@@ -36,7 +36,9 @@ func (ss *Socks4) DialContext(ctx context.Context, metadata *M.Metadata) (c net.
} }
setKeepAlive(c) setKeepAlive(c)
defer safeConnClose(c, err) defer func(c net.Conn) {
safeConnClose(c, err)
}(c)
err = socks4.ClientHandshake(c, metadata.DestinationAddress(), socks4.CmdConnect, ss.userID) err = socks4.ClientHandshake(c, metadata.DestinationAddress(), socks4.CmdConnect, ss.userID)
return return
proxy/socks5.go
+3 -1
View File
@@ -49,7 +49,9 @@ func (ss *Socks5) DialContext(ctx context.Context, metadata *M.Metadata) (c net.
} }
setKeepAlive(c) setKeepAlive(c)
defer safeConnClose(c, err) defer func(c net.Conn) {
safeConnClose(c, err)
}(c)
var user *socks5.User var user *socks5.User
if ss.user != "" { if ss.user != "" {