ensure latest derpmap

ethanndickson · ethanndickson · commit fe7252a5bf78 · 2024-07-09T08:07:33.000Z
diff --git a/tailnet/configmaps.go b/tailnet/configmaps.go
@@ -284,15 +284,16 @@ func (c *configMaps) getBlockEndpoints() bool {
 // setDERPMap sets the DERP map, triggering a configuration of the engine if it has changed.
 // c.L MUST NOT be held.
 // Returns if the derpMap is dirty.
-func (c *configMaps) setDERPMap(derpMap *tailcfg.DERPMap) {
+func (c *configMaps) setDERPMap(derpMap *tailcfg.DERPMap) bool {
 	c.L.Lock()
 	defer c.L.Unlock()
 	if CompareDERPMaps(c.derpMap, derpMap) {
-		return
+		return false
 	}
 	c.derpMap = derpMap
 	c.derpMapDirty = true
 	c.Broadcast()
+	return true
 }
 
 // derMapLocked returns the current DERPMap.  c.L must be held
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -409,7 +409,9 @@ func (c *Conn) SetNodeCallback(callback func(node *Node)) {
 
 // SetDERPMap updates the DERPMap of a connection.
 func (c *Conn) SetDERPMap(derpMap *tailcfg.DERPMap) {
-	c.configMaps.setDERPMap(derpMap)
+	if c.configMaps.setDERPMap(derpMap) && c.telemetryStore != nil {
+		c.telemetryStore.updateDerpMap(derpMap)
+	}
 }
 
 func (c *Conn) SetDERPForceWebSockets(v bool) {
@@ -814,7 +816,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.checkConnType(peer.Relay) && c.telemetryStore.connectedIP != nil {
+		if c.telemetryStore.changedConntype(peer.Relay) && c.telemetryStore.connectedIP != nil {
 			_, _, _, _ = c.Ping(c.watchCtx, *c.telemetryStore.connectedIP)
 		}
 	}
diff --git a/tailnet/telemetry.go b/tailnet/telemetry.go
@@ -89,8 +89,7 @@ func (b *TelemetryStore) markConnected(ip *netip.Addr, application string) {
 	b.application = application
 }
 
-// Return whether we've changed to/from a P2P connection
-func (b *TelemetryStore) checkConnType(relay string) bool {
+func (b *TelemetryStore) changedConntype(relay string) bool {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 
@@ -141,6 +140,13 @@ func (b *TelemetryStore) updateNetworkMap(nm *netmap.NetworkMap) {
 // Given a DERPMap, anonymise all IPs and hostnames.
 // Keep track of seen hostnames/cert names to anonymize them from future logs.
 // b.mu must NOT be held.
+func (b *TelemetryStore) updateDerpMap(cur *tailcfg.DERPMap) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+
+	b.updateDerpMapLocked(cur)
+}
+
 func (b *TelemetryStore) updateDerpMapLocked(cur *tailcfg.DERPMap) {
 	if cur == nil {
 		return
diff --git a/tailnet/telemetry_internal_test.go b/tailnet/telemetry_internal_test.go
@@ -197,9 +197,7 @@ func TestTelemetryStore(t *testing.T) {
 				},
 			},
 		}
-		telemetry.mu.Lock()
-		telemetry.updateDerpMapLocked(derpMap)
-		telemetry.mu.Unlock()
+		telemetry.updateDerpMap(derpMap)
 
 		event := telemetry.newEvent()
 		require.Len(t, event.DerpMap.Regions[999].Nodes, 1)

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,9 @@ func (c Conn) SetNodeCallback(callback func(node Node)) {`
`409`	`409`
`410`	`410`	`// SetDERPMap updates the DERPMap of a connection.`
`411`	`411`	`func (c Conn) SetDERPMap(derpMap tailcfg.DERPMap) {`
`412`		`- c.configMaps.setDERPMap(derpMap)`
	`412`	`+ if c.configMaps.setDERPMap(derpMap) && c.telemetryStore != nil {`
	`413`	`+ c.telemetryStore.updateDerpMap(derpMap)`
	`414`	`+ }`
`413`	`415`	`}`
`414`	`416`
`415`	`417`	`func (c *Conn) SetDERPForceWebSockets(v bool) {`
`@@ -814,7 +816,7 @@ func (c *Conn) watchConnChange() {`
`814`	`816`	`}`
`815`	`817`	`peer := status.Peer[peers[0]]`
`816`	`818`	`// If the connection type has changed, send a telemetry event with the latest ping stats`
`817`		`- if c.telemetryStore.checkConnType(peer.Relay) && c.telemetryStore.connectedIP != nil {`
	`819`	`+ if c.telemetryStore.changedConntype(peer.Relay) && c.telemetryStore.connectedIP != nil {`
`818`	`820`	`_, _, _, _ = c.Ping(c.watchCtx, *c.telemetryStore.connectedIP)`
`819`	`821`	`}`
`820`	`822`	`}`