mirror of
https://github.com/xjasonlyu/tun2socks.git
synced 2025-10-07 01:33:15 +08:00
Refactor(proxy): replace with safeConnClose
This commit is contained in:
@@ -50,11 +50,7 @@ func (ss *Shadowsocks) DialContext(ctx context.Context, metadata *M.Metadata) (c
|
|||||||
}
|
}
|
||||||
setKeepAlive(c)
|
setKeepAlive(c)
|
||||||
|
|
||||||
defer func() {
|
defer safeConnClose(c, err)
|
||||||
if err != nil && c != nil {
|
|
||||||
c.Close()
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
switch ss.obfsMode {
|
switch ss.obfsMode {
|
||||||
case "tls":
|
case "tls":
|
||||||
|
@@ -39,11 +39,7 @@ func (ss *Socks5) DialContext(ctx context.Context, metadata *M.Metadata) (c net.
|
|||||||
}
|
}
|
||||||
setKeepAlive(c)
|
setKeepAlive(c)
|
||||||
|
|
||||||
defer func() {
|
defer safeConnClose(c, err)
|
||||||
if err != nil && c != nil {
|
|
||||||
c.Close()
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
var user *socks5.User
|
var user *socks5.User
|
||||||
if ss.user != "" {
|
if ss.user != "" {
|
||||||
|
@@ -16,3 +16,10 @@ func setKeepAlive(c net.Conn) {
|
|||||||
tcp.SetKeepAlivePeriod(tcpKeepAlivePeriod)
|
tcp.SetKeepAlivePeriod(tcpKeepAlivePeriod)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// safeConnClose closes tcp connection safely.
|
||||||
|
func safeConnClose(c net.Conn, err error) {
|
||||||
|
if c != nil && err != nil {
|
||||||
|
c.Close()
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user