mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-09-21 21:51:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: remove UnlockEarly from doSetHostinfoFilterServices

Browse Source 
Pull the lock-bearing code into a closure, and use a clone rather than a
shallow copy of the hostinfo record.

Updates #11649

Change-Id: I4f1d42c42ce45e493b204baae0d50b1cbf82b102
Signed-off-by: M. J. Fromberger <fromberger@tailscale.com>
This commit is contained in:
M. J. Fromberger 2025-08-25 09:16:29 -07:00 committed by M. J. Fromberger
parent 9002e5fd6b
commit b411ffb52f
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ipn/ipnlocal/local.go
View File

@ -4896,36 +4896,34 @@ func (b *LocalBackend) peerAPIServicesLocked() (ret []tailcfg.Service) {
// TODO(danderson): we shouldn't be mangling hostinfo here after // TODO(danderson): we shouldn't be mangling hostinfo here after
// painstakingly constructing it in twelvety other places. // painstakingly constructing it in twelvety other places.
func (b *LocalBackend) doSetHostinfoFilterServices() { func (b *LocalBackend) doSetHostinfoFilterServices() {
unlock := b.lockAndGetUnlock() // Check the control client, hostinfo, and services under the mutex.
defer unlock() // On return, either both the client and hostinfo are nil, or both are non-nil.
// When non-nil, the Hostinfo is a clone of the value carried by b, safe to modify.
cc, hi, peerAPIServices := func() (controlclient.Client, *tailcfg.Hostinfo, []tailcfg.Service) {
b.mu.Lock()
defer b.mu.Unlock()
cc := b.cc if b.cc == nil {
if cc == nil { return nil, nil, nil // control client isn't up yet
// Control client isn't up yet. } else if b.hostinfo == nil {
b.logf("[unexpected] doSetHostinfoFilterServices with nil hostinfo")
return nil, nil, nil
}
svc := b.peerAPIServicesLocked()
if b.egg {
svc = append(svc, tailcfg.Service{Proto: "egg", Port: 1})
}
// Make a clone of hostinfo so we can mutate the service field, below.
return b.cc, b.hostinfo.Clone(), svc
}()
if cc == nil || hi == nil {
return return
} }
if b.hostinfo == nil {
b.logf("[unexpected] doSetHostinfoFilterServices with nil hostinfo")
return
}
peerAPIServices := b.peerAPIServicesLocked()
if b.egg {
peerAPIServices = append(peerAPIServices, tailcfg.Service{Proto: "egg", Port: 1})
}
// TODO(maisem,bradfitz): store hostinfo as a view, not as a mutable struct.
hi := *b.hostinfo // shallow copy
unlock.UnlockEarly()
// Make a shallow copy of hostinfo so we can mutate
// at the Service field.
if !b.shouldUploadServices() { if !b.shouldUploadServices() {
hi.Services = []tailcfg.Service{} hi.Services = []tailcfg.Service{}
} }
// Don't mutate hi.Service's underlying array. Append to hi.Services = append(hi.Services, peerAPIServices...)
// the slice with no free capacity.
c := len(hi.Services)
hi.Services = append(hi.Services[:c:c], peerAPIServices...)
hi.PushDeviceToken = b.pushDeviceToken.Load() hi.PushDeviceToken = b.pushDeviceToken.Load()
// Compare the expected ports from peerAPIServices to the actual ports in hi.Services. // Compare the expected ports from peerAPIServices to the actual ports in hi.Services.
@ -4935,7 +4933,7 @@ func (b *LocalBackend) doSetHostinfoFilterServices() {
b.logf("Hostinfo peerAPI ports changed: expected %v, got %v", expectedPorts, actualPorts) b.logf("Hostinfo peerAPI ports changed: expected %v, got %v", expectedPorts, actualPorts)
} }
cc.SetHostinfo(&hi) cc.SetHostinfo(hi)
} }
type portPair struct { type portPair struct {