set p2p setup

ethanndickson · ethanndickson · commit b2405072da61 · 2024-07-09T05:14:38.000Z
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -294,11 +294,7 @@ func NewConn(options *Options) (conn *Conn, err error) {
 			server.telemetryStore.setNetInfo(ni)
 			nodeUp.setNetInfo(ni)
 		})
-		server.wireguardEngine.AddNetworkMapCallback(func(nm *netmap.NetworkMap) {
-			if server.telemetryStore.updateNetworkMap(nm) {
-				server.sendUpdatedTelemetry()
-			}
-		})
+		server.wireguardEngine.AddNetworkMapCallback(server.networkMapCallback)
 	} else {
 		server.wireguardEngine.SetNetInfoCallback(nodeUp.setNetInfo)
 	}
@@ -723,25 +719,7 @@ func (c *Conn) SendConnectedTelemetry(ip netip.Addr, application string) {
 	c.telemetryStore.markConnected(&ip, c.createdAt, application)
 	e := c.newTelemetryEvent()
 	e.Status = proto.TelemetryEvent_CONNECTED
-	c.telemetryWg.Add(1)
-	go func() {
-		defer c.telemetryWg.Done()
-		c.telemetrySink.SendTelemetryEvent(e)
-	}()
-}
-
-// Currently only called when the preferred DERP is updated.
-func (c *Conn) sendUpdatedTelemetry() {
-	if c.telemetrySink == nil {
-		return
-	}
-	e := c.newTelemetryEvent()
-	e.Status = proto.TelemetryEvent_CONNECTED
-	c.telemetryWg.Add(1)
-	go func() {
-		defer c.telemetryWg.Done()
-		c.telemetrySink.SendTelemetryEvent(e)
-	}()
+	c.sendTelemetryBackground(e)
 }
 
 func (c *Conn) SendDisconnectedTelemetry() {
@@ -750,11 +728,7 @@ func (c *Conn) SendDisconnectedTelemetry() {
 	}
 	e := c.newTelemetryEvent()
 	e.Status = proto.TelemetryEvent_DISCONNECTED
-	c.telemetryWg.Add(1)
-	go func() {
-		defer c.telemetryWg.Done()
-		c.telemetrySink.SendTelemetryEvent(e)
-	}()
+	c.sendTelemetryBackground(e)
 }
 
 func (c *Conn) SendSpeedtestTelemetry(throughputMbits float64) {
@@ -764,11 +738,7 @@ func (c *Conn) SendSpeedtestTelemetry(throughputMbits float64) {
 	e := c.newTelemetryEvent()
 	e.ThroughputMbits = wrapperspb.Float(float32(throughputMbits))
 	e.Status = proto.TelemetryEvent_CONNECTED
-	c.telemetryWg.Add(1)
-	go func() {
-		defer c.telemetryWg.Done()
-		c.telemetrySink.SendTelemetryEvent(e)
-	}()
+	c.sendTelemetryBackground(e)
 }
 
 // nolint:revive
@@ -782,15 +752,12 @@ func (c *Conn) sendPingTelemetry(pr *ipnstate.PingResult) {
 	if pr.Endpoint != "" {
 		e.P2PLatency = latency
 		e.P2PEndpoint = c.telemetryStore.toEndpoint(pr.Endpoint)
+		e.P2PSetup = durationpb.New(time.Since(c.createdAt))
 	} else {
 		e.DerpLatency = latency
 	}
 	e.Status = proto.TelemetryEvent_CONNECTED
-	c.telemetryWg.Add(1)
-	go func() {
-		defer c.telemetryWg.Done()
-		c.telemetrySink.SendTelemetryEvent(e)
-	}()
+	c.sendTelemetryBackground(e)
 }
 
 // The returned telemetry event will not have it's status set.
@@ -804,6 +771,21 @@ func (c *Conn) newTelemetryEvent() *proto.TelemetryEvent {
 	return event
 }
 
+func (c *Conn) networkMapCallback(nm *netmap.NetworkMap) {
+	c.telemetryStore.updateNetworkMap(nm)
+	if c.telemetryStore.connectedIP != nil {
+		go func() { _, _, _, _ = c.Ping(context.Background(), *c.telemetryStore.connectedIP) }()
+	}
+}
+
+func (c *Conn) sendTelemetryBackground(e *proto.TelemetryEvent) {
+	c.telemetryWg.Add(1)
+	go func() {
+		defer c.telemetryWg.Done()
+		c.telemetrySink.SendTelemetryEvent(e)
+	}()
+}
+
 // PeerDiagnostics is a checklist of human-readable conditions necessary to establish an encrypted
 // tunnel to a peer via a Conn
 type PeerDiagnostics struct {
diff --git a/tailnet/telemetry.go b/tailnet/telemetry.go
@@ -100,18 +100,17 @@ func (b *TelemetryStore) updateRemoteNodeIDLocked(nm *netmap.NetworkMap) {
 	}
 }
 
-// Returns whether a new telemetry event should be sent
-func (b *TelemetryStore) updateNetworkMap(nm *netmap.NetworkMap) bool {
+func (b *TelemetryStore) updateNetworkMap(nm *netmap.NetworkMap) {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 
 	if nm == nil {
-		return false
+		return
 	}
 
 	b.updateDerpMapLocked(nm.DERPMap)
 	b.updateRemoteNodeIDLocked(nm)
-	return b.updateByNodeLocked(nm.SelfNode)
+	b.updateByNodeLocked(nm.SelfNode)
 }
 
 // Given a DERPMap, anonymise all IPs and hostnames.

Original file line number	Diff line number	Diff line change
`@@ -100,18 +100,17 @@ func (b TelemetryStore) updateRemoteNodeIDLocked(nm netmap.NetworkMap) {`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`		`-// Returns whether a new telemetry event should be sent`
`104`		`-func (b TelemetryStore) updateNetworkMap(nm netmap.NetworkMap) bool {`
	`103`	`+func (b TelemetryStore) updateNetworkMap(nm netmap.NetworkMap) {`
`105`	`104`	`b.mu.Lock()`
`106`	`105`	`defer b.mu.Unlock()`
`107`	`106`
`108`	`107`	`if nm == nil {`
`109`		`- return false`
	`108`	`+ return`
`110`	`109`	`}`
`111`	`110`
`112`	`111`	`b.updateDerpMapLocked(nm.DERPMap)`
`113`	`112`	`b.updateRemoteNodeIDLocked(nm)`
`114`		`- return b.updateByNodeLocked(nm.SelfNode)`
	`113`	`+ b.updateByNodeLocked(nm.SelfNode)`
`115`	`114`	`}`
`116`	`115`
`117`	`116`	`// Given a DERPMap, anonymise all IPs and hostnames.`