From 0b2761ca928534cea068050e220fd4ba63bd05a0 Mon Sep 17 00:00:00 2001
From: David Crawshaw <crawshaw@tailscale.com>
Date: Mon, 30 Aug 2021 13:55:55 +0000
Subject: [PATCH] testcontrol: plumb through DERP

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

Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
---
 tstest/integration/testcontrol/testcontrol.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tstest/integration/testcontrol/testcontrol.go b/tstest/integration/testcontrol/testcontrol.go
index 32427ceec..8b9d49e01 100644
--- a/tstest/integration/testcontrol/testcontrol.go
+++ b/tstest/integration/testcontrol/testcontrol.go
@@ -579,6 +579,14 @@ func (s *Server) serveMap(w http.ResponseWriter, r *http.Request, mkey tailcfg.M
 		endpoints := filterInvalidIPv6Endpoints(req.Endpoints)
 		node.Endpoints = endpoints
 		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)
 	}