net/dns: add a Primary field to OSConfig.

Currently ignored.

Signed-off-by: David Anderson <danderson@tailscale.com>

net/dns/config.go

@@ -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
-}

net/dns/direct.go

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

net/dns/manager_windows.go

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

net/dns/nm.go

@@ -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{})

net/dns/noop.go

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

net/dns/osconfig.go

@@ -4,22 +4,7 @@
 
 package dns
 
-// DNSRoutingMode describes the type of per-domain DNS routing that
+import "inet.af/netaddr"
-// 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
-)
 
 // 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
+	// SupportsSplitDNS reports whether the configurator is capable of
-	// configurator.
+	// installing a resolver only for specific DNS suffixes. If false,
-	RoutingMode() RoutingMode
+	// 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
+}

net/dns/resolvconf.go

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

net/dns/resolved.go

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

wgengine/router/callback.go

@@ -16,7 +16,7 @@ import (
 // DNS configuration simultaneously (iOS, android).
 type CallbackRouter struct {
 	SetBoth  func(rcfg *Config, dcfg *dns.OSConfig) error
-	DNSMode dns.RoutingMode
+	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.
+// SupportsSplitDNS implements dns.OSConfigurator.
-func (r *CallbackRouter) RoutingMode() dns.RoutingMode {
+func (r *CallbackRouter) SupportsSplitDNS() bool {
-	return r.DNSMode
+	return r.SplitDNS
 }
 
 func (r *CallbackRouter) Close() error {