From 614c6126435f2f63090586a1a5835379f5d77874 Mon Sep 17 00:00:00 2001
From: Irbe Krumina <irbe@tailscale.com>
Date: Thu, 5 Dec 2024 13:21:03 +0000
Subject: [PATCH] net/netcheck: preserve STUN port defaulting to 3478 (#14289)

Updates tailscale/tailscale#14287

Signed-off-by: Irbe Krumina <irbe@tailscale.com>
---
 net/netcheck/netcheck.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/netcheck/netcheck.go b/net/netcheck/netcheck.go
index d8f5e1d49..7930f88f6 100644
--- a/net/netcheck/netcheck.go
+++ b/net/netcheck/netcheck.go
@@ -1570,6 +1570,9 @@ func (c *Client) nodeAddrPort(ctx context.Context, n *tailcfg.DERPNode, port int
 	if port < 0 || port > 1<<16-1 {
 		return zero, false
 	}
+	if port == 0 {
+		port = 3478
+	}
 	if n.STUNTestIP != "" {
 		ip, err := netip.ParseAddr(n.STUNTestIP)
 		if err != nil {