From 545fa5b53c1289668c7003d321deb7753dd7f6f7 Mon Sep 17 00:00:00 2001 From: v2ray Date: Sun, 7 Aug 2016 15:32:41 +0200 Subject: [PATCH] rename errors --- proxy/socks/server.go | 12 ++++++------ shell/point/config.go | 2 +- shell/point/config_json.go | 2 +- shell/point/errors.go | 2 +- shell/point/point.go | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/proxy/socks/server.go b/proxy/socks/server.go index 2f50deef..90b0f562 100644 --- a/proxy/socks/server.go +++ b/proxy/socks/server.go @@ -19,8 +19,8 @@ import ( ) var ( - ErrorUnsupportedSocksCommand = errors.New("Unsupported socks command.") - ErrorUnsupportedAuthMethod = errors.New("Unsupported auth method.") + ErrUnsupportedSocksCommand = errors.New("Unsupported socks command.") + ErrUnsupportedAuthMethod = errors.New("Unsupported auth method.") ) // Server is a SOCKS 5 proxy server @@ -142,7 +142,7 @@ func (this *Server) handleSocks5(clientAddr string, reader *v2io.BufferedReader, return err } log.Warning("Socks: client doesn't support any allowed auth methods.") - return ErrorUnsupportedAuthMethod + return ErrUnsupportedAuthMethod } authResponse := protocol.NewAuthenticationResponse(expectedAuthMethod) @@ -199,7 +199,7 @@ func (this *Server) handleSocks5(clientAddr string, reader *v2io.BufferedReader, return err } log.Warning("Socks: Unsupported socks command ", request.Command) - return ErrorUnsupportedSocksCommand + return ErrUnsupportedSocksCommand } response := protocol.NewSocks5Response() @@ -269,8 +269,8 @@ func (this *Server) handleSocks4(clientAddr string, reader *v2io.BufferedReader, if result == protocol.Socks4RequestRejected { log.Warning("Socks: Unsupported socks 4 command ", auth.Command) - log.Access(clientAddr, "", log.AccessRejected, ErrorUnsupportedSocksCommand) - return ErrorUnsupportedSocksCommand + log.Access(clientAddr, "", log.AccessRejected, ErrUnsupportedSocksCommand) + return ErrUnsupportedSocksCommand } reader.SetCached(false) diff --git a/shell/point/config.go b/shell/point/config.go index 0ac32c9c..01cbcef5 100644 --- a/shell/point/config.go +++ b/shell/point/config.go @@ -80,7 +80,7 @@ var ( func LoadConfig(init string) (*Config, error) { if configLoader == nil { - return nil, ErrorBadConfiguration + return nil, ErrBadConfiguration } return configLoader(init) } diff --git a/shell/point/config_json.go b/shell/point/config_json.go index 68c229d8..a636cbdf 100644 --- a/shell/point/config_json.go +++ b/shell/point/config_json.go @@ -193,7 +193,7 @@ func (this *InboundDetourConfig) UnmarshalJSON(data []byte) error { } if jsonConfig.PortRange == nil { log.Error("Point: Port range not specified in InboundDetour.") - return ErrorBadConfiguration + return ErrBadConfiguration } this.ListenOn = v2net.AnyIP if jsonConfig.ListenOn != nil { diff --git a/shell/point/errors.go b/shell/point/errors.go index 0f42148e..78387c83 100644 --- a/shell/point/errors.go +++ b/shell/point/errors.go @@ -5,5 +5,5 @@ import ( ) var ( - ErrorBadConfiguration = errors.New("Bad configuration.") + ErrBadConfiguration = errors.New("Bad configuration.") ) diff --git a/shell/point/point.go b/shell/point/point.go index 246d5c85..57276d10 100644 --- a/shell/point/point.go +++ b/shell/point/point.go @@ -82,7 +82,7 @@ func NewPoint(pConfig *Config) (*Point, error) { r, err := router.CreateRouter(routerConfig.Strategy, routerConfig.Settings, vpoint.space) if err != nil { log.Error("Failed to create router: ", err) - return nil, ErrorBadConfiguration + return nil, ErrBadConfiguration } vpoint.space.BindApp(router.APP_ID, r) vpoint.router = r @@ -129,19 +129,19 @@ func NewPoint(pConfig *Config) (*Point, error) { dh, err := NewInboundDetourHandlerAlways(vpoint.space, detourConfig) if err != nil { log.Error("Point: Failed to create detour handler: ", err) - return nil, ErrorBadConfiguration + return nil, ErrBadConfiguration } detourHandler = dh case AllocationStrategyRandom: dh, err := NewInboundDetourHandlerDynamic(vpoint.space, detourConfig) if err != nil { log.Error("Point: Failed to create detour handler: ", err) - return nil, ErrorBadConfiguration + return nil, ErrBadConfiguration } detourHandler = dh default: log.Error("Point: Unknown allocation strategy: ", allocConfig.Strategy) - return nil, ErrorBadConfiguration + return nil, ErrBadConfiguration } vpoint.idh[idx] = detourHandler if len(detourConfig.Tag) > 0 { @@ -188,7 +188,7 @@ func (this *Point) Close() { func (this *Point) Start() error { if this.port <= 0 { log.Error("Point: Invalid port ", this.port) - return ErrorBadConfiguration + return ErrBadConfiguration } err := retry.Timed(100 /* times */, 100 /* ms */).On(func() error {