rsp2k/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mapper: produce map before poll (#2628)

Browse source
This commit is contained in:
Kristoffer Dalby 2025-07-28 11:15:53 +02:00 • committed by GitHub
parent b2a18830ed
commit a058bf3cd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
70 changed files with 5771 additions and 2475 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hscontrol/derp/derp.go
View file

@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"io"
"maps"
"net/http"
"net/url"
"os"
@ -72,9 +73,7 @@ func mergeDERPMaps(derpMaps []*tailcfg.DERPMap) *tailcfg.DERPMap {
}
for _, derpMap := range derpMaps {
for id, region := range derpMap.Regions {
result.Regions[id] = region
}
maps.Copy(result.Regions, derpMap.Regions)
}
return &result