nicer ping peer

ethanndickson · ethanndickson · commit 4b76942aac5f · 2024-07-09T13:35:25.000Z
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -296,15 +296,11 @@ func NewConn(options *Options) (conn *Conn, err error) {
 		server.wireguardEngine.SetNetInfoCallback(func(ni *tailcfg.NetInfo) {
 			server.telemetryStore.setNetInfo(ni)
 			nodeUp.setNetInfo(ni)
-			if server.telemetryStore.connectedIP != nil {
-				_, _, _, _ = server.Ping(ctx, *server.telemetryStore.connectedIP)
-			}
+			server.telemetryStore.pingPeer(server)
 		})
 		server.wireguardEngine.AddNetworkMapCallback(func(nm *netmap.NetworkMap) {
 			server.telemetryStore.updateNetworkMap(nm)
-			if server.telemetryStore.connectedIP != nil {
-				_, _, _, _ = server.Ping(ctx, *server.telemetryStore.connectedIP)
-			}
+			server.telemetryStore.pingPeer(server)
 		})
 		go server.watchConnChange()
 	} else {
@@ -816,8 +812,8 @@ func (c *Conn) watchConnChange() {
 		}
 		peer := status.Peer[peers[0]]
 		// If the connection type has changed, send a telemetry event with the latest ping stats
-		if c.telemetryStore.changedConntype(peer.Relay) && c.telemetryStore.connectedIP != nil {
-			_, _, _, _ = c.Ping(c.watchCtx, *c.telemetryStore.connectedIP)
+		if c.telemetryStore.changedConntype(peer.Relay) {
+			c.telemetryStore.pingPeer(c)
 		}
 	}
 }
diff --git a/tailnet/telemetry.go b/tailnet/telemetry.go
@@ -89,6 +89,18 @@ func (b *TelemetryStore) markConnected(ip *netip.Addr, application string) {
 	b.application = application
 }
 
+func (b *TelemetryStore) pingPeer(conn *Conn) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+
+	if b.connectedIP == nil {
+		return
+	}
+	go func() {
+		_, _, _, _ = conn.Ping(conn.watchCtx, *b.connectedIP)
+	}()
+}
+
 func (b *TelemetryStore) changedConntype(relay string) bool {
 	b.mu.Lock()
 	defer b.mu.Unlock()
