xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: better safeConnClose

Browse source
This commit is contained in:
gVisor bot 2022-12-16 22:15:44 +08:00
parent cad40326f3
commit 78a2dbd9d8
8 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adapter/outbound/http.go
View file

@ -67,9 +67,9 @@ func (h *Http) DialContext(ctx context.Context, metadata *C.Metadata, opts ...di
} }
tcpKeepAlive(c) tcpKeepAlive(c)
defer func() { defer func(c net.Conn) {
safeConnClose(c, err) safeConnClose(c, err)
}() }(c)
c, err = h.StreamConn(c, metadata) c, err = h.StreamConn(c, metadata)
if err != nil { if err != nil {

4
adapter/outbound/shadowsocks.go
View file

@ -90,9 +90,9 @@ func (ss *ShadowSocks) DialContext(ctx context.Context, metadata *C.Metadata, op
} }
tcpKeepAlive(c) tcpKeepAlive(c)
defer func() { defer func(c net.Conn) {
safeConnClose(c, err) safeConnClose(c, err)
}() }(c)
c, err = ss.StreamConn(c, metadata) c, err = ss.StreamConn(c, metadata)
return NewConn(c, ss), err return NewConn(c, ss), err

4
adapter/outbound/shadowsocksr.go
View file

@ -66,9 +66,9 @@ func (ssr *ShadowSocksR) DialContext(ctx context.Context, metadata *C.Metadata,
} }
tcpKeepAlive(c) tcpKeepAlive(c)
defer func() { defer func(c net.Conn) {
safeConnClose(c, err) safeConnClose(c, err)
}() }(c)
c, err = ssr.StreamConn(c, metadata) c, err = ssr.StreamConn(c, metadata)
return NewConn(c, ssr), err return NewConn(c, ssr), err

4
adapter/outbound/snell.go
View file

@ -84,9 +84,9 @@ func (s *Snell) DialContext(ctx context.Context, metadata *C.Metadata, opts ...d
} }
tcpKeepAlive(c) tcpKeepAlive(c)
defer func() { defer func(c net.Conn) {
safeConnClose(c, err) safeConnClose(c, err)
}() }(c)
c, err = s.StreamConn(c, metadata) c, err = s.StreamConn(c, metadata)
return NewConn(c, s), err return NewConn(c, s), err

8
adapter/outbound/socks5.go
View file

@ -71,9 +71,9 @@ func (ss *Socks5) DialContext(ctx context.Context, metadata *C.Metadata, opts ..
} }
tcpKeepAlive(c) tcpKeepAlive(c)
defer func() { defer func(c net.Conn) {
safeConnClose(c, err) safeConnClose(c, err)
}() }(c)
c, err = ss.StreamConn(c, metadata) c, err = ss.StreamConn(c, metadata)
if err != nil { if err != nil {
@ -99,9 +99,9 @@ func (ss *Socks5) ListenPacketContext(ctx context.Context, metadata *C.Metadata,
c = cc c = cc
} }
defer func() { defer func(c net.Conn) {
safeConnClose(c, err) safeConnClose(c, err)
}() }(c)
tcpKeepAlive(c) tcpKeepAlive(c)
var user *socks5.User var user *socks5.User

4
adapter/outbound/trojan.go
View file

@ -127,9 +127,9 @@ func (t *Trojan) DialContext(ctx context.Context, metadata *C.Metadata, opts ...
} }
tcpKeepAlive(c) tcpKeepAlive(c)
defer func() { defer func(c net.Conn) {
safeConnClose(c, err) safeConnClose(c, err)
}() }(c)
c, err = t.StreamConn(c, metadata) c, err = t.StreamConn(c, metadata)
if err != nil { if err != nil {

4
adapter/outbound/vless.go
View file

@ -225,9 +225,9 @@ func (v *Vless) DialContext(ctx context.Context, metadata *C.Metadata, opts ...d
return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error()) return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
} }
tcpKeepAlive(c) tcpKeepAlive(c)
defer func() { defer func(c net.Conn) {
safeConnClose(c, err) safeConnClose(c, err)
}() }(c)
c, err = v.StreamConn(c, metadata) c, err = v.StreamConn(c, metadata)
return NewConn(c, v), err return NewConn(c, v), err

4
adapter/outbound/vmess.go
View file

@ -238,9 +238,9 @@ func (v *Vmess) DialContext(ctx context.Context, metadata *C.Metadata, opts ...d
return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error()) return nil, fmt.Errorf("%s connect error: %s", v.addr, err.Error())
} }
tcpKeepAlive(c) tcpKeepAlive(c)
defer func() { defer func(c net.Conn) {
safeConnClose(c, err) safeConnClose(c, err)
}() }(c)
c, err = v.StreamConn(c, metadata) c, err = v.StreamConn(c, metadata)
return NewConn(c, v), err return NewConn(c, v), err