github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

rename RegisterInboundConnectionHandlerFactory to RegisterInboundHandlerCreator

pull/73/head
v2ray 2016-01-25 17:20:44 +01:00
parent 01ed2fa889
commit d325400f2e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
proxy/internal/handler_cache.go
View File

@ -17,7 +17,7 @@ var (
ErrorBadConfiguration = errors.New("Bad proxy configuration.") ErrorBadConfiguration = errors.New("Bad proxy configuration.")
) )
func RegisterInboundConnectionHandlerFactory(name string, creator InboundConnectionHandlerCreator) error { func RegisterInboundHandlerCreator(name string, creator InboundConnectionHandlerCreator) error {
if _, found := inboundFactories[name]; found { if _, found := inboundFactories[name]; found {
return ErrorNameExists return ErrorNameExists
} }
@ -26,12 +26,12 @@ func RegisterInboundConnectionHandlerFactory(name string, creator InboundConnect
} }
func MustRegisterInboundConnectionHandlerCreator(name string, creator InboundConnectionHandlerCreator) { func MustRegisterInboundConnectionHandlerCreator(name string, creator InboundConnectionHandlerCreator) {
if err := RegisterInboundConnectionHandlerFactory(name, creator); err != nil { if err := RegisterInboundHandlerCreator(name, creator); err != nil {
panic(err) panic(err)
} }
} }
func RegisterOutboundConnectionHandlerFactory(name string, creator OutboundConnectionHandlerCreator) error { func RegisterOutboundHandlerCreator(name string, creator OutboundConnectionHandlerCreator) error {
if _, found := outboundFactories[name]; found { if _, found := outboundFactories[name]; found {
return ErrorNameExists return ErrorNameExists
} }
@ -40,7 +40,7 @@ func RegisterOutboundConnectionHandlerFactory(name string, creator OutboundConne
} }
func MustRegisterOutboundConnectionHandlerCreator(name string, creator OutboundConnectionHandlerCreator) { func MustRegisterOutboundConnectionHandlerCreator(name string, creator OutboundConnectionHandlerCreator) {
if err := RegisterOutboundConnectionHandlerFactory(name, creator); err != nil { if err := RegisterOutboundHandlerCreator(name, creator); err != nil {
panic(err) panic(err)
} }
} }

4
proxy/testing/proxy.go
View File

@ -16,7 +16,7 @@ func randomString() string {
func RegisterInboundConnectionHandlerCreator(prefix string, creator internal.InboundConnectionHandlerCreator) (string, error) { func RegisterInboundConnectionHandlerCreator(prefix string, creator internal.InboundConnectionHandlerCreator) (string, error) {
for { for {
name := prefix + randomString() name := prefix + randomString()
err := internal.RegisterInboundConnectionHandlerFactory(name, creator) err := internal.RegisterInboundHandlerCreator(name, creator)
if err != internal.ErrorNameExists { if err != internal.ErrorNameExists {
return name, err return name, err
} }
@ -26,7 +26,7 @@ func RegisterInboundConnectionHandlerCreator(prefix string, creator internal.Inb
func RegisterOutboundConnectionHandlerCreator(prefix string, creator internal.OutboundConnectionHandlerCreator) (string, error) { func RegisterOutboundConnectionHandlerCreator(prefix string, creator internal.OutboundConnectionHandlerCreator) (string, error) {
for { for {
name := prefix + randomString() name := prefix + randomString()
err := internal.RegisterOutboundConnectionHandlerFactory(name, creator) err := internal.RegisterOutboundHandlerCreator(name, creator)
if err != internal.ErrorNameExists { if err != internal.ErrorNameExists {
return name, err return name, err
} }