feat: derpmap field in config (#1823)

juanfont · Oct 17, 2024 · 45c9585 · 45c9585
1 parent cc42fc3
commit 45c9585
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/hscontrol/derp/derp.go b/hscontrol/derp/derp.go
@@ -82,6 +82,9 @@ func mergeDERPMaps(derpMaps []*tailcfg.DERPMap) *tailcfg.DERPMap {
 
 func GetDERPMap(cfg types.DERPConfig) *tailcfg.DERPMap {
 	var derpMaps []*tailcfg.DERPMap
+	if cfg.DERPMap != nil {
+		derpMaps = append(derpMaps, cfg.DERPMap)
+	}
 
 	for _, path := range cfg.Paths {
 		log.Debug().

diff --git a/hscontrol/types/config.go b/hscontrol/types/config.go
@@ -176,6 +176,7 @@ type DERPConfig struct {
 	STUNAddr                           string
 	URLs                               []url.URL
 	Paths                              []string
+	DERPMap                            *tailcfg.DERPMap
 	AutoUpdate                         bool
 	UpdateFrequency                    time.Duration
 	IPv4                               string