TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-05 14:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/dns: add a Primary field to OSConfig.

Browse Source 
Currently ignored.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2021-04-05 13:05:47 -07:00
parent b2a597b288
commit de6dc4c510
9 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/dns/config.go
View File

@ -35,11 +35,3 @@ type Config struct {
// return NXDOMAIN.
AuthoritativeSuffixes []string
}
// OSConfig is an OS DNS configuration.
type OSConfig struct {
// Nameservers are the IP addresses of the nameservers to use.
Nameservers []netaddr.IP
// Domains are the search domains to use.
Domains []string
}

4
net/dns/direct.go
View File

@ -159,8 +159,8 @@ func (m directManager) SetDNS(config OSConfig) error {
return nil
}
func (m directManager) RoutingMode() RoutingMode {
return RoutingModeNone
func (m directManager) SupportsSplitDNS() bool {
return false
}
func (m directManager) Close() error {

4
net/dns/manager_windows.go
View File

@ -113,8 +113,8 @@ func (m windowsManager) SetDNS(config OSConfig) error {
return nil
}
func (m windowsManager) RoutingMode() RoutingMode {
return RoutingModeNone
func (m windowsManager) SupportsSplitDNS() bool {
return false
}
func (m windowsManager) Close() error {

2
net/dns/nm.go
View File

@ -200,7 +200,7 @@ func (m nmManager) SetDNS(config OSConfig) error {
return nil
}
func (m nmManager) RoutingMode() RoutingMode { return RoutingModeNone }
func (m nmManager) SupportsSplitDNS() bool { return false }
func (m nmManager) Close() error {
return m.SetDNS(OSConfig{})

6
net/dns/noop.go
View File

@ -6,9 +6,9 @@
type noopManager struct{}
func (m noopManager) SetDNS(OSConfig) error { return nil }
func (m noopManager) RoutingMode() RoutingMode { return RoutingModeNone }
func (m noopManager) Close() error { return nil }
func (m noopManager) SetDNS(OSConfig) error { return nil }
func (m noopManager) SupportsSplitDNS() bool { return false }
func (m noopManager) Close() error { return nil }
func NewNoopManager() noopManager {
return noopManager{}

39
net/dns/osconfig.go
View File

@ -4,22 +4,7 @@
package dns
// DNSRoutingMode describes the type of per-domain DNS routing that
// the OS is capable of.
type RoutingMode int
const (
// RoutingModeNone means the OS only supports setting a single
// primary set of DNS resolvers.
RoutingModeNone RoutingMode = iota
// RoutingModeSingle means the OS supports a set of
// primary resolvers, as well as one set of additional per-suffix
// resolvers per network interface.
RoutingModeSingle
// RoutingModeMulti means the OS supports a set of primary
// resolvers, as well as an arbitrary overlay of DNS routes.
RoutingModeMulti
)
import "inet.af/netaddr"
// An OSConfigurator applies DNS settings to the operating system.
type OSConfigurator interface {
@ -28,9 +13,25 @@ type OSConfigurator interface {
// configuration is removed.
// SetDNS must not be called after Close.
SetDNS(cfg OSConfig) error
// DNSRoutingMode reports the DNS routing capabilities of this OS
// configurator.
RoutingMode() RoutingMode
// SupportsSplitDNS reports whether the configurator is capable of
// installing a resolver only for specific DNS suffixes. If false,
// the configurator can only set a global resolver.
SupportsSplitDNS() bool
// Close removes Tailscale-related DNS configuration from the OS.
Close() error
}
// OSConfig is an OS DNS configuration.
type OSConfig struct {
// Nameservers are the IP addresses of the nameservers to use.
Nameservers []netaddr.IP
// Domains are the search domains to use.
Domains []string
// Primary indicates whether to set Nameservers as the
// primary/"default" resolvers for the system.
// If false, Nameservers will be set as resolvers for Domains
// only.
// Primary=false is only allowed for OSConfigurators that report
// SupportsSplitDNS.
Primary bool
}

4
net/dns/resolvconf.go
View File

@ -138,8 +138,8 @@ func (m resolvconfManager) SetDNS(config OSConfig) error {
return nil
}
func (m resolvconfManager) RoutingMode() RoutingMode {
return RoutingModeNone
func (m resolvconfManager) SupportsSplitDNS() bool {
return false
}
func (m resolvconfManager) Close() error {

4
net/dns/resolved.go
View File

@ -153,8 +153,8 @@ func (m resolvedManager) SetDNS(config OSConfig) error {
return nil
}
func (m resolvedManager) RoutingMode() RoutingMode {
return RoutingModeNone
func (m resolvedManager) SupportsSplitDNS() bool {
return false
}
func (m resolvedManager) Close() error {

10
wgengine/router/callback.go
View File

@ -15,8 +15,8 @@
// Mainly used as a shim for OSes that want to set both network and
// DNS configuration simultaneously (iOS, android).
type CallbackRouter struct {
SetBoth func(rcfg *Config, dcfg *dns.OSConfig) error
DNSMode dns.RoutingMode
SetBoth func(rcfg *Config, dcfg *dns.OSConfig) error
SplitDNS bool
mu sync.Mutex // protects all the following
rcfg *Config // last applied router config
@ -44,9 +44,9 @@ func (r *CallbackRouter) SetDNS(dcfg dns.OSConfig) error {
return r.SetBoth(r.rcfg, r.dcfg)
}
// RoutingMode implements dns.OSConfigurator.
func (r *CallbackRouter) RoutingMode() dns.RoutingMode {
return r.DNSMode
// SupportsSplitDNS implements dns.OSConfigurator.
func (r *CallbackRouter) SupportsSplitDNS() bool {
return r.SplitDNS
}
func (r *CallbackRouter) Close() error {