Fix DNS upgrade

This commit is contained in:
世界 2025-03-18 14:21:00 +08:00
parent 940665fc3e
commit 786d17cb6a
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4

View File

@ -191,34 +191,23 @@ func (o *DNSServerOptions) Upgrade(ctx context.Context) error {
serverType = C.DNSTypeUDP serverType = C.DNSTypeUDP
} }
} }
var remoteOptions RemoteDNSServerOptions remoteOptions := RemoteDNSServerOptions{
if options.Detour == "" { LocalDNSServerOptions: LocalDNSServerOptions{
remoteOptions = RemoteDNSServerOptions{ DialerOptions: DialerOptions{
LocalDNSServerOptions: LocalDNSServerOptions{ Detour: options.Detour,
LegacyStrategy: options.Strategy, DomainResolver: &DomainResolveOptions{
LegacyDefaultDialer: options.Detour == "", Server: options.AddressResolver,
LegacyClientSubnet: options.ClientSubnet.Build(netip.Prefix{}), Strategy: options.AddressStrategy,
},
LegacyAddressResolver: options.AddressResolver,
LegacyAddressStrategy: options.AddressStrategy,
LegacyAddressFallbackDelay: options.AddressFallbackDelay,
}
} else {
remoteOptions = RemoteDNSServerOptions{
LocalDNSServerOptions: LocalDNSServerOptions{
DialerOptions: DialerOptions{
Detour: options.Detour,
DomainResolver: &DomainResolveOptions{
Server: options.AddressResolver,
Strategy: options.AddressStrategy,
},
FallbackDelay: options.AddressFallbackDelay,
}, },
LegacyStrategy: options.Strategy, FallbackDelay: options.AddressFallbackDelay,
LegacyDefaultDialer: options.Detour == "",
LegacyClientSubnet: options.ClientSubnet.Build(netip.Prefix{}),
}, },
} LegacyStrategy: options.Strategy,
LegacyDefaultDialer: options.Detour == "",
LegacyClientSubnet: options.ClientSubnet.Build(netip.Prefix{}),
},
LegacyAddressResolver: options.AddressResolver,
LegacyAddressStrategy: options.AddressStrategy,
LegacyAddressFallbackDelay: options.AddressFallbackDelay,
} }
switch serverType { switch serverType {
case C.DNSTypeLocal: case C.DNSTypeLocal: