all: s/Magic DNS/MagicDNS/ for consistency

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/1576/head
Brad Fitzpatrick 4 years ago committed by Brad Fitzpatrick
parent 77ec80538a
commit e2b3d9aa5f

@ -37,7 +37,7 @@ var (
) )
// TailscaleServiceIP returns the listen address of services // TailscaleServiceIP returns the listen address of services
// provided by Tailscale itself such as the Magic DNS proxy. // provided by Tailscale itself such as the MagicDNS proxy.
func TailscaleServiceIP() netaddr.IP { func TailscaleServiceIP() netaddr.IP {
serviceIP.Do(func() { mustIP(&serviceIP.v, "100.100.100.100") }) serviceIP.Do(func() { mustIP(&serviceIP.v, "100.100.100.100") })
return serviceIP.v return serviceIP.v

@ -731,7 +731,7 @@ type DNSConfig struct {
// in which case Nameservers applies to all DNS requests regardless of PerDomain's value. // in which case Nameservers applies to all DNS requests regardless of PerDomain's value.
PerDomain bool PerDomain bool
// Proxied indicates whether DNS requests are proxied through a tsdns.Resolver. // Proxied indicates whether DNS requests are proxied through a tsdns.Resolver.
// This enables Magic DNS. It is togglable independently of PerDomain. // This enables MagicDNS. It is togglable independently of PerDomain.
Proxied bool Proxied bool
} }

@ -234,7 +234,7 @@ func (m DNSMap) Resolve(ctx context.Context, addr string) (netaddr.IPPort, error
return netaddr.IPPort{IP: ip, Port: uint16(port16)}, nil return netaddr.IPPort{IP: ip, Port: uint16(port16)}, nil
} }
// No Magic DNS name so try real DNS. // No MagicDNS name so try real DNS.
var r net.Resolver var r net.Resolver
ips, err := r.LookupIP(ctx, "ip", host) ips, err := r.LookupIP(ctx, "ip", host)
if err != nil { if err != nil {

@ -23,7 +23,7 @@ type Config struct {
// if the manager does not support per-domain settings. // if the manager does not support per-domain settings.
PerDomain bool PerDomain bool
// Proxied indicates whether DNS requests are proxied through a tsdns.Resolver. // Proxied indicates whether DNS requests are proxied through a tsdns.Resolver.
// This enables Magic DNS. // This enables MagicDNS.
Proxied bool Proxied bool
} }

Loading…
Cancel
Save