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

merge similar error definitions

Browse Source
This commit is contained in:
v2ray
2016-08-18 08:34:21 +02:00
parent 786775ea80
commit ad1353ac2f
8 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
proxy/registry/handler_cache.go
View File

@@ -1,9 +1,8 @@
package registry
import (
"errors"
"github.com/v2ray/v2ray-core/app"
"github.com/v2ray/v2ray-core/common"
"github.com/v2ray/v2ray-core/proxy"
"github.com/v2ray/v2ray-core/transport/internet"
)
@@ -11,14 +10,11 @@ import (
var (
inboundFactories = make(map[string]InboundHandlerFactory)
outboundFactories = make(map[string]OutboundHandlerFactory)
ErrProxyNotFound = errors.New("Proxy not found.")
ErrNameExists = errors.New("Proxy with the same name already exists.")
)
func RegisterInboundHandlerCreator(name string, creator InboundHandlerFactory) error {
if _, found := inboundFactories[name]; found {
return ErrNameExists
return common.ErrDuplicatedName
}
inboundFactories[name] = creator
return nil
@@ -32,7 +28,7 @@ func MustRegisterInboundHandlerCreator(name string, creator InboundHandlerFactor
func RegisterOutboundHandlerCreator(name string, creator OutboundHandlerFactory) error {
if _, found := outboundFactories[name]; found {
return ErrNameExists
return common.ErrDuplicatedName
}
outboundFactories[name] = creator
return nil
@@ -47,7 +43,7 @@ func MustRegisterOutboundHandlerCreator(name string, creator OutboundHandlerFact
func CreateInboundHandler(name string, space app.Space, rawConfig []byte, meta *proxy.InboundHandlerMeta) (proxy.InboundHandler, error) {
creator, found := inboundFactories[name]
if !found {
return nil, ErrProxyNotFound
return nil, common.ErrObjectNotFound
}
if meta.StreamSettings == nil {
meta.StreamSettings = &internet.StreamSettings{
@@ -70,7 +66,7 @@ func CreateInboundHandler(name string, space app.Space, rawConfig []byte, meta *
func CreateOutboundHandler(name string, space app.Space, rawConfig []byte, meta *proxy.OutboundHandlerMeta) (proxy.OutboundHandler, error) {
creator, found := outboundFactories[name]
if !found {
return nil, ErrProxyNotFound
return nil, common.ErrObjectNotFound
}
if meta.StreamSettings == nil {
meta.StreamSettings = &internet.StreamSettings{

5
proxy/testing/proxy.go
View File

@@ -3,6 +3,7 @@ package testing
import (
"fmt"
"github.com/v2ray/v2ray-core/common"
"github.com/v2ray/v2ray-core/proxy/registry"
)
@@ -17,7 +18,7 @@ func RegisterInboundConnectionHandlerCreator(prefix string, creator registry.Inb
for {
name := prefix + randomString()
err := registry.RegisterInboundHandlerCreator(name, creator)
if err != registry.ErrNameExists {
if err != common.ErrDuplicatedName {
return name, err
}
}
@@ -27,7 +28,7 @@ func RegisterOutboundConnectionHandlerCreator(prefix string, creator registry.Ou
for {
name := prefix + randomString()
err := registry.RegisterOutboundHandlerCreator(name, creator)
if err != registry.ErrNameExists {
if err != common.ErrDuplicatedName {
return name, err
}
}