Fix smux

wzshiming · Nov 8, 2021 · 1f123ee · 1f123ee
1 parent 0e3acf1
commit 1f123ee
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/protocols/smux/smux.go b/protocols/smux/smux.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"net"
-	"sync"
 	"time"
 
 	"github.com/wzshiming/bridge"
@@ -31,15 +30,12 @@ func SMux(dialer bridge.Dialer, addr string) (bridge.Dialer, error) {
 }
 
 type sMux struct {
-	mux          sync.Mutex
 	dialer       bridge.Dialer
 	listenConfig bridge.ListenConfig
 	sess         *smux.Session
 }
 
 func (m *sMux) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
-	m.mux.Lock()
-	defer m.mux.Unlock()
 	if m.sess == nil || m.sess.IsClosed() {
 		if m.sess != nil {
 			m.sess.Close()
@@ -57,8 +53,6 @@ func (m *sMux) DialContext(ctx context.Context, network, address string) (net.Co
 	}
 	conn, err := m.sess.OpenStream()
 	if err != nil {
-		m.sess.Close()
-		m.sess = nil
 		return m.DialContext(ctx, network, address)
 	}
 	return conn, nil
@@ -136,7 +130,7 @@ func (l *listenerSession) Accept() (net.Conn, error) {
 
 func (l *listenerSession) Close() error {
 	l.cancel()
-	return l.Close()
+	return l.listener.Close()
 }
 
 func (l *listenerSession) Addr() net.Addr {