TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

web: use EditPrefs instead of passing UpdatePrefs to starting (#12040)

Browse Source 
Web version of https://github.com/tailscale/tailscale-android/pull/370
This allows us to update the prefs rather than creating new prefs

Updates tailscale/tailscale#11731

Signed-off-by: kari-ts <kari@tailscale.com>
This commit is contained in:
kari-ts 2024-05-07 13:25:20 -07:00 committed by GitHub
parent 80df8ffb85
commit 3c4c9dc1d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/web/web.go
View File

@ -1150,7 +1150,15 @@ func (s *Server) tailscaleUp(ctx context.Context, st *ipnstate.Status, opt tails
if !isRunning { if !isRunning {
ipnOptions := ipn.Options{AuthKey: opt.AuthKey} ipnOptions := ipn.Options{AuthKey: opt.AuthKey}
if opt.ControlURL != "" { if opt.ControlURL != "" {
ipnOptions.UpdatePrefs = &ipn.Prefs{ControlURL: opt.ControlURL} _, err := s.lc.EditPrefs(ctx, &ipn.MaskedPrefs{
Prefs: ipn.Prefs{
ControlURL: opt.ControlURL,
},
ControlURLSet: true,
})
if err != nil {
s.logf("edit prefs: %v", err)
}
} }
if err := s.lc.Start(ctx, ipnOptions); err != nil { if err := s.lc.Start(ctx, ipnOptions); err != nil {
s.logf("start: %v", err) s.logf("start: %v", err)