From a1ac94aedbf02b43410c62af291aa297f8ebe422 Mon Sep 17 00:00:00 2001 From: Dylan Bargatze Date: Fri, 13 Jun 2025 17:02:00 -0400 Subject: [PATCH] tailcfg: add vendor to DERPRegion Allows us to easily track which vendor (hosting provider) is hosting the DERP relay nodes in each region. Updates tailscale/corp#29615 Signed-off-by: Dylan Bargatze --- tailcfg/derpmap.go | 4 ++++ tailcfg/tailcfg_clone.go | 1 + tailcfg/tailcfg_view.go | 1 + 3 files changed, 6 insertions(+) diff --git a/tailcfg/derpmap.go b/tailcfg/derpmap.go index e05559f3e..0e1ca7960 100644 --- a/tailcfg/derpmap.go +++ b/tailcfg/derpmap.go @@ -92,6 +92,10 @@ type DERPRegion struct { // "San Francisco", "Singapore", "Frankfurt", etc. RegionName string + // RegionVendor is the name of the hosting provider for the region: + // "NetActuate", "Digital Ocean", "Hetzner", etc. + RegionVendor string + // Latitude, Longitude are optional geographical coordinates of the DERP region's city, in degrees. Latitude float64 `json:",omitempty"` Longitude float64 `json:",omitempty"` diff --git a/tailcfg/tailcfg_clone.go b/tailcfg/tailcfg_clone.go index 2c7941d51..d9ccbc2fc 100644 --- a/tailcfg/tailcfg_clone.go +++ b/tailcfg/tailcfg_clone.go @@ -423,6 +423,7 @@ var _DERPRegionCloneNeedsRegeneration = DERPRegion(struct { RegionID int RegionCode string RegionName string + RegionVendor string Latitude float64 Longitude float64 Avoid bool diff --git a/tailcfg/tailcfg_view.go b/tailcfg/tailcfg_view.go index c76654887..8d910c2fa 100644 --- a/tailcfg/tailcfg_view.go +++ b/tailcfg/tailcfg_view.go @@ -899,6 +899,7 @@ var _DERPRegionViewNeedsRegeneration = DERPRegion(struct { RegionID int RegionCode string RegionName string + RegionVendor string Latitude float64 Longitude float64 Avoid bool