mirror of
https://github.com/qdm12/gluetun.git
synced 2026-05-06 20:10:11 +02:00
Quentin McGaw
199ad77ec9
- Remove `DNS_SERVER` (aka DOT) option: the DNS server forwarder part is now always enabled (see below why) - Remove `DNS_KEEP_NAMESERVER`: the container will always use the built-in DNS server forwarder, because it can handle now local names with local resolvers (see #2970), it can use the `plain` upstream type (see https://github.com/qdm12/gluetun/commit/5ed6e8292278b54bb5081de0e8ccd0d63a275b3c) AND you can use `DNS_UPSTREAM_PLAIN_ADDRESSES` (see below) - Replace `DNS_ADDRESS` with `DNS_UPSTREAM_PLAIN_ADDRESSES`: - New CSV format with port, for example `ip1:port1,ip2:port2` - requires `DNS_UPSTREAM_TYPE=plain` to be set to use `DNS_UPSTREAM_PLAIN_ADDRESSES` (unless using retro `DNS_ADDRESS`) - retrocompatibility with `DNS_ADDRESS`. If set, force upstream type to plain and empty user-picked providers. 127.0.0.1 is now ignored since it's always set to this value internally. - Warning log on using private upstream resolvers updated - Warning log if using a private IP address for the plain DNS server which is not in your local subnets All in all, this greatly simplifies code and available options (less options for the same features is a win). It also allows you to specify multiple plain DNS resolvers on ports other than 53 if needed.
101 lines
2.1 KiB
Go
101 lines
2.1 KiB
Go
package dns
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/qdm12/dns/v2/pkg/nameserver"
|
|
"github.com/qdm12/gluetun/internal/constants"
|
|
)
|
|
|
|
func (l *Loop) Run(ctx context.Context, done chan<- struct{}) {
|
|
defer close(done)
|
|
|
|
var err error
|
|
l.localResolvers, err = nameserver.GetPrivateDNSServers()
|
|
if err != nil {
|
|
l.logger.Error("getting private DNS servers: " + err.Error())
|
|
return
|
|
}
|
|
|
|
const fallback = false
|
|
l.useUnencryptedDNS(fallback)
|
|
|
|
select {
|
|
case <-l.start:
|
|
case <-ctx.Done():
|
|
return
|
|
}
|
|
|
|
for ctx.Err() == nil {
|
|
// Upper scope variables for the DNS forwarder server only
|
|
// Their values are to be used if DOT=off
|
|
var runError <-chan error
|
|
|
|
for {
|
|
settings := l.GetSettings()
|
|
var err error
|
|
runError, err = l.setupServer(ctx, settings)
|
|
if err == nil {
|
|
l.backoffTime = defaultBackoffTime
|
|
l.logger.Infof("ready and using DNS server with %s upstream resolvers", settings.UpstreamType)
|
|
|
|
err = l.updateFiles(ctx, settings)
|
|
if err != nil {
|
|
l.logger.Warn("downloading block lists failed, skipping: " + err.Error())
|
|
}
|
|
break
|
|
}
|
|
|
|
l.signalOrSetStatus(constants.Crashed)
|
|
|
|
if ctx.Err() != nil {
|
|
return
|
|
}
|
|
l.logAndWait(ctx, err)
|
|
}
|
|
l.signalOrSetStatus(constants.Running)
|
|
|
|
l.userTrigger = false
|
|
|
|
exitLoop := l.runWait(ctx, runError)
|
|
if exitLoop {
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
func (l *Loop) runWait(ctx context.Context, runError <-chan error) (exitLoop bool) {
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
l.stopServer()
|
|
// TODO revert OS and Go nameserver when exiting
|
|
return true
|
|
case <-l.stop:
|
|
l.userTrigger = true
|
|
l.logger.Info("stopping")
|
|
const fallback = false
|
|
l.useUnencryptedDNS(fallback)
|
|
l.stopServer()
|
|
l.stopped <- struct{}{}
|
|
case <-l.start:
|
|
l.userTrigger = true
|
|
l.logger.Info("starting")
|
|
return false
|
|
case err := <-runError: // unexpected error
|
|
l.statusManager.SetStatus(constants.Crashed)
|
|
const fallback = true
|
|
l.useUnencryptedDNS(fallback)
|
|
l.logAndWait(ctx, err)
|
|
return false
|
|
}
|
|
}
|
|
}
|
|
|
|
func (l *Loop) stopServer() {
|
|
stopErr := l.server.Stop()
|
|
if stopErr != nil {
|
|
l.logger.Error("stopping server: " + stopErr.Error())
|
|
}
|
|
}
|