chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix not closing outConn

Browse Source
This commit is contained in:
unknown 2023-11-12 03:28:10 +03:30
parent 8817a9c472
commit 8a7737dca1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
outbound/default.go
View File

@ -71,6 +71,7 @@ func NewConnection(ctx context.Context, this N.Dialer, conn net.Conn, metadata a
} }
err = N.ReportHandshakeSuccess(conn) err = N.ReportHandshakeSuccess(conn)
if err != nil { if err != nil {
outConn.Close()
return err return err
} }
return CopyEarlyConn(ctx, conn, outConn) return CopyEarlyConn(ctx, conn, outConn)
@ -97,6 +98,7 @@ func NewDirectConnection(ctx context.Context, router adapter.Router, this N.Dial
} }
err = N.ReportHandshakeSuccess(conn) err = N.ReportHandshakeSuccess(conn)
if err != nil { if err != nil {
outConn.Close()
return err return err
} }
return CopyEarlyConn(ctx, conn, outConn) return CopyEarlyConn(ctx, conn, outConn)
@ -117,6 +119,7 @@ func NewPacketConnection(ctx context.Context, this N.Dialer, conn N.PacketConn,
} }
err = N.ReportHandshakeSuccess(conn) err = N.ReportHandshakeSuccess(conn)
if err != nil { if err != nil {
outConn.Close()
return err return err
} }
if destinationAddress.IsValid() { if destinationAddress.IsValid() {
@ -164,6 +167,7 @@ func NewDirectPacketConnection(ctx context.Context, router adapter.Router, this
} }
err = N.ReportHandshakeSuccess(conn) err = N.ReportHandshakeSuccess(conn)
if err != nil { if err != nil {
outConn.Close()
return err return err
} }
if destinationAddress.IsValid() { if destinationAddress.IsValid() {
@ -186,6 +190,7 @@ func NewDirectPacketConnection(ctx context.Context, router adapter.Router, this
} }
func CopyEarlyConn(ctx context.Context, conn net.Conn, serverConn net.Conn) error { func CopyEarlyConn(ctx context.Context, conn net.Conn, serverConn net.Conn) error {
defer serverConn.Close()
if cachedReader, isCached := conn.(N.CachedReader); isCached { if cachedReader, isCached := conn.(N.CachedReader); isCached {
payload := cachedReader.ReadCached() payload := cachedReader.ReadCached()
if payload != nil && !payload.IsEmpty() { if payload != nil && !payload.IsEmpty() {