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

derp,wgengine/magicsock: remove unexpected label (#14711)

Browse Source 
Remove "unexpected" labelling of PeerGoneReasonNotHere.
A peer being no longer connected to a DERP server
is not an unexpected case and causes confusion in looking at logs.

Fixes tailscale/corp#25609

Signed-off-by: Mike O'Driscoll <mikeo@tailscale.com>
This commit is contained in:
Mike O'Driscoll 2025-01-23 09:04:03 -05:00 committed by GitHub
parent 3033a96b02
commit a00623e8c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
derp/derp.go
View File

@ -79,8 +79,7 @@ const (
// framePeerGone to B so B can forget that a reverse path // framePeerGone to B so B can forget that a reverse path
// exists on that connection to get back to A. It is also sent // exists on that connection to get back to A. It is also sent
// if A tries to send a CallMeMaybe to B and the server has no // if A tries to send a CallMeMaybe to B and the server has no
// record of B (which currently would only happen if there was // record of B
// a bug).
framePeerGone = frameType(0x08) // 32B pub key of peer that's gone + 1 byte reason framePeerGone = frameType(0x08) // 32B pub key of peer that's gone + 1 byte reason
// framePeerPresent is like framePeerGone, but for other members of the DERP // framePeerPresent is like framePeerGone, but for other members of the DERP
@ -131,8 +130,8 @@ const (
type PeerGoneReasonType byte type PeerGoneReasonType byte
const ( const (
PeerGoneReasonDisconnected = PeerGoneReasonType(0x00) // peer disconnected from this server PeerGoneReasonDisconnected = PeerGoneReasonType(0x00) // is only sent when a peer disconnects from this server
PeerGoneReasonNotHere = PeerGoneReasonType(0x01) // server doesn't know about this peer, unexpected PeerGoneReasonNotHere = PeerGoneReasonType(0x01) // server doesn't know about this peer
PeerGoneReasonMeshConnBroke = PeerGoneReasonType(0xf0) // invented by Client.RunWatchConnectionLoop on disconnect; not sent on the wire PeerGoneReasonMeshConnBroke = PeerGoneReasonType(0xf0) // invented by Client.RunWatchConnectionLoop on disconnect; not sent on the wire
) )

2
wgengine/magicsock/derp.go
View File

@ -632,7 +632,7 @@ func (c *Conn) runDerpReader(ctx context.Context, regionID int, dc *derphttp.Cli
// Do nothing. // Do nothing.
case derp.PeerGoneReasonNotHere: case derp.PeerGoneReasonNotHere:
metricRecvDiscoDERPPeerNotHere.Add(1) metricRecvDiscoDERPPeerNotHere.Add(1)
c.logf("[unexpected] magicsock: derp-%d does not know about peer %s, removing route", c.logf("magicsock: derp-%d does not know about peer %s, removing route",
regionID, key.NodePublic(m.Peer).ShortString()) regionID, key.NodePublic(m.Peer).ShortString())
default: default:
metricRecvDiscoDERPPeerGoneUnknown.Add(1) metricRecvDiscoDERPPeerGoneUnknown.Add(1)