From 567e7506599a1a90123a09dda4dfc9dfc2d23509 Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@coder.com>
Date: Wed, 31 Aug 2022 21:21:21 -0500
Subject: [PATCH] fix: Prepend STUN nodes for DERP (#3787)

This makes Tailscale prefer STUN over DERP when possible.
---
 tailnet/derpmap.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tailnet/derpmap.go b/tailnet/derpmap.go
index 36ff02b89f..9c8122238c 100644
--- a/tailnet/derpmap.go
+++ b/tailnet/derpmap.go
@@ -24,13 +24,13 @@ func NewDERPMap(ctx context.Context, region *tailcfg.DERPRegion, stunAddrs []str
 		if err != nil {
 			return nil, xerrors.Errorf("parse port for %q: %w", stunAddr, err)
 		}
-		region.Nodes = append(region.Nodes, &tailcfg.DERPNode{
+		region.Nodes = append([]*tailcfg.DERPNode{{
 			Name:     fmt.Sprintf("%dstun%d", region.RegionID, index),
 			RegionID: region.RegionID,
 			HostName: host,
 			STUNOnly: true,
 			STUNPort: port,
-		})
+		}}, region.Nodes...)
 	}
 
 	derpMap := &tailcfg.DERPMap{