TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-03-21 13:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine: fix pendopen debug to not track SYN+ACKs, show Node.Online state

Browse Source 
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-05-05 13:59:40 -07:00 committed by Brad Fitzpatrick
parent b2de34a45d
commit 1a1123d461
1 changed files with 23 additions and 4 deletions

27
wgengine/pendopen.go

@ -104,6 +104,7 @@ func (e *userspaceEngine) trackOpenPostFilterOut(pp *packet.Parsed, t *tstun.Wra
if pp.IPVersion == 0 || if pp.IPVersion == 0 ||
pp.IPProto != ipproto.TCP || pp.IPProto != ipproto.TCP ||
pp.TCPFlags&packet.TCPAck != 0 ||
pp.TCPFlags&packet.TCPSyn == 0 { pp.TCPFlags&packet.TCPSyn == 0 {
return return
} }
@ -219,14 +220,32 @@ func (e *userspaceEngine) onOpenTimeout(flow flowtrack.Tuple) {
// handshake completed, which is what I want. // handshake completed, which is what I want.
_ = ps.LastHandshake _ = ps.LastHandshake
e.logf("open-conn-track: timeout opening %v to node %v; lastSeen=%v, lastRecv=%v", online := "?"
if n.Online != nil {
if *n.Online {
online = "yes"
} else {
online = "no"
}
}
e.logf("open-conn-track: timeout opening %v to node %v; lastSeen=%v, online=%v, lastRecv=%v",
flow, n.Key.ShortString(), flow, n.Key.ShortString(),
agoOrNever(lastSeen), agoOrNever(e.magicConn.LastRecvActivityOfDisco(n.DiscoKey))) durFmt(lastSeen),
online,
durFmt(e.magicConn.LastRecvActivityOfDisco(n.DiscoKey)))
} }
func agoOrNever(t time.Time) string { func durFmt(t time.Time) string {
if t.IsZero() { if t.IsZero() {
return "never" return "never"
} }
return time.Since(t).Round(time.Second).String() d := time.Since(t).Round(time.Second)
if d < 10*time.Minute {
// node.LastSeen times are rounded very coarsely, and
// we compare times from different clocks (server vs
// local), so negative is common when close. Format as
// "recent" if negative or actually recent.
return "recent"
}
return d.String()
} }