lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

derpmap: add full region name 

We're beginning to reference DERP region names in the admin UI, so it's
best to consolidate this information in our DERP map.

Signed-off-by: Ross Zurowski <ross@rosszurowski.com>
reviewable/pr686/r1
Ross Zurowski 2020-08-14 15:57:11 -04:00
parent 062bd67d3b
commit 3e2bfe48c3
No known key found for this signature in database
GPG Key ID: A30A612113C0941A
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
derp/derpmap/derpmap.go
View File

@ -21,9 +21,10 @@ func derpNode(suffix, v4, v6 string) *tailcfg.DERPNode {
} }
} }
func derpRegion(id int, code string, nodes ...*tailcfg.DERPNode) *tailcfg.DERPRegion { func derpRegion(id int, name string, code string, nodes ...*tailcfg.DERPNode) *tailcfg.DERPRegion {
region := &tailcfg.DERPRegion{ region := &tailcfg.DERPRegion{
RegionID: id, RegionID: id,
RegionName: name,
RegionCode: code, RegionCode: code,
Nodes: nodes, Nodes: nodes,
} }
@ -45,19 +46,19 @@ func derpRegion(id int, code string, nodes ...*tailcfg.DERPNode) *tailcfg.DERPRe
func Prod() *tailcfg.DERPMap { func Prod() *tailcfg.DERPMap {
return &tailcfg.DERPMap{ return &tailcfg.DERPMap{
Regions: map[int]*tailcfg.DERPRegion{ Regions: map[int]*tailcfg.DERPRegion{
1: derpRegion(1, "nyc", 1: derpRegion(1, "nyc", "New York City",
derpNode("a", "159.89.225.99", "2604:a880:400:d1::828:b001"), derpNode("a", "159.89.225.99", "2604:a880:400:d1::828:b001"),
), ),
2: derpRegion(2, "sfo", 2: derpRegion(2, "sfo", "San Francisco",
derpNode("a", "167.172.206.31", "2604:a880:2:d1::c5:7001"), derpNode("a", "167.172.206.31", "2604:a880:2:d1::c5:7001"),
), ),
3: derpRegion(3, "sin", 3: derpRegion(3, "sin", "Singapore",
derpNode("a", "68.183.179.66", "2400:6180:0:d1::67d:8001"), derpNode("a", "68.183.179.66", "2400:6180:0:d1::67d:8001"),
), ),
4: derpRegion(4, "fra", 4: derpRegion(4, "fra", "Frankfurt",
derpNode("a", "167.172.182.26", "2a03:b0c0:3:e0::36e:9001"), derpNode("a", "167.172.182.26", "2a03:b0c0:3:e0::36e:9001"),
), ),
5: derpRegion(5, "syd", 5: derpRegion(5, "syd", "Sydney",
derpNode("a", "103.43.75.49", "2001:19f0:5801:10b7:5400:2ff:feaa:284c"), derpNode("a", "103.43.75.49", "2001:19f0:5801:10b7:5400:2ff:feaa:284c"),
), ),
}, },

4
tailcfg/derpmap.go
View File

@ -51,6 +51,10 @@ type DERPRegion struct {
// "fra", etc. // "fra", etc.
RegionCode string RegionCode string
// RegionName is a long English name for the region: "New York City",
// "San Francisco", "Singapore", "Frankfurt", etc.
RegionName string
// Nodes are the DERP nodes running in this region, in // Nodes are the DERP nodes running in this region, in
// priority order for the current client. Client TLS // priority order for the current client. Client TLS
// connections should ideally only go to the first entry // connections should ideally only go to the first entry