lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-22 01:57:12 -05:00
Code Issues Releases Wiki Activity

rename InboundConnectionHandlerCreator

Browse Source
This commit is contained in:
v2ray 2016-01-25 17:27:15 +01:00
parent cd0ec176e0
commit 5e16fa2dcd
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/internal/creator.go
View File

@ -5,5 +5,5 @@ import (
"github.com/v2ray/v2ray-core/proxy" "github.com/v2ray/v2ray-core/proxy"
) )
type InboundConnectionHandlerCreator func(space app.Space, config interface{}) (proxy.InboundHandler, error) type InboundHandlerCreator func(space app.Space, config interface{}) (proxy.InboundHandler, error)
type OutboundConnectionHandlerCreator func(space app.Space, config interface{}) (proxy.OutboundHandler, error) type OutboundHandlerCreator func(space app.Space, config interface{}) (proxy.OutboundHandler, error)

12
proxy/internal/handler_cache.go
View File

@ -9,15 +9,15 @@ import (
) )
var ( var (
inboundFactories = make(map[string]InboundConnectionHandlerCreator) inboundFactories = make(map[string]InboundHandlerCreator)
outboundFactories = make(map[string]OutboundConnectionHandlerCreator) outboundFactories = make(map[string]OutboundHandlerCreator)
ErrorProxyNotFound = errors.New("Proxy not found.") ErrorProxyNotFound = errors.New("Proxy not found.")
ErrorNameExists = errors.New("Proxy with the same name already exists.") ErrorNameExists = errors.New("Proxy with the same name already exists.")
ErrorBadConfiguration = errors.New("Bad proxy configuration.") ErrorBadConfiguration = errors.New("Bad proxy configuration.")
) )
func RegisterInboundHandlerCreator(name string, creator InboundConnectionHandlerCreator) error { func RegisterInboundHandlerCreator(name string, creator InboundHandlerCreator) error {
if _, found := inboundFactories[name]; found { if _, found := inboundFactories[name]; found {
return ErrorNameExists return ErrorNameExists
} }
@ -25,13 +25,13 @@ func RegisterInboundHandlerCreator(name string, creator InboundConnectionHandler
return nil return nil
} }
func MustRegisterInboundConnectionHandlerCreator(name string, creator InboundConnectionHandlerCreator) { func MustRegisterInboundConnectionHandlerCreator(name string, creator InboundHandlerCreator) {
if err := RegisterInboundHandlerCreator(name, creator); err != nil { if err := RegisterInboundHandlerCreator(name, creator); err != nil {
panic(err) panic(err)
} }
} }
func RegisterOutboundHandlerCreator(name string, creator OutboundConnectionHandlerCreator) error { func RegisterOutboundHandlerCreator(name string, creator OutboundHandlerCreator) error {
if _, found := outboundFactories[name]; found { if _, found := outboundFactories[name]; found {
return ErrorNameExists return ErrorNameExists
} }
@ -39,7 +39,7 @@ func RegisterOutboundHandlerCreator(name string, creator OutboundConnectionHandl
return nil return nil
} }
func MustRegisterOutboundConnectionHandlerCreator(name string, creator OutboundConnectionHandlerCreator) { func MustRegisterOutboundConnectionHandlerCreator(name string, creator OutboundHandlerCreator) {
if err := RegisterOutboundHandlerCreator(name, creator); err != nil { if err := RegisterOutboundHandlerCreator(name, creator); err != nil {
panic(err) panic(err)
} }

4
proxy/testing/proxy.go
View File

@ -13,7 +13,7 @@ func randomString() string {
return fmt.Sprintf("-%d", count) return fmt.Sprintf("-%d", count)
} }
func RegisterInboundConnectionHandlerCreator(prefix string, creator internal.InboundConnectionHandlerCreator) (string, error) { func RegisterInboundConnectionHandlerCreator(prefix string, creator internal.InboundHandlerCreator) (string, error) {
for { for {
name := prefix + randomString() name := prefix + randomString()
err := internal.RegisterInboundHandlerCreator(name, creator) err := internal.RegisterInboundHandlerCreator(name, creator)
@ -23,7 +23,7 @@ func RegisterInboundConnectionHandlerCreator(prefix string, creator internal.Inb
} }
} }
func RegisterOutboundConnectionHandlerCreator(prefix string, creator internal.OutboundConnectionHandlerCreator) (string, error) { func RegisterOutboundConnectionHandlerCreator(prefix string, creator internal.OutboundHandlerCreator) (string, error) {
for { for {
name := prefix + randomString() name := prefix + randomString()
err := internal.RegisterOutboundHandlerCreator(name, creator) err := internal.RegisterOutboundHandlerCreator(name, creator)