From 85bfb9312e85d74e2de44c94065d5469b9da82fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Tue, 1 Apr 2025 21:32:49 +0800 Subject: [PATCH] Allow direct outbounds without `domain_resolver` --- common/dialer/dialer.go | 3 ++- protocol/direct/outbound.go | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/dialer/dialer.go b/common/dialer/dialer.go index bfd13784..7bf05d1b 100644 --- a/common/dialer/dialer.go +++ b/common/dialer/dialer.go @@ -24,6 +24,7 @@ type Options struct { ResolverOnDetour bool NewDialer bool LegacyDNSDialer bool + DirectOutbound bool } // TODO: merge with NewWithOptions @@ -108,7 +109,7 @@ func NewWithOptions(options Options) (N.Dialer, error) { dnsQueryOptions.Transport = dnsTransport.Default() } else if options.NewDialer { return nil, E.New("missing domain resolver for domain server address") - } else { + } else if !options.DirectOutbound { deprecated.Report(options.Context, deprecated.OptionMissingDomainResolver) } } diff --git a/protocol/direct/outbound.go b/protocol/direct/outbound.go index 9cd1490b..84838bc0 100644 --- a/protocol/direct/outbound.go +++ b/protocol/direct/outbound.go @@ -48,7 +48,12 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL if options.Detour != "" { return nil, E.New("`detour` is not supported in direct context") } - outboundDialer, err := dialer.New(ctx, options.DialerOptions, true) + outboundDialer, err := dialer.NewWithOptions(dialer.Options{ + Context: ctx, + Options: options.DialerOptions, + RemoteIsDomain: true, + DirectOutbound: true, + }) if err != nil { return nil, err }