From a67b174da1fae8f8ae0f1fa17399ce1c785b2f29 Mon Sep 17 00:00:00 2001
From: David Crawshaw <crawshaw@tailscale.com>
Date: Tue, 25 Aug 2020 15:14:57 -0400
Subject: [PATCH] Revert "magicsock: call RequestStatus when DERP connects"

Seems to break linux CI builder. Cannot reproduce locally,
so attempting a rollback.

This reverts commit cd7bc02ab1924a5504c6667ffebdb0635272badd.

Signed-off-by: David Crawshaw <crawshaw@tailscale.com>
---
 wgengine/magicsock/magicsock.go | 1 -
 wgengine/userspace.go           | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go
index 00036ae0e..d20389a10 100644
--- a/wgengine/magicsock/magicsock.go
+++ b/wgengine/magicsock/magicsock.go
@@ -1206,7 +1206,6 @@ func (c *Conn) derpWriteChanOfAddr(addr netaddr.IPPort, peer key.Public) chan<-
 
 	go c.runDerpReader(ctx, addr, dc, wg, startGate)
 	go c.runDerpWriter(ctx, dc, ch, wg, startGate)
-	go c.epFunc(nil) // call RequestStatus with DERPs change
 
 	return ad.writeCh
 }
diff --git a/wgengine/userspace.go b/wgengine/userspace.go
index a261da24f..b5c0790af 100644
--- a/wgengine/userspace.go
+++ b/wgengine/userspace.go
@@ -229,11 +229,10 @@ func newUserspaceEngineAdvanced(conf EngineConfig) (_ Engine, reterr error) {
 	e.linkMon = mon
 
 	endpointsFn := func(endpoints []string) {
-		if len(endpoints) != 0 {
-			e.mu.Lock()
-			e.endpoints = append(e.endpoints[:0], endpoints...)
-			e.mu.Unlock()
-		}
+		e.mu.Lock()
+		e.endpoints = append(e.endpoints[:0], endpoints...)
+		e.mu.Unlock()
+
 		e.RequestStatus()
 	}
 	magicsockOpts := magicsock.Options{