lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-17 23:06:30 -05:00
Code Issues Releases Wiki Activity

move mux to common

Browse Source
This commit is contained in:
Darien Raymond 2018-10-23 12:21:12 +02:00
parent c2566e1331
commit 838f2919ab
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
11 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/proxyman/inbound/always.go
View File

@ -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"

2
app/proxyman/inbound/dynamic.go
View File

@ -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"

4
app/proxyman/outbound/handler.go
View File

@ -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

0
app/proxyman/mux/errors.generated.go → common/mux/errors.generated.go
View File

0
app/proxyman/mux/frame.go → common/mux/frame.go
View File

9
app/proxyman/mux/mux.go → common/mux/mux.go
View File

@ -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"
@ -34,14 +33,14 @@ type ClientManager struct {
clients []*Client
proxy proxy.Outbound
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,
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() {

2
app/proxyman/mux/mux_test.go → common/mux/mux_test.go
View File

@ -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"

0
app/proxyman/mux/reader.go → common/mux/reader.go
View File

0
app/proxyman/mux/session.go → common/mux/session.go
View File

2
app/proxyman/mux/session_test.go → common/mux/session_test.go
View File

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

0
app/proxyman/mux/writer.go → common/mux/writer.go
View File