webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

prober: support filtering regions by region ID in addition to code

Browse Source 
Updates tailscale/corp#25758

Signed-off-by: Percy Wegmann <percy@tailscale.com>
This commit is contained in:
Percy Wegmann
2025-01-10 12:23:51 -06:00
committed by Percy Wegmann
parent a841f9d87b
commit cd795d8a7f
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prober/derp.go
+7 -7
View File
@@ -60,8 +60,8 @@ type derpProber struct {
qdPacketsPerSecond int // in packets per second
qdPacketTimeout time.Duration
// Optionally restrict probes to a single regionCode.
regionCode string
// Optionally restrict probes to a single regionCodeOrID.
regionCodeOrID string
// Probe class for fetching & updating the DERP map.
ProbeMap ProbeClass
@@ -135,11 +135,11 @@ func WithTLSProbing(interval time.Duration) DERPOpt {
}
}
// WithRegion restricts probing to the specified region identified by its code
// (e.g. "lax"). This is case sensitive.
func WithRegion(regionCode string) DERPOpt {
// WithRegionCodeOrID restricts probing to the specified region identified by its code
// (e.g. "lax") or its id (e.g. "17"). This is case sensitive.
func WithRegionCodeOrID(regionCode string) DERPOpt {
return func(d *derpProber) {
d.regionCode = regionCode
d.regionCodeOrID = regionCode
}
}
@@ -598,7 +598,7 @@ func (d *derpProber) ProbeUDP(ipaddr string, port int) ProbeClass {
}
func (d *derpProber) skipRegion(region *tailcfg.DERPRegion) bool {
return d.regionCode != "" && region.RegionCode != d.regionCode
return d.regionCodeOrID != "" && region.RegionCode != d.regionCodeOrID && strconv.Itoa(region.RegionID) != d.regionCodeOrID
}
func derpProbeUDP(ctx context.Context, ipStr string, port int) error {