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

testcontrol: plumb through DERP 

Without this tailscaled does not know the DERP of a peer.

Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
pull/2738/head
David Crawshaw 2021-08-30 13:55:55 +00:00 committed by David Crawshaw
parent ffd22050c0
commit 0b2761ca92
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tstest/integration/testcontrol/testcontrol.go
View File

@ -579,6 +579,14 @@ func (s *Server) serveMap(w http.ResponseWriter, r *http.Request, mkey tailcfg.M
endpoints := filterInvalidIPv6Endpoints(req.Endpoints) endpoints := filterInvalidIPv6Endpoints(req.Endpoints)
node.Endpoints = endpoints node.Endpoints = endpoints
node.DiscoKey = req.DiscoKey node.DiscoKey = req.DiscoKey
if req.Hostinfo != nil {
node.Hostinfo = *req.Hostinfo.Clone()
if ni := node.Hostinfo.NetInfo; ni != nil {
if ni.PreferredDERP != 0 {
node.DERP = fmt.Sprintf("127.3.3.40:%d", ni.PreferredDERP)
}
}
}
peersToUpdate = s.UpdateNode(node) peersToUpdate = s.UpdateNode(node)
} }