qdm12/gluetun
1
0
Fork 0
mirror of https://github.com/qdm12/gluetun.git synced 2025-12-10 10:45:38 -06:00
Code Issues Packages Projects Releases 71 Wiki Activity

hotfix(dns): compilation error due to dns package upgrade on master

Browse Source
This commit is contained in:
Quentin McGaw 2025-11-14 21:24:40 +00:00
parent a1ece20617
commit 6023eb1878
No known key found for this signature in database
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/dns/loop.go
View File

@ -21,7 +21,7 @@ type Loop struct {
state *state.State
server *server.Server
filter *mapfilter.Filter
localResolvers []netip.AddrPort
localResolvers []netip.Addr
resolvConf string
client *http.Client
logger Logger

7
internal/dns/run.go
View File

@ -11,7 +11,12 @@ import (
func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
defer close(done)
l.localResolvers = nameserver.GetPrivateDNSServers()
var err error
l.localResolvers, err = nameserver.GetPrivateDNSServers()
if err != nil {
l.logger.Error("getting private DNS servers: " + err.Error())
return
}
if *l.GetSettings().KeepNameserver {
l.logger.Warn("⚠️⚠️⚠️ keeping the default container nameservers, " +

9
internal/dns/settings.go
View File

@ -27,7 +27,7 @@ func (l *Loop) SetSettings(ctx context.Context, settings settings.DNS) (
}
func buildServerSettings(settings settings.DNS,
filter *mapfilter.Filter, localResolvers []netip.AddrPort,
filter *mapfilter.Filter, localResolvers []netip.Addr,
logger Logger) (
serverSettings server.Settings, err error,
) {
@ -104,8 +104,13 @@ func buildServerSettings(settings settings.DNS,
}
serverSettings.Middlewares = append(serverSettings.Middlewares, filterMiddleware)
localResolversAddrPorts := make([]netip.AddrPort, len(localResolvers))
const defaultDNSPort = 53
for i, addr := range localResolvers {
localResolversAddrPorts[i] = netip.AddrPortFrom(addr, defaultDNSPort)
}
localDNSMiddleware, err := localdns.New(localdns.Settings{
Resolvers: localResolvers, // auto-detected at container start only
Resolvers: localResolversAddrPorts, // auto-detected at container start only
Logger: logger,
})
if err != nil {