TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

tailcfg, control/controlclient: make MapResponse.CollectServices an opt.Bool

Browse Source 
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-01-12 07:54:34 -08:00 committed by Brad Fitzpatrick
parent a746ff5de7
commit 9d73f84a71
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
control/controlclient/direct.go
View File

@ -661,6 +661,7 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*Netw
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
var collectServices bool
// If allowStream, then the server will use an HTTP long poll to // If allowStream, then the server will use an HTTP long poll to
// return incremental results. There is always one response right // return incremental results. There is always one response right
@ -742,6 +743,10 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*Netw
lastParsedPacketFilter = c.parsePacketFilter(pf) lastParsedPacketFilter = c.parsePacketFilter(pf)
} }
if v, ok := resp.CollectServices.Get(); ok {
collectServices = v
}
// Get latest localPort. This might've changed if // Get latest localPort. This might've changed if
// a lite map update occured meanwhile. This only affects // a lite map update occured meanwhile. This only affects
// the end-to-end test. // the end-to-end test.
@ -765,7 +770,7 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*Netw
DNS: resp.DNSConfig, DNS: resp.DNSConfig,
Hostinfo: resp.Node.Hostinfo, Hostinfo: resp.Node.Hostinfo,
PacketFilter: lastParsedPacketFilter, PacketFilter: lastParsedPacketFilter,
CollectServices: resp.CollectServices, CollectServices: collectServices,
DERPMap: lastDERPMap, DERPMap: lastDERPMap,
Debug: resp.Debug, Debug: resp.Debug,
} }

4
tailcfg/tailcfg.go
View File

@ -667,7 +667,9 @@ type MapResponse struct {
// CollectServices reports whether this node's Tailnet has // CollectServices reports whether this node's Tailnet has
// requested that info about services be included in HostInfo. // requested that info about services be included in HostInfo.
CollectServices bool `json:",omitempty"` // If unset, the most recent non-empty MapResponse value in
// the HTTP response stream is used.
CollectServices opt.Bool `json:",omitempty"`
// PacketFilter are the firewall rules. // PacketFilter are the firewall rules.
// //