35b6b709b2
- New CSV format with port, for example `ip1:port1,ip2:port2` - 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. - requires `DNS_UPSTREAM_TYPE=plain` must be set to use `DNS_UPSTREAM_PLAIN_ADDRESSES` (unless using retro `DNS_ADDRESS`) - Warning log on using private upstream resolvers updated
56 lines
1.2 KiB
Go
56 lines
1.2 KiB
Go
package dns
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
|
|
"github.com/qdm12/dns/v2/pkg/check"
|
|
"github.com/qdm12/dns/v2/pkg/nameserver"
|
|
"github.com/qdm12/dns/v2/pkg/server"
|
|
)
|
|
|
|
var errUpdateBlockLists = errors.New("cannot update filter block lists")
|
|
|
|
func (l *Loop) setupServer(ctx context.Context) (runError <-chan error, err error) {
|
|
err = l.updateFiles(ctx)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%w: %w", errUpdateBlockLists, err)
|
|
}
|
|
|
|
settings := l.GetSettings()
|
|
|
|
serverSettings, err := buildServerSettings(settings, l.filter, l.localResolvers, l.logger)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("building server settings: %w", err)
|
|
}
|
|
|
|
server, err := server.New(serverSettings)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("creating server: %w", err)
|
|
}
|
|
|
|
runError, err = server.Start(ctx)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("starting server: %w", err)
|
|
}
|
|
l.server = server
|
|
|
|
// use internal DNS server
|
|
nameserver.UseDNSInternally(nameserver.SettingsInternalDNS{})
|
|
err = nameserver.UseDNSSystemWide(nameserver.SettingsSystemDNS{
|
|
ResolvPath: l.resolvConf,
|
|
})
|
|
if err != nil {
|
|
l.logger.Error(err.Error())
|
|
}
|
|
|
|
err = check.WaitForDNS(ctx, check.Settings{})
|
|
if err != nil {
|
|
l.stopServer()
|
|
return nil, err
|
|
}
|
|
|
|
return runError, nil
|
|
}
|