lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-25 19:45:38 -05:00
Code Issues Releases Wiki Activity

separate network and transport protocol

Browse Source
This commit is contained in:
Darien Raymond
2017-01-12 12:54:34 +01:00
parent f9b3a1446a
commit d24fe9dbfb
41 changed files with 261 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
proxy/handler_cache.go
View File

@@ -4,8 +4,6 @@ import (
"v2ray.com/core/app"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/transport/internet"
)
var (
@@ -34,18 +32,6 @@ func CreateInboundHandler(name string, space app.Space, config interface{}, meta
if !found {
return nil, errors.New("Proxy: Unknown inbound name: " + name)
}
if meta.StreamSettings == nil {
meta.StreamSettings = &internet.StreamConfig{
Network: creator.StreamCapability().Get(0),
}
} else if meta.StreamSettings.Network == v2net.Network_Unknown {
meta.StreamSettings.Network = creator.StreamCapability().Get(0)
} else {
if !creator.StreamCapability().HasNetwork(meta.StreamSettings.Network) {
return nil, errors.New("Proxy: Invalid network: " + meta.StreamSettings.Network.String())
}
}
return creator.Create(space, config, meta)
}
@@ -54,17 +40,6 @@ func CreateOutboundHandler(name string, space app.Space, config interface{}, met
if !found {
return nil, errors.New("Proxy: Unknown outbound name: " + name)
}
if meta.StreamSettings == nil {
meta.StreamSettings = &internet.StreamConfig{
Network: creator.StreamCapability().Get(0),
}
} else if meta.StreamSettings.Network == v2net.Network_Unknown {
meta.StreamSettings.Network = creator.StreamCapability().Get(0)
} else {
if !creator.StreamCapability().HasNetwork(meta.StreamSettings.Network) {
return nil, errors.New("Proxy: Invalid network: " + meta.StreamSettings.Network.String())
}
}
return creator.Create(space, config, meta)
}