lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-05-09 05:59:07 -04:00
Code Issues Releases Wiki Activity

rename InboundConfig methods

Browse Source
This commit is contained in:
v2ray
2016-01-25 17:23:10 +01:00
parent d325400f2e
commit d4dcee5fa3
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/internal/config/config_cache.go
View File

@@ -28,7 +28,7 @@ func RegisterOutboundConfig(protocol string, creator ConfigObjectCreator) error
return registerConfigType(protocol, "outbound", creator)
}
func CreateInboundConnectionConfig(protocol string, data []byte) (interface{}, error) {
func CreateInboundConfig(protocol string, data []byte) (interface{}, error) {
creator, found := configCache[getConfigKey(protocol, "inbound")]
if !found {
return nil, errors.New(protocol + " not found.")
@@ -36,7 +36,7 @@ func CreateInboundConnectionConfig(protocol string, data []byte) (interface{}, e
return creator(data)
}
func CreateOutboundConnectionConfig(protocol string, data []byte) (interface{}, error) {
func CreateOutboundConfig(protocol string, data []byte) (interface{}, error) {
creator, found := configCache[getConfigKey(protocol, "outbound")]
if !found {
return nil, errors.New(protocol + " not found.")

8
proxy/internal/config/config_cache_test.go
View File

@@ -19,11 +19,11 @@ func TestRegisterInboundConfig(t *testing.T) {
err := RegisterInboundConfig(protocol, creator)
assert.Error(err).IsNil()
configObj, err := CreateInboundConnectionConfig(protocol, nil)
configObj, err := CreateInboundConfig(protocol, nil)
assert.Bool(configObj.(bool)).IsTrue()
assert.Error(err).IsNil()
configObj, err = CreateOutboundConnectionConfig(protocol, nil)
configObj, err = CreateOutboundConfig(protocol, nil)
assert.Pointer(configObj).IsNil()
}
@@ -39,10 +39,10 @@ func TestRegisterOutboundConfig(t *testing.T) {
err := RegisterOutboundConfig(protocol, creator)
assert.Error(err).IsNil()
configObj, err := CreateOutboundConnectionConfig(protocol, nil)
configObj, err := CreateOutboundConfig(protocol, nil)
assert.Bool(configObj.(bool)).IsTrue()
assert.Error(err).IsNil()
configObj, err = CreateInboundConnectionConfig(protocol, nil)
configObj, err = CreateInboundConfig(protocol, nil)
assert.Pointer(configObj).IsNil()
}

8
proxy/internal/handler_cache.go
View File

@@ -45,13 +45,13 @@ func MustRegisterOutboundConnectionHandlerCreator(name string, creator OutboundC
}
}
func CreateInboundConnectionHandler(name string, space app.Space, rawConfig []byte) (proxy.InboundHandler, error) {
func CreateInboundHandler(name string, space app.Space, rawConfig []byte) (proxy.InboundHandler, error) {
creator, found := inboundFactories[name]
if !found {
return nil, ErrorProxyNotFound
}
if len(rawConfig) > 0 {
proxyConfig, err := config.CreateInboundConnectionConfig(name, rawConfig)
proxyConfig, err := config.CreateInboundConfig(name, rawConfig)
if err != nil {
return nil, err
}
@@ -60,14 +60,14 @@ func CreateInboundConnectionHandler(name string, space app.Space, rawConfig []by
return creator(space, nil)
}
func CreateOutboundConnectionHandler(name string, space app.Space, rawConfig []byte) (proxy.OutboundHandler, error) {
func CreateOutboundHandler(name string, space app.Space, rawConfig []byte) (proxy.OutboundHandler, error) {
creator, found := outboundFactories[name]
if !found {
return nil, ErrorNameExists
}
if len(rawConfig) > 0 {
proxyConfig, err := config.CreateOutboundConnectionConfig(name, rawConfig)
proxyConfig, err := config.CreateOutboundConfig(name, rawConfig)
if err != nil {
return nil, err
}

8
proxy/repo/repo.go
View File

@@ -6,10 +6,10 @@ import (
"github.com/v2ray/v2ray-core/proxy/internal"
)
func CreateInboundConnectionHandler(name string, space app.Space, rawConfig []byte) (proxy.InboundHandler, error) {
return internal.CreateInboundConnectionHandler(name, space, rawConfig)
func CreateInboundHandler(name string, space app.Space, rawConfig []byte) (proxy.InboundHandler, error) {
return internal.CreateInboundHandler(name, space, rawConfig)
}
func CreateOutboundConnectionHandler(name string, space app.Space, rawConfig []byte) (proxy.OutboundHandler, error) {
return internal.CreateOutboundConnectionHandler(name, space, rawConfig)
func CreateOutboundHandler(name string, space app.Space, rawConfig []byte) (proxy.OutboundHandler, error) {
return internal.CreateOutboundHandler(name, space, rawConfig)
}

2
proxy/socks/config_json_test.go
View File

@@ -14,7 +14,7 @@ import (
func TestDefaultIPAddress(t *testing.T) {
v2testing.Current(t)
socksConfig, err := config.CreateInboundConnectionConfig("socks", []byte(`{
socksConfig, err := config.CreateInboundConfig("socks", []byte(`{
"auth": "noauth"
}`))
assert.Error(err).IsNil()