diff --git a/app/dispatcher/default.go b/app/dispatcher/default.go index 2ae64902..3c9c0a7a 100644 --- a/app/dispatcher/default.go +++ b/app/dispatcher/default.go @@ -2,6 +2,7 @@ package dispatcher import ( "context" + go_errors "errors" "regexp" "strings" "sync" @@ -488,6 +489,12 @@ func (d *DefaultDispatcher) routedDispatch(ctx context.Context, link *transport. return // DO NOT CHANGE: the traffic shouldn't be processed by default outbound if the specified outbound tag doesn't exist (yet), e.g., VLESS Reverse Proxy } } else { + if !go_errors.Is(err, common.ErrNoClue) { + errors.LogWarningInner(ctx, err, "get error during route pick ") + common.Close(link.Writer) + common.Interrupt(link.Reader) + return + } errors.LogInfo(ctx, "default route for ", destination) } } diff --git a/app/router/command/config.go b/app/router/command/config.go index 13a319b1..7cfcd0ab 100644 --- a/app/router/command/config.go +++ b/app/router/command/config.go @@ -51,6 +51,10 @@ func (c routingContext) GetSkipDNSResolve() bool { return false } +func (c routingContext) GetError() error { + return nil +} + // AsRoutingContext converts a protobuf RoutingContext into an implementation of routing.Context. func AsRoutingContext(r *RoutingContext) routing.Context { return routingContext{r} diff --git a/app/router/router.go b/app/router/router.go index 2f35b3e7..bcf4e543 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -195,6 +195,9 @@ func (r *Router) pickRouteInternal(ctx routing.Context) (*Rule, routing.Context, if rule.Apply(ctx) { return rule, ctx, nil } + if err := ctx.GetError(); err != nil { + return nil, ctx, err + } } if r.domainStrategy != Config_IpIfNonMatch || len(ctx.GetTargetDomain()) == 0 || skipDNSResolve { @@ -208,6 +211,9 @@ func (r *Router) pickRouteInternal(ctx routing.Context) (*Rule, routing.Context, if rule.Apply(ctx) { return rule, ctx, nil } + if err := ctx.GetError(); err != nil { + return nil, ctx, err + } } return nil, ctx, common.ErrNoClue diff --git a/features/routing/context.go b/features/routing/context.go index 6b38d175..ad113d8e 100644 --- a/features/routing/context.go +++ b/features/routing/context.go @@ -49,4 +49,7 @@ type Context interface { // GetSkipDNSResolve returns a flag switch for weather skip dns resolve during route pick. GetSkipDNSResolve() bool + + // GetError returns errors during route pick, e.g., built-in-dns fail to resolve domain to IP + GetError() error } diff --git a/features/routing/dns/context.go b/features/routing/dns/context.go index a65895f6..6d0dd99a 100644 --- a/features/routing/dns/context.go +++ b/features/routing/dns/context.go @@ -1,8 +1,6 @@ package dns import ( - "context" - "github.com/xtls/xray-core/common/errors" "github.com/xtls/xray-core/common/net" "github.com/xtls/xray-core/features/dns" @@ -14,6 +12,7 @@ type ResolvableContext struct { routing.Context dnsClient dns.Client resolvedIPs []net.IP + lookupError error } // GetTargetIPs overrides original routing.Context's implementation. @@ -22,6 +21,10 @@ func (ctx *ResolvableContext) GetTargetIPs() []net.IP { return ctx.resolvedIPs } + if ips := ctx.Context.GetTargetIPs(); len(ips) != 0 { + return ips + } + if domain := ctx.GetTargetDomain(); len(domain) != 0 { ips, _, err := ctx.dnsClient.LookupIP(domain, dns.IPOption{ IPv4Enable: true, @@ -32,16 +35,17 @@ func (ctx *ResolvableContext) GetTargetIPs() []net.IP { ctx.resolvedIPs = ips return ips } - errors.LogInfoInner(context.Background(), err, "resolve ip for ", domain) - } - - if ips := ctx.Context.GetTargetIPs(); len(ips) != 0 { - return ips + ctx.lookupError = errors.New("resolve ip for ", domain).Base(err) } return nil } +// GetError override original routing.Context's implementation. +func (ctx *ResolvableContext) GetError() error { + return ctx.lookupError +} + // ContextWithDNSClient creates a new routing context with domain resolving capability. // Resolved domain IPs can be retrieved by GetTargetIPs(). func ContextWithDNSClient(ctx routing.Context, client dns.Client) routing.Context { diff --git a/features/routing/session/context.go b/features/routing/session/context.go index 45fa8d8f..0f58cb87 100644 --- a/features/routing/session/context.go +++ b/features/routing/session/context.go @@ -152,6 +152,11 @@ func (ctx *Context) GetSkipDNSResolve() bool { return ctx.Content.SkipDNSResolve } +// GetError implements routing.Context. +func (ctx *Context) GetError() error { + return nil +} + // AsRoutingContext creates a context from context.context with session info. func AsRoutingContext(ctx context.Context) routing.Context { outbounds := session.OutboundsFromContext(ctx)