TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-12-01 14:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipnlocal: don't pause the controlclient until we get at least one netmap.

Browse Source 
Without this, macOS would fail to display its menu state correctly if you
started it while !WantRunning. It relies on the netmap in order to show
the logged-in username.

Signed-off-by: Avery Pennarun <apenwarr@tailscale.com>
This commit is contained in:
Avery Pennarun 2021-04-30 06:08:26 -04:00
parent 4ef207833b
commit 0181a4d0ac
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
control/controlclient/auto.go
View File

@ -129,6 +129,7 @@ func (c *Auto) SetPaused(paused bool) {
if paused == c.paused { if paused == c.paused {
return return
} }
c.logf("setPaused(%v)", paused)
c.paused = paused c.paused = paused
if paused { if paused {
// Only cancel the map routine. (The auth routine isn't expensive // Only cancel the map routine. (The auth routine isn't expensive
@ -267,7 +268,7 @@ func (c *Auto) authRoutine() {
if goal != nil { if goal != nil {
c.logf("authRoutine: %s; wantLoggedIn=%v", c.state, goal.wantLoggedIn) c.logf("authRoutine: %s; wantLoggedIn=%v", c.state, goal.wantLoggedIn)
} else { } else {
c.logf("authRoutine: %s; goal=nil", c.state) c.logf("authRoutine: %s; goal=nil paused=%v", c.state, c.paused)
} }
c.mu.Unlock() c.mu.Unlock()

5
ipn/ipnlocal/local.go
View File

@ -234,7 +234,7 @@ func (b *LocalBackend) linkChange(major bool, ifst *interfaces.State) {
networkUp := ifst.AnyInterfaceUp() networkUp := ifst.AnyInterfaceUp()
if b.cc != nil { if b.cc != nil {
go b.cc.SetPaused(b.state == ipn.Stopped || !networkUp) go b.cc.SetPaused((b.state == ipn.Stopped && b.netMap != nil) || !networkUp)
} }
// If the PAC-ness of the network changed, reconfig wireguard+route to // If the PAC-ness of the network changed, reconfig wireguard+route to
@ -2067,6 +2067,7 @@ func (b *LocalBackend) enterState(newState ipn.State) {
b.state = newState b.state = newState
prefs := b.prefs prefs := b.prefs
cc := b.cc cc := b.cc
netMap := b.netMap
networkUp := b.prevIfState.AnyInterfaceUp() networkUp := b.prevIfState.AnyInterfaceUp()
activeLogin := b.activeLogin activeLogin := b.activeLogin
authURL := b.authURL authURL := b.authURL
@ -2088,7 +2089,7 @@ func (b *LocalBackend) enterState(newState ipn.State) {
b.send(ipn.Notify{State: &newState}) b.send(ipn.Notify{State: &newState})
if cc != nil { if cc != nil {
cc.SetPaused(newState == ipn.Stopped || !networkUp) cc.SetPaused((newState == ipn.Stopped && netMap != nil) || !networkUp)
} }
switch newState { switch newState {

6
ipn/ipnlocal/state_test.go
View File

@ -751,7 +751,11 @@ func TestStateMachine(t *testing.T) {
// NOTE: cc.Shutdown() is correct here, since we didn't call // NOTE: cc.Shutdown() is correct here, since we didn't call
// b.Shutdown() explicitly ourselves. // b.Shutdown() explicitly ourselves.
// BUG: UpdateEndpoints should be called here since we're not WantRunning. // BUG: UpdateEndpoints should be called here since we're not WantRunning.
assert.Equal([]string{"Shutdown", "New", "UpdateEndpoints", "Login", "pause"}, cc.getCalls()) // Note: unpause happens because ipn needs to get at least one netmap
// on startup, otherwise UIs can't show the node list, login
// name, etc when in state ipn.Stopped.
// Arguably they shouldn't try. But they currently do.
assert.Equal([]string{"Shutdown", "New", "UpdateEndpoints", "Login", "unpause"}, cc.getCalls())
nn := notifies.drain(2) nn := notifies.drain(2)
assert.Equal([]string{}, cc.getCalls()) assert.Equal([]string{}, cc.getCalls())