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

cmd/tailscale, wgengine, tailcfg: don't assume LastSeen is present [mapver 20]

Browse Source 
Updates #2107

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2021-06-11 08:40:05 -07:00
parent 8b2b899989
commit 80a4052593
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wgengine/pendopen.go
View File

@@ -5,6 +5,7 @@
package wgengine
import (
"fmt"
"os"
"runtime"
"strconv"
@@ -173,10 +174,6 @@ func (e *userspaceEngine) onOpenTimeout(flow flowtrack.Tuple) {
e.logf("open-conn-track: timeout opening %v; peer node %v not connected to any DERP relay", flow, n.Key.ShortString())
return
}
var lastSeen time.Time
if n.LastSeen != nil {
lastSeen = *n.LastSeen
}
var ps *ipnstate.PeerStatusLite
if st, err := e.getStatus(); err == nil {
@@ -228,9 +225,11 @@ func (e *userspaceEngine) onOpenTimeout(flow flowtrack.Tuple) {
online = "no"
}
}
e.logf("open-conn-track: timeout opening %v to node %v; lastSeen=%v, online=%v, lastRecv=%v",
if n.LastSeen != nil && online != "yes" {
online += fmt.Sprintf(", lastseen=%v", durFmt(*n.LastSeen))
}
e.logf("open-conn-track: timeout opening %v to node %v; online=%v, lastRecv=%v",
flow, n.Key.ShortString(),
durFmt(lastSeen),
online,
durFmt(e.magicConn.LastRecvActivityOfDisco(n.DiscoKey)))
}