Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-08-01 13:46:49 +02:00
Code Issues Projects Releases Wiki Activity

Merge 7a2016ca62 into df69840f92

Browse Source
This commit is contained in:
Andrey 2025-05-25 17:33:26 +03:00 committed by GitHub
commit 85397ff006
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
hscontrol/derp/derp.go
View File

@ -73,7 +73,11 @@ func mergeDERPMaps(derpMaps []*tailcfg.DERPMap) *tailcfg.DERPMap {
for _, derpMap := range derpMaps { for _, derpMap := range derpMaps {
for id, region := range derpMap.Regions { for id, region := range derpMap.Regions {
result.Regions[id] = region if region == nil {
delete(result.Regions, id)
} else {
result.Regions[id] = region
}
} }
} }
@ -86,25 +90,6 @@ func GetDERPMap(cfg types.DERPConfig) *tailcfg.DERPMap {
derpMaps = append(derpMaps, cfg.DERPMap) derpMaps = append(derpMaps, cfg.DERPMap)
} }
for _, path := range cfg.Paths {
log.Debug().
Str("func", "GetDERPMap").
Str("path", path).
Msg("Loading DERPMap from path")
derpMap, err := loadDERPMapFromPath(path)
if err != nil {
log.Error().
Str("func", "GetDERPMap").
Str("path", path).
Err(err).
Msg("Could not load DERP map from path")
break
}
derpMaps = append(derpMaps, derpMap)
}
for _, addr := range cfg.URLs { for _, addr := range cfg.URLs {
derpMap, err := loadDERPMapFromURL(addr) derpMap, err := loadDERPMapFromURL(addr)
log.Debug(). log.Debug().
@ -124,6 +109,25 @@ func GetDERPMap(cfg types.DERPConfig) *tailcfg.DERPMap {
derpMaps = append(derpMaps, derpMap) derpMaps = append(derpMaps, derpMap)
} }
for _, path := range cfg.Paths {
log.Debug().
Str("func", "GetDERPMap").
Str("path", path).
Msg("Loading DERPMap from path")
derpMap, err := loadDERPMapFromPath(path)
if err != nil {
log.Error().
Str("func", "GetDERPMap").
Str("path", path).
Err(err).
Msg("Could not load DERP map from path")
break
}
derpMaps = append(derpMaps, derpMap)
}
derpMap := mergeDERPMaps(derpMaps) derpMap := mergeDERPMaps(derpMaps)
log.Trace().Interface("derpMap", derpMap).Msg("DERPMap loaded") log.Trace().Interface("derpMap", derpMap).Msg("DERPMap loaded")