Add inactivity ping

kylecarbs · kylecarbs · commit cbc512fadc2b · 2022-09-01T16:13:25.000Z
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -161,21 +161,6 @@ func NewConn(options *Options) (*Conn, error) {
 		return nil, xerrors.Errorf("start netstack: %w", err)
 	}
 	wireguardEngine = wgengine.NewWatchdog(wireguardEngine)
-
-	// Update the wireguard configuration to allow traffic to flow.
-	wireguardConfig, err := nmcfg.WGCfg(netMap, Logger(options.Logger.Named("wgconfig")), netmap.AllowSingleHosts, "")
-	if err != nil {
-		return nil, xerrors.Errorf("create wgcfg: %w", err)
-	}
-
-	wireguardRouter := &router.Config{
-		LocalAddrs: wireguardConfig.Addresses,
-	}
-	err = wireguardEngine.Reconfig(wireguardConfig, wireguardRouter, &dns.Config{}, &tailcfg.Debug{})
-	if err != nil {
-		return nil, xerrors.Errorf("reconfig: %w", err)
-	}
-
 	wireguardEngine.SetDERPMap(options.DERPMap)
 	netMapCopy := *netMap
 	wireguardEngine.SetNetworkMap(&netMapCopy)
@@ -198,8 +183,10 @@ func NewConn(options *Options) (*Conn, error) {
 		netMap:           netMap,
 		netStack:         netStack,
 		wireguardMonitor: wireguardMonitor,
-		wireguardRouter:  wireguardRouter,
-		wireguardEngine:  wireguardEngine,
+		wireguardRouter: &router.Config{
+			LocalAddrs: netMap.Addresses,
+		},
+		wireguardEngine: wireguardEngine,
 	}
 	netStack.ForwardTCPIn = server.forwardTCP
 	return server, nil
@@ -261,7 +248,7 @@ func (c *Conn) SetNodeCallback(callback func(node *Node)) {
 			DERPLatency:   c.lastDERPLatency,
 		}
 	}
-	c.magicConn.SetNetInfoCallback(func(ni *tailcfg.NetInfo) {
+	c.wireguardEngine.SetNetInfoCallback(func(ni *tailcfg.NetInfo) {
 		c.lastMutex.Lock()
 		c.lastPreferredDERP = ni.PreferredDERP
 		c.lastDERPLatency = ni.DERPLatency
@@ -309,6 +296,7 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 		peerMap[peer.ID] = peer
 	}
 	for _, node := range nodes {
+		peerStatus, ok := status.Peer[node.Key]
 		peerMap[node.ID] = &tailcfg.Node{
 			ID:         node.ID,
 			Key:        node.Key,
@@ -318,12 +306,18 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 			Endpoints:  node.Endpoints,
 			DERP:       fmt.Sprintf("%s:%d", tailcfg.DerpMagicIP, node.PreferredDERP),
 			Hostinfo:   hostinfo.New().View(),
+			// Starting KeepAlive messages at the initialization
+			// of a connection cause it to hang for an unknown
+			// reason. TODO: @kylecarbs debug this!
+			KeepAlive: ok && peerStatus.Active,
 		}
 	}
 	c.netMap.Peers = make([]*tailcfg.Node, 0, len(peerMap))
 	for _, peer := range peerMap {
 		c.netMap.Peers = append(c.netMap.Peers, peer)
 	}
+	netMapCopy := *c.netMap
+	c.wireguardEngine.SetNetworkMap(&netMapCopy)
 	cfg, err := nmcfg.WGCfg(c.netMap, Logger(c.logger.Named("wgconfig")), netmap.AllowSingleHosts, "")
 	if err != nil {
 		return xerrors.Errorf("update wireguard config: %w", err)
@@ -332,15 +326,13 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 	if err != nil {
 		return xerrors.Errorf("reconfig: %w", err)
 	}
-	netMapCopy := *c.netMap
-	c.wireguardEngine.SetNetworkMap(&netMapCopy)
 	return nil
 }
 
 // Status returns the current ipnstate of a connection.
 func (c *Conn) Status() *ipnstate.Status {
 	sb := &ipnstate.StatusBuilder{}
-	c.magicConn.UpdateStatus(sb)
+	c.wireguardEngine.UpdateStatus(sb)
 	return sb.Status()
 }
 
diff --git a/tailnet/conn_test.go b/tailnet/conn_test.go
@@ -55,10 +55,12 @@ func TestTailnet(t *testing.T) {
 			_ = w2.Close()
 		})
 		w1.SetNodeCallback(func(node *tailnet.Node) {
-			w2.UpdateNodes([]*tailnet.Node{node})
+			err := w2.UpdateNodes([]*tailnet.Node{node})
+			require.NoError(t, err)
 		})
 		w2.SetNodeCallback(func(node *tailnet.Node) {
-			w1.UpdateNodes([]*tailnet.Node{node})
+			err := w1.UpdateNodes([]*tailnet.Node{node})
+			require.NoError(t, err)
 		})
 
 		conn := make(chan struct{})
diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go
@@ -40,7 +40,10 @@ func ServeCoordinator(conn net.Conn, updateNodes func(node []*Node) error) (func
 			}
 			err = updateNodes(nodes)
 			if err != nil {
-				errChan <- xerrors.Errorf("update nodes: %w", err)
+				select {
+				case errChan <- xerrors.Errorf("update nodes: %w", err):
+				default:
+				}
 			}
 		}
 	}()
@@ -53,7 +56,10 @@ func ServeCoordinator(conn net.Conn, updateNodes func(node []*Node) error) (func
 		}
 		_, err = conn.Write(data)
 		if err != nil {
-			errChan <- xerrors.Errorf("write: %w", err)
+			select {
+			case errChan <- xerrors.Errorf("write: %w", err):
+			default:
+			}
 		}
 	}, errChan
 }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,10 @@ func ServeCoordinator(conn net.Conn, updateNodes func(node []*Node) error) (func`
`40`	`40`	`}`
`41`	`41`	`err = updateNodes(nodes)`
`42`	`42`	`if err != nil {`
`43`		`- errChan <- xerrors.Errorf("update nodes: %w", err)`
	`43`	`+ select {`
	`44`	`+ case errChan <- xerrors.Errorf("update nodes: %w", err):`
	`45`	`+ default:`
	`46`	`+ }`
`44`	`47`	`}`
`45`	`48`	`}`
`46`	`49`	`}()`
`@@ -53,7 +56,10 @@ func ServeCoordinator(conn net.Conn, updateNodes func(node []*Node) error) (func`
`53`	`56`	`}`
`54`	`57`	`_, err = conn.Write(data)`
`55`	`58`	`if err != nil {`
`56`		`- errChan <- xerrors.Errorf("write: %w", err)`
	`59`	`+ select {`
	`60`	`+ case errChan <- xerrors.Errorf("write: %w", err):`
	`61`	`+ default:`
	`62`	`+ }`
`57`	`63`	`}`
`58`	`64`	`}, errChan`
`59`	`65`	`}`