tailcfg: remove old DNS fields

The control plane server doesn't send these to modern clients so we
don't need them in the tree. The server has its own serialization code
to generate legacy MapResponses when needed.

Change-Id: Idd1e5d96ddf9d4306f2da550d20b77f0c252817a
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/5105/head
Brad Fitzpatrick 2 years ago committed by Brad Fitzpatrick
parent 9bd3b5b89c
commit b7f1fe7b0d

@ -165,12 +165,6 @@ func (ms *mapSession) netmapForResponse(resp *tailcfg.MapResponse) *netmap.Netwo
} }
ms.addUserProfile(peer.User) ms.addUserProfile(peer.User)
} }
if len(resp.DNS) > 0 {
nm.DNS.Nameservers = resp.DNS
}
if len(resp.SearchPaths) > 0 {
nm.DNS.Domains = resp.SearchPaths
}
if Debug.ProxyDNS { if Debug.ProxyDNS {
nm.DNS.Proxied = true nm.DNS.Proxied = true
} }

@ -1245,14 +1245,6 @@ type MapResponse struct {
// OnlineChange changes the value of a Peer Node.Online value. // OnlineChange changes the value of a Peer Node.Online value.
OnlineChange map[NodeID]bool `json:",omitempty"` OnlineChange map[NodeID]bool `json:",omitempty"`
// DNS is the same as DNSConfig.Nameservers.
// Only populated if MapRequest.Version < 9.
DNS []netaddr.IP `json:",omitempty"`
// SearchPaths is the old way to specify DNS search domains.
// Only populated if MapRequest.Version < 9.
SearchPaths []string `json:",omitempty"`
// DNSConfig contains the DNS settings for the client to use. // DNSConfig contains the DNS settings for the client to use.
// A nil value means no change from an earlier non-nil value. // A nil value means no change from an earlier non-nil value.
DNSConfig *DNSConfig `json:",omitempty"` DNSConfig *DNSConfig `json:",omitempty"`

Loading…
Cancel
Save