devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-26 08:53:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: derpmap field in config (#1823)

Browse source
This commit is contained in:
Goran Draganić 2024-10-17 13:34:20 +02:00 committed by GitHub
parent cc42fc394a
commit 45c9585b52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hscontrol/derp/derp.go
View file

@ -82,6 +82,9 @@ func mergeDERPMaps(derpMaps []*tailcfg.DERPMap) *tailcfg.DERPMap {
func GetDERPMap(cfg types.DERPConfig) *tailcfg.DERPMap { func GetDERPMap(cfg types.DERPConfig) *tailcfg.DERPMap {
var derpMaps []*tailcfg.DERPMap var derpMaps []*tailcfg.DERPMap
if cfg.DERPMap != nil {
derpMaps = append(derpMaps, cfg.DERPMap)
}
for _, path := range cfg.Paths { for _, path := range cfg.Paths {
log.Debug(). log.Debug().

1
hscontrol/types/config.go
View file

@ -176,6 +176,7 @@ type DERPConfig struct {
STUNAddr string STUNAddr string
URLs []url.URL URLs []url.URL
Paths []string Paths []string
DERPMap *tailcfg.DERPMap
AutoUpdate bool AutoUpdate bool
UpdateFrequency time.Duration UpdateFrequency time.Duration
IPv4 string IPv4 string