move mux to common

app/proxyman/inbound/always.go

@@ -5,9 +5,9 @@ import (
 
 	"v2ray.com/core"
 	"v2ray.com/core/app/proxyman"
-	"v2ray.com/core/app/proxyman/mux"
 	"v2ray.com/core/common"
 	"v2ray.com/core/common/dice"
+	"v2ray.com/core/common/mux"
 	"v2ray.com/core/common/net"
 	"v2ray.com/core/common/serial"
 	"v2ray.com/core/features/policy"

app/proxyman/inbound/dynamic.go

@@ -7,8 +7,8 @@ import (
 
 	"v2ray.com/core"
 	"v2ray.com/core/app/proxyman"
-	"v2ray.com/core/app/proxyman/mux"
 	"v2ray.com/core/common/dice"
+	"v2ray.com/core/common/mux"
 	"v2ray.com/core/common/net"
 	"v2ray.com/core/common/task"
 	"v2ray.com/core/proxy"

app/proxyman/outbound/handler.go

@@ -5,8 +5,8 @@ import (
 
 	"v2ray.com/core"
 	"v2ray.com/core/app/proxyman"
-	"v2ray.com/core/app/proxyman/mux"
 	"v2ray.com/core/common"
+	"v2ray.com/core/common/mux"
 	"v2ray.com/core/common/net"
 	"v2ray.com/core/common/session"
 	"v2ray.com/core/common/vio"
@@ -72,7 +72,7 @@ func NewHandler(ctx context.Context, config *core.OutboundHandlerConfig) (outbou
 		if config.Concurrency < 1 || config.Concurrency > 1024 {
 			return nil, newError("invalid mux concurrency: ", config.Concurrency).AtWarning()
 		}
-		h.mux = mux.NewClientManager(proxyHandler, h, config)
+		h.mux = mux.NewClientManager(proxyHandler, h, config.Concurrency)
 	}
 
 	h.proxy = proxyHandler

common/mux/mux.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"v2ray.com/core"
-	"v2ray.com/core/app/proxyman"
 	"v2ray.com/core/common"
 	"v2ray.com/core/common/buf"
 	"v2ray.com/core/common/errors"
@@ -30,18 +29,18 @@ const (
 )
 
 type ClientManager struct {
-	access  sync.Mutex
+	access      sync.Mutex
-	clients []*Client
+	clients     []*Client
-	proxy   proxy.Outbound
+	proxy       proxy.Outbound
-	dialer  internet.Dialer
+	dialer      internet.Dialer
-	config  *proxyman.MultiplexingConfig
+	concurrency uint32
 }
 
-func NewClientManager(p proxy.Outbound, d internet.Dialer, c *proxyman.MultiplexingConfig) *ClientManager {
+func NewClientManager(p proxy.Outbound, d internet.Dialer, c uint32) *ClientManager {
 	return &ClientManager{
-		proxy:  p,
+		proxy:       p,
-		dialer: d,
+		dialer:      d,
-		config: c,
+		concurrency: c,
 	}
 }
 
@@ -108,7 +107,7 @@ func NewClient(pctx context.Context, p proxy.Outbound, dialer internet.Dialer, m
 		},
 		done:        done.New(),
 		manager:     m,
-		concurrency: m.config.Concurrency,
+		concurrency: m.concurrency,
 	}
 
 	go func() {

common/mux/mux_test.go

@@ -4,8 +4,8 @@ import (
 	"io"
 	"testing"
 
-	. "v2ray.com/core/app/proxyman/mux"
 	"v2ray.com/core/common/buf"
+	. "v2ray.com/core/common/mux"
 	"v2ray.com/core/common/net"
 	"v2ray.com/core/common/protocol"
 	"v2ray.com/core/transport/pipe"

common/mux/session_test.go

@@ -3,7 +3,7 @@ package mux_test
 import (
 	"testing"
 
-	. "v2ray.com/core/app/proxyman/mux"
+	. "v2ray.com/core/common/mux"
 	. "v2ray.com/ext/assert"
 )