SagerNet/sing-mux
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-mux.git synced 2025-04-05 12:57:40 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix panic

Browse source
This commit is contained in:
世界 2023-07-23 12:50:54 +08:00
parent 2cedde0fbc
commit 1c71561977
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
h2mux.go
View file

@ -166,7 +166,8 @@ var _ abstractSession = (*h2MuxClientSession)(nil)
type h2MuxClientSession struct { type h2MuxClientSession struct {
transport *http2.Transport transport *http2.Transport
clientConn *http2.ClientConn clientConn *http2.ClientConn
done chan struct{} access sync.RWMutex
closed bool
} }
func newH2MuxClient(conn net.Conn) (*h2MuxClientSession, error) { func newH2MuxClient(conn net.Conn) (*h2MuxClientSession, error) {
@ -178,7 +179,6 @@ func newH2MuxClient(conn net.Conn) (*h2MuxClientSession, error) {
ReadIdleTimeout: idleTimeout, ReadIdleTimeout: idleTimeout,
MaxReadFrameSize: buf.BufferSize, MaxReadFrameSize: buf.BufferSize,
}, },
done: make(chan struct{}),
} }
session.transport.ConnPool = session session.transport.ConnPool = session
clientConn, err := session.transport.NewClientConn(conn) clientConn, err := session.transport.NewClientConn(conn)
@ -228,21 +228,19 @@ func (s *h2MuxClientSession) NumStreams() int {
} }
func (s *h2MuxClientSession) Close() error { func (s *h2MuxClientSession) Close() error {
select { s.access.Lock()
case <-s.done: defer s.access.Unlock()
default: if s.closed {
close(s.done) return os.ErrClosed
} }
s.closed = true
return s.clientConn.Close() return s.clientConn.Close()
} }
func (s *h2MuxClientSession) IsClosed() bool { func (s *h2MuxClientSession) IsClosed() bool {
select { s.access.RLock()
case <-s.done: defer s.access.RUnlock()
return true return s.closed || s.clientConn.State().Closed
default:
}
return s.clientConn.State().Closed
} }
func (s *h2MuxClientSession) CanTakeNewRequest() bool { func (s *h2MuxClientSession) CanTakeNewRequest() bool {