mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

net/dns: remove PerDomain from Config.

Browse Source 
It's currently unused, and no longer makes sense with the upcoming
DNS infrastructure. Keep it in tailcfg for now, since we need protocol
compat for a bit longer.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson
2021-04-01 22:54:40 -07:00
parent f77ba75d6c
commit cf361bb9b1
5 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net/dns/manager.go
View File

@ -45,10 +45,8 @@ type Manager struct {
func NewManager(mconfig ManagerConfig) *Manager {
mconfig.Logf = logger.WithPrefix(mconfig.Logf, "dns: ")
m := &Manager{
logf: mconfig.Logf,
impl: newManager(mconfig),
config: Config{PerDomain: mconfig.PerDomain},
logf: mconfig.Logf,
impl: newManager(mconfig),
mconfig: mconfig,
}
@ -72,16 +70,6 @@ func (m *Manager) Set(config Config) error {
return err
}
// Switching to and from per-domain mode may require a change of manager.
if config.PerDomain != m.config.PerDomain {
if err := m.impl.Down(); err != nil {
return err
}
m.mconfig.PerDomain = config.PerDomain
m.impl = newManager(m.mconfig)
m.logf("switched to %T", m.impl)
}
err := m.impl.Up(config)
// If we save the config, we will not retry next time. Only do this on success.
if err == nil {