lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-30 19:15:23 +00:00
Code Issues Releases Wiki Activity

refine error message

Browse Source
This commit is contained in:
Darien Raymond 2017-03-07 22:08:16 +01:00
parent 514dcffe2e
commit d627638412
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/http/server.go
View File

@ -94,8 +94,7 @@ func (s *Server) Process(ctx context.Context, network v2net.Network, conn intern
} }
dest, err := parseHost(host, defaultPort) dest, err := parseHost(host, defaultPort)
if err != nil { if err != nil {
log.Warning("HTTP: Malformed proxy host (", host, "): ", err) return errors.Base(err).Message("HTTP: Malformed proxy host: ", host).RequireUserAction()
return err
} }
log.Access(conn.RemoteAddr(), request.URL, log.AccessAccepted, "") log.Access(conn.RemoteAddr(), request.URL, log.AccessAccepted, "")

3
proxy/shadowsocks/client.go
View File

@ -81,8 +81,7 @@ func (v *Client) Process(ctx context.Context, outboundRay ray.OutboundRay, diale
user := server.PickUser() user := server.PickUser()
rawAccount, err := user.GetTypedAccount() rawAccount, err := user.GetTypedAccount()
if err != nil { if err != nil {
log.Warning("Shadowsocks|Client: Failed to get a valid user account: ", err) return errors.Base(err).Message("Shadowsocks|Client: Failed to get a valid user account.").RequireUserAction()
return err
} }
account := rawAccount.(*ShadowsocksAccount) account := rawAccount.(*ShadowsocksAccount)
request.User = user request.User = user

10
proxy/socks/client.go
View File

@ -5,7 +5,6 @@ import (
"runtime" "runtime"
"time" "time"
"v2ray.com/core/app/log"
"v2ray.com/core/common" "v2ray.com/core/common"
"v2ray.com/core/common/buf" "v2ray.com/core/common/buf"
"v2ray.com/core/common/errors" "v2ray.com/core/common/errors"
@ -79,8 +78,7 @@ func (c *Client) Process(ctx context.Context, ray ray.OutboundRay, dialer proxy.
udpRequest, err := ClientHandshake(request, conn, conn) udpRequest, err := ClientHandshake(request, conn, conn)
if err != nil { if err != nil {
log.Warning("Socks|Client: Failed to establish connection to server: ", err) return errors.Base(err).RequireUserAction().Message("Socks|Client: Failed to establish connection to server.")
return err
} }
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
@ -99,8 +97,7 @@ func (c *Client) Process(ctx context.Context, ray ray.OutboundRay, dialer proxy.
} else if request.Command == protocol.RequestCommandUDP { } else if request.Command == protocol.RequestCommandUDP {
udpConn, err := dialer.Dial(ctx, udpRequest.Destination()) udpConn, err := dialer.Dial(ctx, udpRequest.Destination())
if err != nil { if err != nil {
log.Info("Socks|Client: Failed to create UDP connection: ", err) return errors.Base(err).Message("Socks|Client: Failed to create UDP connection.")
return err
} }
defer udpConn.Close() defer udpConn.Close()
requestFunc = func() error { requestFunc = func() error {
@ -116,8 +113,7 @@ func (c *Client) Process(ctx context.Context, ray ray.OutboundRay, dialer proxy.
requestDone := signal.ExecuteAsync(requestFunc) requestDone := signal.ExecuteAsync(requestFunc)
responseDone := signal.ExecuteAsync(responseFunc) responseDone := signal.ExecuteAsync(responseFunc)
if err := signal.ErrorOrFinish2(ctx, requestDone, responseDone); err != nil { if err := signal.ErrorOrFinish2(ctx, requestDone, responseDone); err != nil {
log.Info("Socks|Client: Connection ends with ", err) return errors.Base(err).Message("Socks|Client: Connection ends.")
return err
} }
runtime.KeepAlive(timer) runtime.KeepAlive(timer)

3
proxy/vmess/outbound/outbound.go
View File

@ -86,8 +86,7 @@ func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dial
rawAccount, err := request.User.GetTypedAccount() rawAccount, err := request.User.GetTypedAccount()
if err != nil { if err != nil {
log.Warning("VMess|Outbound: Failed to get user account: ", err) return errors.Base(err).RequireUserAction().Message("VMess|Outbound: Failed to get user account.")
return err
} }
account := rawAccount.(*vmess.InternalAccount) account := rawAccount.(*vmess.InternalAccount)
request.Security = account.Security request.Security = account.Security

7
transport/internet/udp/hub.go
View File

@ -7,6 +7,7 @@ import (
"v2ray.com/core/app/log" "v2ray.com/core/app/log"
"v2ray.com/core/common/buf" "v2ray.com/core/common/buf"
"v2ray.com/core/common/dice" "v2ray.com/core/common/dice"
"v2ray.com/core/common/errors"
v2net "v2ray.com/core/common/net" v2net "v2ray.com/core/common/net"
"v2ray.com/core/transport/internet/internal" "v2ray.com/core/transport/internet/internal"
) )
@ -96,13 +97,11 @@ func ListenUDP(address v2net.Address, port v2net.Port, option ListenOption) (*Hu
if option.ReceiveOriginalDest { if option.ReceiveOriginalDest {
fd, err := internal.GetSysFd(udpConn) fd, err := internal.GetSysFd(udpConn)
if err != nil { if err != nil {
log.Warning("UDP|Listener: Failed to get fd: ", err) return nil, errors.Base(err).Message("UDP|Listener: Failed to get fd.")
return nil, err
} }
err = SetOriginalDestOptions(fd) err = SetOriginalDestOptions(fd)
if err != nil { if err != nil {
log.Warning("UDP|Listener: Failed to set socket options: ", err) return nil, errors.Base(err).Message("UDP|Listener: Failed to set socket options.")
return nil, err
} }
} }
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())