ipn/localapi: move EditPrefs to localapi

Follow-up/revision to recent 53cfff109b which
added EditPrefs.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2021-04-11 16:10:31 -07:00
parent 84430cdfa1
commit 00d641d9fc
7 changed files with 41 additions and 47 deletions

View File

@@ -1302,17 +1302,18 @@ func (b *LocalBackend) SetCurrentUserID(uid string) {
b.mu.Unlock()
}
func (b *LocalBackend) EditPrefs(mp *ipn.MaskedPrefs) {
func (b *LocalBackend) EditPrefs(mp *ipn.MaskedPrefs) (*ipn.Prefs, error) {
b.mu.Lock()
p0 := b.prefs.Clone()
p1 := b.prefs.Clone()
p1.ApplyEdits(mp)
if p1.Equals(p0) {
b.mu.Unlock()
return
return p1, nil
}
b.logf("EditPrefs: %v", mp.Pretty())
b.setPrefsLockedOnEntry("EditPrefs", p1)
return p1, nil
}
// SetPrefs saves new user preferences and propagates them throughout