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

Refactor(proxy): replace with safeConnClose

Browse Source
This commit is contained in:
xjasonlyu
2021-07-16 17:51:58 +08:00
parent c2ad0930b0
commit 33e2aed86c
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/shadowsocks.go
View File

@@ -50,11 +50,7 @@ func (ss *Shadowsocks) DialContext(ctx context.Context, metadata *M.Metadata) (c
}
setKeepAlive(c)
defer func() {
if err != nil && c != nil {
c.Close()
}
}()
defer safeConnClose(c, err)
switch ss.obfsMode {
case "tls":

6
proxy/socks5.go
View File

@@ -39,11 +39,7 @@ func (ss *Socks5) DialContext(ctx context.Context, metadata *M.Metadata) (c net.
}
setKeepAlive(c)
defer func() {
if err != nil && c != nil {
c.Close()
}
}()
defer safeConnClose(c, err)
var user *socks5.User
if ss.user != "" {

7
proxy/keepalive.go → proxy/util.go
View File

@@ -16,3 +16,10 @@ func setKeepAlive(c net.Conn) {
tcp.SetKeepAlivePeriod(tcpKeepAlivePeriod)
}
}
// safeConnClose closes tcp connection safely.
func safeConnClose(c net.Conn, err error) {
if c != nil && err != nil {
c.Close()
}
}