relay -> udp addr

ethanndickson · ethanndickson · commit 60e88f758240 · 2024-07-10T03:48:06.000Z
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -812,7 +812,7 @@ 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) {
+		if c.telemetryStore.changedConntype(peer.CurAddr) {
 			c.telemetryStore.pingPeer(c)
 		}
 	}
diff --git a/tailnet/telemetry.go b/tailnet/telemetry.go
@@ -102,17 +102,17 @@ func (b *TelemetryStore) pingPeer(conn *Conn) {
 	}()
 }
 
-func (b *TelemetryStore) changedConntype(relay string) bool {
+func (b *TelemetryStore) changedConntype(addr string) bool {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 
-	if b.p2p && relay == "" {
+	if b.p2p && addr != "" {
 		return false
-	} else if !b.p2p && relay == "" {
+	} else if !b.p2p && addr != "" {
 		b.p2p = true
 		b.p2pSetupTime = time.Since(b.lastDerpTime)
 		return true
-	} else if b.p2p && relay != "" {
+	} else if b.p2p && addr == "" {
 		b.p2p = false
 		b.lastDerpTime = time.Now()
 		b.p2pSetupTime = 0

Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ func (c *Conn) watchConnChange() {`
`812`	`812`	`}`
`813`	`813`	`peer := status.Peer[peers[0]]`
`814`	`814`	`// If the connection type has changed, send a telemetry event with the latest ping stats`
`815`		`- if c.telemetryStore.changedConntype(peer.Relay) {`
	`815`	`+ if c.telemetryStore.changedConntype(peer.CurAddr) {`
`816`	`816`	`c.telemetryStore.pingPeer(c)`
`817`	`817`	`}`
`818`	`818`	`}`