TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: retry peerapi listen on Android, like we do on Windows

Browse Source 
Updates #1960

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-06-14 08:59:09 -07:00
parent 525eb5ce41
commit cc6ab0a70f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ipn/ipnlocal/local.go
View File

@ -244,7 +244,7 @@ func (b *LocalBackend) linkChange(major bool, ifst *interfaces.State) {
// need updating to tweak default routes. // need updating to tweak default routes.
b.updateFilter(b.netMap, b.prefs) b.updateFilter(b.netMap, b.prefs)
if runtime.GOOS == "windows" && b.netMap != nil && b.state == ipn.Running { if peerAPIListenAsync && b.netMap != nil && b.state == ipn.Running {
want := len(b.netMap.Addresses) want := len(b.netMap.Addresses)
b.logf("linkChange: peerAPIListeners too low; trying again") b.logf("linkChange: peerAPIListeners too low; trying again")
if len(b.peerAPIListeners) < want { if len(b.peerAPIListeners) < want {
@ -1884,6 +1884,13 @@ func (b *LocalBackend) closePeerAPIListenersLocked() {
b.peerAPIListeners = nil b.peerAPIListeners = nil
} }
// peerAPIListenAsync is whether the operating system requires that we
// retry listening on the peerAPI ip/port for whatever reason.
//
// On Windows, see Issue 1620.
// On Android, see Issue 1960.
const peerAPIListenAsync = runtime.GOOS == "windows" || runtime.GOOS == "android"
func (b *LocalBackend) initPeerAPIListener() { func (b *LocalBackend) initPeerAPIListener() {
b.mu.Lock() b.mu.Lock()
defer b.mu.Unlock() defer b.mu.Unlock()
@ -1947,9 +1954,8 @@ func (b *LocalBackend) initPeerAPIListener() {
if !skipListen { if !skipListen {
ln, err = ps.listen(a.IP(), b.prevIfState) ln, err = ps.listen(a.IP(), b.prevIfState)
if err != nil { if err != nil {
if runtime.GOOS == "windows" { if peerAPIListenAsync {
// Expected for now. See Issue 1620. // Expected. But we fix it later in linkChange
// But we fix it later in linkChange
// ("peerAPIListeners too low"). // ("peerAPIListeners too low").
continue continue
} }