mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: some more variable renames 

Missed in earlier commit.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-04-07 21:17:33 -07:00
parent e86b7752ef
commit 71432c6449
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipn/ipnlocal/local.go
View File

@ -653,7 +653,7 @@ func (b *LocalBackend) Start(opts ipn.Options) error {
// let controlclient initialize it // let controlclient initialize it
persistv = &persist.Persist{} persistv = &persist.Persist{}
} }
cli, err := controlclient.New(controlclient.Options{ cc, err := controlclient.New(controlclient.Options{
GetMachinePrivateKey: b.createGetMachinePrivateKeyFunc(), GetMachinePrivateKey: b.createGetMachinePrivateKeyFunc(),
Logf: logger.WithPrefix(b.logf, "control: "), Logf: logger.WithPrefix(b.logf, "control: "),
Persist: *persistv, Persist: *persistv,
@ -676,15 +676,15 @@ func (b *LocalBackend) Start(opts ipn.Options) error {
} }
b.mu.Lock() b.mu.Lock()
b.cc = cli b.cc = cc
endpoints := b.endpoints endpoints := b.endpoints
b.mu.Unlock() b.mu.Unlock()
if endpoints != nil { if endpoints != nil {
cli.UpdateEndpoints(0, endpoints) cc.UpdateEndpoints(0, endpoints)
} }
cli.SetStatusFunc(b.setClientStatus) cc.SetStatusFunc(b.setClientStatus)
b.e.SetStatusCallback(b.setWgengineStatus) b.e.SetStatusCallback(b.setWgengineStatus)
b.e.SetNetInfoCallback(b.setNetInfo) b.e.SetNetInfoCallback(b.setNetInfo)
@ -698,7 +698,7 @@ func (b *LocalBackend) Start(opts ipn.Options) error {
b.send(ipn.Notify{Prefs: prefs}) b.send(ipn.Notify{Prefs: prefs})
if wantRunning { if wantRunning {
cli.Login(nil, controlclient.LoginDefault) cc.Login(nil, controlclient.LoginDefault)
} }
return nil return nil
} }
@ -1884,7 +1884,9 @@ func (b *LocalBackend) requestEngineStatusAndWait() {
b.statusLock.Unlock() b.statusLock.Unlock()
} }
// Logout tells the controlclient that we want to log out, and transitions the local engine to the logged-out state without waiting for controlclient to be in that state. // Logout tells the controlclient that we want to log out, and
// transitions the local engine to the logged-out state without
// waiting for controlclient to be in that state.
// //
// TODO(danderson): controlclient Logout does nothing useful, and we // TODO(danderson): controlclient Logout does nothing useful, and we
// shouldn't be transitioning to a state based on what we believe // shouldn't be transitioning to a state based on what we believe