mirror of
https://github.com/qdm12/gluetun.git
synced 2025-12-10 20:07:32 -06:00
hotfix(dns): compilation error due to dns package upgrade on master
This commit is contained in:
parent
a1ece20617
commit
6023eb1878
@ -21,7 +21,7 @@ type Loop struct {
|
|||||||
state *state.State
|
state *state.State
|
||||||
server *server.Server
|
server *server.Server
|
||||||
filter *mapfilter.Filter
|
filter *mapfilter.Filter
|
||||||
localResolvers []netip.AddrPort
|
localResolvers []netip.Addr
|
||||||
resolvConf string
|
resolvConf string
|
||||||
client *http.Client
|
client *http.Client
|
||||||
logger Logger
|
logger Logger
|
||||||
|
|||||||
@ -11,7 +11,12 @@ import (
|
|||||||
func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
|
func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
|
||||||
defer close(done)
|
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 {
|
if *l.GetSettings().KeepNameserver {
|
||||||
l.logger.Warn("⚠️⚠️⚠️ keeping the default container nameservers, " +
|
l.logger.Warn("⚠️⚠️⚠️ keeping the default container nameservers, " +
|
||||||
|
|||||||
@ -27,7 +27,7 @@ func (l *Loop) SetSettings(ctx context.Context, settings settings.DNS) (
|
|||||||
}
|
}
|
||||||
|
|
||||||
func buildServerSettings(settings settings.DNS,
|
func buildServerSettings(settings settings.DNS,
|
||||||
filter *mapfilter.Filter, localResolvers []netip.AddrPort,
|
filter *mapfilter.Filter, localResolvers []netip.Addr,
|
||||||
logger Logger) (
|
logger Logger) (
|
||||||
serverSettings server.Settings, err error,
|
serverSettings server.Settings, err error,
|
||||||
) {
|
) {
|
||||||
@ -104,8 +104,13 @@ func buildServerSettings(settings settings.DNS,
|
|||||||
}
|
}
|
||||||
serverSettings.Middlewares = append(serverSettings.Middlewares, filterMiddleware)
|
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{
|
localDNSMiddleware, err := localdns.New(localdns.Settings{
|
||||||
Resolvers: localResolvers, // auto-detected at container start only
|
Resolvers: localResolversAddrPorts, // auto-detected at container start only
|
||||||
Logger: logger,
|
Logger: logger,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user