lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-28 00:19:08 -04:00
Code Issues Releases Wiki Activity

remove unnecessary proxy functions

Browse Source
This commit is contained in:
Darien Raymond
2018-02-09 23:07:38 +01:00
parent 42d83a703e
commit 92aef24f98
3 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import (
"v2ray.com/core"
"v2ray.com/core/app/proxyman"
"v2ray.com/core/app/proxyman/mux"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
"v2ray.com/core/common/net"
"v2ray.com/core/proxy"
@@ -50,11 +51,16 @@ func NewHandler(ctx context.Context, config *core.OutboundHandlerConfig) (*Handl
return nil, err
}
proxyHandler, err := proxy.CreateOutboundHandler(ctx, proxyConfig)
rawProxyHandler, err := common.CreateObject(ctx, proxyConfig)
if err != nil {
return nil, err
}
proxyHandler, ok := rawProxyHandler.(proxy.Outbound)
if !ok {
return nil, newError("not an outbound handler")
}
if h.senderSettings != nil && h.senderSettings.MultiplexSettings != nil && h.senderSettings.MultiplexSettings.Enabled {
config := h.senderSettings.MultiplexSettings
if config.Concurrency < 1 || config.Concurrency > 1024 {
@@ -134,5 +140,6 @@ func (h *Handler) Start() error {
// Close implements common.Runnable.
func (h *Handler) Close() error {
common.Close(h.mux)
return nil
}