From e2b3d9aa5fe6e73f12796e7af46deb4d3e13131c Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 23 Mar 2021 10:21:01 -0700 Subject: [PATCH] all: s/Magic DNS/MagicDNS/ for consistency Signed-off-by: Brad Fitzpatrick --- net/tsaddr/tsaddr.go | 2 +- tailcfg/tailcfg.go | 2 +- wgengine/netstack/netstack.go | 2 +- wgengine/router/dns/config.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/tsaddr/tsaddr.go b/net/tsaddr/tsaddr.go index 44cf5cf23..9bf81326e 100644 --- a/net/tsaddr/tsaddr.go +++ b/net/tsaddr/tsaddr.go @@ -37,7 +37,7 @@ var ( ) // 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 { serviceIP.Do(func() { mustIP(&serviceIP.v, "100.100.100.100") }) return serviceIP.v diff --git a/tailcfg/tailcfg.go b/tailcfg/tailcfg.go index 7d615867c..e070c82af 100644 --- a/tailcfg/tailcfg.go +++ b/tailcfg/tailcfg.go @@ -731,7 +731,7 @@ type DNSConfig struct { // in which case Nameservers applies to all DNS requests regardless of PerDomain's value. PerDomain bool // 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 } diff --git a/wgengine/netstack/netstack.go b/wgengine/netstack/netstack.go index dbf6736c2..8aba261e6 100644 --- a/wgengine/netstack/netstack.go +++ b/wgengine/netstack/netstack.go @@ -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 } - // No Magic DNS name so try real DNS. + // No MagicDNS name so try real DNS. var r net.Resolver ips, err := r.LookupIP(ctx, "ip", host) if err != nil { diff --git a/wgengine/router/dns/config.go b/wgengine/router/dns/config.go index 2b6ff615a..0f752d0f8 100644 --- a/wgengine/router/dns/config.go +++ b/wgengine/router/dns/config.go @@ -23,7 +23,7 @@ type Config struct { // if the manager does not support per-domain settings. PerDomain bool // Proxied indicates whether DNS requests are proxied through a tsdns.Resolver. - // This enables Magic DNS. + // This enables MagicDNS. Proxied bool }