Skip to content

Commit 32bfd72

Browse files
authored
tstest/integration/testcontrol: propagate CapVer (tailscale#17093)
To support integration testing of client features that rely on it, e.g. peer relay. Updates tailscale/corp#30903 Signed-off-by: Jordan Whited <jordan@tailscale.com>
1 parent 6feb6f3 commit 32bfd72

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

tstest/integration/testcontrol/testcontrol.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,7 @@ func (s *Server) serveRegister(w http.ResponseWriter, r *http.Request, mkey key.
674674
AllowedIPs: allowedIPs,
675675
Hostinfo: req.Hostinfo.View(),
676676
Name: req.Hostinfo.Hostname,
677+
Cap: req.Version,
677678
Capabilities: []tailcfg.NodeCapability{
678679
tailcfg.CapabilityHTTPS,
679680
tailcfg.NodeAttrFunnel,
@@ -811,6 +812,7 @@ func (s *Server) serveMap(w http.ResponseWriter, r *http.Request, mkey key.Machi
811812
endpoints := filterInvalidIPv6Endpoints(req.Endpoints)
812813
node.Endpoints = endpoints
813814
node.DiscoKey = req.DiscoKey
815+
node.Cap = req.Version
814816
if req.Hostinfo != nil {
815817
node.Hostinfo = req.Hostinfo.View()
816818
if ni := node.Hostinfo.NetInfo(); ni.Valid() {

0 commit comments

Comments
 (0)