lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tailcfg, control/controlclient: make nil MapResponse.DNSConfig mean unchanged (mapver15) 

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/1697/head
Brad Fitzpatrick 2021-04-12 12:12:13 -07:00 committed by Brad Fitzpatrick
parent a3113a793a
commit ccb322db04
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
control/controlclient/direct.go
View File

@ -717,6 +717,7 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*netm
} }
}() }()
var lastDNSConfig = new(tailcfg.DNSConfig)
var lastDERPMap *tailcfg.DERPMap var lastDERPMap *tailcfg.DERPMap
var lastUserProfile = map[tailcfg.UserID]tailcfg.UserProfile{} var lastUserProfile = map[tailcfg.UserID]tailcfg.UserProfile{}
var lastParsedPacketFilter []filter.Match var lastParsedPacketFilter []filter.Match
@ -820,6 +821,9 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*netm
if pf := resp.PacketFilter; pf != nil { if pf := resp.PacketFilter; pf != nil {
lastParsedPacketFilter = c.parsePacketFilter(pf) lastParsedPacketFilter = c.parsePacketFilter(pf)
} }
if c := resp.DNSConfig; c != nil {
lastDNSConfig = c
}
if v, ok := resp.CollectServices.Get(); ok { if v, ok := resp.CollectServices.Get(); ok {
collectServices = v collectServices = v
@ -846,7 +850,7 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*netm
User: resp.Node.User, User: resp.Node.User,
UserProfiles: make(map[tailcfg.UserID]tailcfg.UserProfile), UserProfiles: make(map[tailcfg.UserID]tailcfg.UserProfile),
Domain: resp.Domain, Domain: resp.Domain,
DNS: resp.DNSConfig, DNS: *lastDNSConfig,
Hostinfo: resp.Node.Hostinfo, Hostinfo: resp.Node.Hostinfo,
PacketFilter: lastParsedPacketFilter, PacketFilter: lastParsedPacketFilter,
CollectServices: collectServices, CollectServices: collectServices,

10
tailcfg/tailcfg.go
View File

@ -37,7 +37,8 @@ import (
// 12: 2021-03-04: client understands PingRequest // 12: 2021-03-04: client understands PingRequest
// 13: 2021-03-19: client understands FilterRule.IPProto // 13: 2021-03-19: client understands FilterRule.IPProto
// 14: 2021-04-07: client understands DNSConfig.Routes and DNSConfig.Resolvers // 14: 2021-04-07: client understands DNSConfig.Routes and DNSConfig.Resolvers
const CurrentMapRequestVersion = 14 // 15: 2021-04-12: client treats nil MapResponse.DNSConfig as meaning unchanged
const CurrentMapRequestVersion = 15
type StableID string type StableID string
@ -875,11 +876,8 @@ type MapResponse struct {
SearchPaths []string `json:",omitempty"` 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.
// TODO(bradfitz): make this a pointer and conditionally sent DNSConfig *DNSConfig `json:",omitempty"`
// only if changed, like DERPMap, PacketFilter, etc. It's
// small, though.
DNSConfig DNSConfig `json:",omitempty"`
// Domain is the name of the network that this node is // Domain is the name of the network that this node is
// in. It's either of the form "example.com" (for user // in. It's either of the form "example.com" (for user