mirror of
https://gitclone.com/github.com/MetaCubeX/Clash.Meta
synced 2025-05-12 21:18:03 +08:00
fix: memory leak due to unclosed session (#1908)
This commit is contained in:
parent
1e22f4daa9
commit
dee5898e36
@ -23,6 +23,23 @@ type Option struct {
|
|||||||
Mux bool
|
Mux bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// muxConn is a wrapper around smux.Stream that also closes the session when closed
|
||||||
|
type muxConn struct {
|
||||||
|
net.Conn
|
||||||
|
session *smux.Session
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *muxConn) Close() error {
|
||||||
|
streamErr := m.Conn.Close()
|
||||||
|
sessionErr := m.session.Close()
|
||||||
|
|
||||||
|
// Return stream error if there is one, otherwise return session error
|
||||||
|
if streamErr != nil {
|
||||||
|
return streamErr
|
||||||
|
}
|
||||||
|
return sessionErr
|
||||||
|
}
|
||||||
|
|
||||||
// NewGostWebsocket return a gost websocket
|
// NewGostWebsocket return a gost websocket
|
||||||
func NewGostWebsocket(ctx context.Context, conn net.Conn, option *Option) (net.Conn, error) {
|
func NewGostWebsocket(ctx context.Context, conn net.Conn, option *Option) (net.Conn, error) {
|
||||||
header := http.Header{}
|
header := http.Header{}
|
||||||
@ -72,10 +89,14 @@ func NewGostWebsocket(ctx context.Context, conn net.Conn, option *Option) (net.C
|
|||||||
|
|
||||||
stream, err := session.OpenStream()
|
stream, err := session.OpenStream()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
session.Close()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
conn = stream
|
return &muxConn{
|
||||||
|
Conn: stream,
|
||||||
|
session: session,
|
||||||
|
}, nil
|
||||||
}
|
}
|
||||||
return conn, nil
|
return conn, nil
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user