TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-07-13 17:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn, control/controlclient: fix some data races

Browse Source 
More remain.

Fixes tailscale/corp#432
This commit is contained in:
Brad Fitzpatrick 2020-07-08 16:49:02 -07:00
parent de875a4d87
commit a8b95571fb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control/controlclient/direct.go
View File

@ -456,7 +456,7 @@ func (c *Direct) PollNetMap(ctx context.Context, maxPolls int, cb func(*NetworkM
persist := c.persist persist := c.persist
serverURL := c.serverURL serverURL := c.serverURL
serverKey := c.serverKey serverKey := c.serverKey
hostinfo := c.hostinfo hostinfo := c.hostinfo.Clone()
backendLogID := hostinfo.BackendLogID backendLogID := hostinfo.BackendLogID
localPort := c.localPort localPort := c.localPort
ep := append([]string(nil), c.endpoints...) ep := append([]string(nil), c.endpoints...)

3
ipn/local.go
View File

@ -712,11 +712,12 @@ func (b *LocalBackend) SetPrefs(new *Prefs) {
newHi.Hostname = h newHi.Hostname = h
} }
b.hostinfo = newHi b.hostinfo = newHi
hostInfoChanged := !oldHi.Equal(newHi)
b.mu.Unlock() b.mu.Unlock()
b.logf("SetPrefs: %v", new.Pretty()) b.logf("SetPrefs: %v", new.Pretty())
if old.ShieldsUp != new.ShieldsUp || !oldHi.Equal(newHi) { if old.ShieldsUp != new.ShieldsUp || hostInfoChanged {
b.doSetHostinfoFilterServices(newHi) b.doSetHostinfoFilterServices(newHi)
} }