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

ipn/ipnlocal: use ServerConfig views internally

Browse Source 
Updates tailscale/corp#7515

Change-Id: Ica2bc44b92d281d5ce16cee55b7ca51c7910145c
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2022-11-09 13:15:59 -08:00
committed by Brad Fitzpatrick
parent 4de643b714
commit 4bccc02413
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ipn/ipnlocal/local.go
View File

@@ -198,8 +198,8 @@ type LocalBackend struct {
componentLogUntil map[string]componentLogState
// ServeConfig fields. (also guarded by mu)
lastServeConfJSON mem.RO // last JSON that was parsed into serveConfig
serveConfig ipn.ServeConfig // only replaced wholesale; don't mutate in-place
lastServeConfJSON mem.RO // last JSON that was parsed into serveConfig
serveConfig ipn.ServeConfigView // or !Valid if none
// statusLock must be held before calling statusChanged.Wait() or
// statusChanged.Broadcast().
@@ -3514,13 +3514,18 @@ func (b *LocalBackend) setTCPPortsInterceptedFromNetmapAndPrefsLocked() {
var conf ipn.ServeConfig
if err := json.Unmarshal(confj, &conf); err != nil {
b.logf("invalid ServeConfig %q in StateStore: %v", confKey, err)
b.serveConfig = ipn.ServeConfigView{}
} else {
b.serveConfig = conf.View()
}
b.serveConfig = conf
}
for p := range b.serveConfig.TCP {
if p > 0 && p <= math.MaxUint16 {
handlePorts = append(handlePorts, uint16(p))
}
if b.serveConfig.Valid() {
b.serveConfig.TCP().Range(func(port int, _ ipn.TCPPortHandlerView) bool {
if port > 0 && port <= math.MaxUint16 {
handlePorts = append(handlePorts, uint16(port))
}
return true
})
}
}
}