Add inactivity ping

kylecarbs · kylecarbs · commit 031f1c0f7226 · 2022-09-01T04:20:58.000Z
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -302,6 +302,8 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 	for _, peer := range c.netMap.Peers {
 		if peerStatus, ok := status.Peer[peer.Key]; ok {
 			// Clear out inactive connections!
+			// If the connection hasn't been written to in a while, we manually
+			// send a ping to ensure it's still alive.
 			if !peerStatus.Active {
 				continue
 			}
@@ -318,6 +320,7 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 			Endpoints:  node.Endpoints,
 			DERP:       fmt.Sprintf("%s:%d", tailcfg.DerpMagicIP, node.PreferredDERP),
 			Hostinfo:   hostinfo.New().View(),
+			KeepAlive:  true,
 		}
 	}
 	c.netMap.Peers = make([]*tailcfg.Node, 0, len(peerMap))

Original file line number	Diff line number	Diff line change
`@@ -302,6 +302,8 @@ func (c Conn) UpdateNodes(nodes []Node) error {`
`302`	`302`	`for _, peer := range c.netMap.Peers {`
`303`	`303`	`if peerStatus, ok := status.Peer[peer.Key]; ok {`
`304`	`304`	`// Clear out inactive connections!`
	`305`	`+ // If the connection hasn't been written to in a while, we manually`
	`306`	`+ // send a ping to ensure it's still alive.`
`305`	`307`	`if !peerStatus.Active {`
`306`	`308`	`continue`
`307`	`309`	`}`
`@@ -318,6 +320,7 @@ func (c Conn) UpdateNodes(nodes []Node) error {`
`318`	`320`	`Endpoints: node.Endpoints,`
`319`	`321`	`DERP: fmt.Sprintf("%s:%d", tailcfg.DerpMagicIP, node.PreferredDERP),`
`320`	`322`	`Hostinfo: hostinfo.New().View(),`
	`323`	`+ KeepAlive: true,`
`321`	`324`	`}`
`322`	`325`	`}`
`323`	`326`	`c.netMap.Peers = make([]*tailcfg.Node, 0, len(peerMap))`