vanja/gluetun
1
0
Fork 0
mirror of https://github.com/qdm12/gluetun.git synced 2026-05-09 20:29:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

hotfix(dns): allow to use plain upstream type with selected builtin providers

Browse Source
This commit is contained in:
Quentin McGaw
2026-03-11 13:20:27 +00:00
parent a98b39a03f
commit e557971ae8
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/configuration/settings/dns.go
+13 -5
View File
@@ -69,19 +69,27 @@ func (d DNS) validate() (err error) {
} }
providers := provider.NewProviders() providers := provider.NewProviders()
selectedHasPlainIPv4, selectedHasPlainIPv6 := false, false
for _, providerName := range d.Providers { for _, providerName := range d.Providers {
_, err := providers.Get(providerName) provider, err := providers.Get(providerName)
if err != nil { if err != nil {
return err return err
} }
if !selectedHasPlainIPv4 && len(provider.Plain.IPv4) > 0 {
selectedHasPlainIPv4 = true
}
if !selectedHasPlainIPv6 && len(provider.Plain.IPv6) > 0 {
selectedHasPlainIPv6 = true
}
} }
if d.UpstreamType == DNSUpstreamTypePlain { if d.UpstreamType == DNSUpstreamTypePlain {
if *d.IPv6 && !slices.ContainsFunc(d.UpstreamPlainAddresses, func(addrPort netip.AddrPort) bool { if *d.IPv6 && !selectedHasPlainIPv6 &&
return addrPort.Addr().Is6() !slices.ContainsFunc(d.UpstreamPlainAddresses, func(addrPort netip.AddrPort) bool {
}) { return addrPort.Addr().Is6()
}) {
return fmt.Errorf("%w: in %d addresses", ErrDNSUpstreamPlainNoIPv6, len(d.UpstreamPlainAddresses)) return fmt.Errorf("%w: in %d addresses", ErrDNSUpstreamPlainNoIPv6, len(d.UpstreamPlainAddresses))
} else if !slices.ContainsFunc(d.UpstreamPlainAddresses, func(addrPort netip.AddrPort) bool { } else if !selectedHasPlainIPv4 && !slices.ContainsFunc(d.UpstreamPlainAddresses, func(addrPort netip.AddrPort) bool {
return addrPort.Addr().Is4() return addrPort.Addr().Is4()
}) { }) {
return fmt.Errorf("%w: in %d addresses", ErrDNSUpstreamPlainNoIPv4, len(d.UpstreamPlainAddresses)) return fmt.Errorf("%w: in %d addresses", ErrDNSUpstreamPlainNoIPv4, len(d.UpstreamPlainAddresses))