TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-21 06:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: drop hostinfo param from doSetHostinfoFilterServices

Browse Source 
The value being passed was the same as whats on b.hostinfo, so just
use that directly.

Updates #cleanup

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2023-10-23 10:18:40 -07:00 committed by Maisem Ali
parent 152390e80a
commit 0e89245c0f
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ipn/ipnlocal/local.go
View File

@ -2024,10 +2024,9 @@ func (b *LocalBackend) readPoller() {
b.hostinfo = new(tailcfg.Hostinfo) b.hostinfo = new(tailcfg.Hostinfo)
} }
b.hostinfo.Services = sl b.hostinfo.Services = sl
hi := b.hostinfo
b.mu.Unlock() b.mu.Unlock()
b.doSetHostinfoFilterServices(hi) b.doSetHostinfoFilterServices()
if isFirst { if isFirst {
isFirst = false isFirst = false
@ -2886,7 +2885,7 @@ func (b *LocalBackend) EditPrefs(mp *ipn.MaskedPrefs) (ipn.PrefsView, error) {
if mp.EggSet { if mp.EggSet {
mp.EggSet = false mp.EggSet = false
b.egg = true b.egg = true
go b.doSetHostinfoFilterServices(b.hostinfo.Clone()) go b.doSetHostinfoFilterServices()
} }
p0 := b.pm.CurrentPrefs() p0 := b.pm.CurrentPrefs()
p1 := b.pm.CurrentPrefs().AsStruct() p1 := b.pm.CurrentPrefs().AsStruct()
@ -3016,7 +3015,7 @@ func (b *LocalBackend) setPrefsLockedOnEntry(caller string, newp *ipn.Prefs) ipn
b.mu.Unlock() b.mu.Unlock()
if oldp.ShieldsUp() != newp.ShieldsUp || hostInfoChanged { if oldp.ShieldsUp() != newp.ShieldsUp || hostInfoChanged {
b.doSetHostinfoFilterServices(newHi) b.doSetHostinfoFilterServices()
} }
if netMap != nil { if netMap != nil {
@ -3142,11 +3141,7 @@ 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(hi *tailcfg.Hostinfo) { func (b *LocalBackend) doSetHostinfoFilterServices() {
if hi == nil {
b.logf("[unexpected] doSetHostinfoFilterServices with nil hostinfo")
return
}
b.mu.Lock() b.mu.Lock()
cc := b.cc cc := b.cc
if cc == nil { if cc == nil {
@ -3154,23 +3149,30 @@ func (b *LocalBackend) doSetHostinfoFilterServices(hi *tailcfg.Hostinfo) {
b.mu.Unlock() b.mu.Unlock()
return return
} }
if b.hostinfo == nil {
b.mu.Unlock()
b.logf("[unexpected] doSetHostinfoFilterServices with nil hostinfo")
return
}
peerAPIServices := b.peerAPIServicesLocked() peerAPIServices := b.peerAPIServicesLocked()
if b.egg { if b.egg {
peerAPIServices = append(peerAPIServices, tailcfg.Service{Proto: "egg", Port: 1}) 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
b.mu.Unlock() b.mu.Unlock()
// Make a shallow copy of hostinfo so we can mutate // Make a shallow copy of hostinfo so we can mutate
// at the Service field. // at the Service field.
hi2 := *hi // shallow copy
if !b.shouldUploadServices() { if !b.shouldUploadServices() {
hi2.Services = []tailcfg.Service{} hi.Services = []tailcfg.Service{}
} }
// Don't mutate hi.Service's underlying array. Append to // Don't mutate hi.Service's underlying array. Append to
// the slice with no free capacity. // the slice with no free capacity.
c := len(hi2.Services) c := len(hi.Services)
hi2.Services = append(hi2.Services[:c:c], peerAPIServices...) hi.Services = append(hi.Services[:c:c], peerAPIServices...)
cc.SetHostinfo(&hi2) cc.SetHostinfo(&hi)
} }
// NetMap returns the latest cached network map received from // NetMap returns the latest cached network map received from
@ -3662,7 +3664,7 @@ func (b *LocalBackend) initPeerAPIListener() {
b.peerAPIListeners = append(b.peerAPIListeners, pln) b.peerAPIListeners = append(b.peerAPIListeners, pln)
} }
go b.doSetHostinfoFilterServices(b.hostinfo.Clone()) go b.doSetHostinfoFilterServices()
} }
// magicDNSRootDomains returns the subset of nm.DNS.Domains that are the search domains for MagicDNS. // magicDNSRootDomains returns the subset of nm.DNS.Domains that are the search domains for MagicDNS.
@ -4391,7 +4393,7 @@ func (b *LocalBackend) setTCPPortsInterceptedFromNetmapAndPrefsLocked(prefs ipn.
if wire := b.wantIngressLocked(); b.hostinfo != nil && b.hostinfo.WireIngress != wire { if wire := b.wantIngressLocked(); b.hostinfo != nil && b.hostinfo.WireIngress != wire {
b.logf("Hostinfo.WireIngress changed to %v", wire) b.logf("Hostinfo.WireIngress changed to %v", wire)
b.hostinfo.WireIngress = wire b.hostinfo.WireIngress = wire
go b.doSetHostinfoFilterServices(b.hostinfo.Clone()) go b.doSetHostinfoFilterServices()
} }
b.setTCPPortsIntercepted(handlePorts) b.setTCPPortsIntercepted(handlePorts)