TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp: return keep-alive message up to callers

Browse Source 
To be used by health checking, which wants to see activity, even if idle.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-03-15 09:58:52 -07:00
parent 4224b3f731
commit ab2a8a7493
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
derp/derp_client.go
View File

@ -351,6 +351,13 @@ type PingMessage [8]byte
func (PingMessage) msg() {} func (PingMessage) msg() {}
// KeepAliveMessage is a one-way empty message from server to client, just to
// keep the connection alive. It's like a PingMessage, but doesn't solicit
// a reply from the client.
type KeepAliveMessage struct{}
func (KeepAliveMessage) msg() {}
// Recv reads a message from the DERP server. // Recv reads a message from the DERP server.
// //
// The returned message may alias memory owned by the Client; it // The returned message may alias memory owned by the Client; it
@ -431,7 +438,7 @@ func (c *Client) recvTimeout(timeout time.Duration) (m ReceivedMessage, err erro
case frameKeepAlive: case frameKeepAlive:
// A one-way keep-alive message that doesn't require an acknowledgement. // A one-way keep-alive message that doesn't require an acknowledgement.
// This predated framePing/framePong. // This predated framePing/framePong.
continue return KeepAliveMessage{}, nil
case framePeerGone: case framePeerGone:
if n < keyLen { if n < keyLen {
c.logf("[unexpected] dropping short peerGone frame from DERP server") c.logf("[unexpected] dropping short peerGone frame from DERP server")