From 96a80fcce3b75be3b95f4c28bdbaca4216a0b7aa Mon Sep 17 00:00:00 2001 From: Thomas Kosiewski Date: Tue, 7 Nov 2023 12:19:19 +0100 Subject: [PATCH] Add support for custom DERP port in TLS prober Updates #10146 Signed-off-by: Thomas Kosiewski --- prober/derp.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/prober/derp.go b/prober/derp.go index f91e3566f..3bb479327 100644 --- a/prober/derp.go +++ b/prober/derp.go @@ -88,7 +88,13 @@ func (d *derpProber) ProbeMap(ctx context.Context) error { wantProbes[n] = true if d.probes[n] == nil { log.Printf("adding DERP TLS probe for %s (%s)", server.Name, region.RegionName) - d.probes[n] = d.p.Run(n, d.tlsInterval, labels, d.tlsProbeFn(server.HostName+":443")) + + derpPort := 443 + if server.DERPPort != 0 { + derpPort = server.DERPPort + } + + d.probes[n] = d.p.Run(n, d.tlsInterval, labels, d.tlsProbeFn(fmt.Sprintf("%s:%d", server.HostName, derpPort))) } for idx, ipStr := range []string{server.IPv6, server.IPv4} {