merge fixes

coadler · coadler · commit b940c19ca61b · 2023-08-03T19:41:28.000Z
diff --git a/wgengine/magicsock/derp.go b/wgengine/magicsock/derp.go
@@ -311,6 +311,10 @@ func (c *Conn) derpWriteChanOfAddr(addr netip.AddrPort, peer key.NodePublic) cha
 	}
 	c.logf("magicsock: adding connection to derp-%v for %v", regionID, why)
 
+	if c.derpMap == nil || c.derpMap.Regions[regionID] == nil {
+		return nil
+	}
+
 	firstDerp := false
 	if c.activeDerp == nil {
 		firstDerp = true
@@ -341,7 +345,16 @@ func (c *Conn) derpWriteChanOfAddr(addr netip.AddrPort, peer key.NodePublic) cha
 	dc.SetCanAckPings(true)
 	dc.NotePreferred(c.myDerp == regionID)
 	dc.SetAddressFamilySelector(derpAddrFamSelector{c})
+	dc.SetForcedWebsocketCallback(c.derpForcedWebsocketFunc)
 	dc.DNSCache = dnscache.Get()
+	header := c.derpHeader.Load()
+	if header != nil {
+		dc.Header = header.Clone()
+	}
+	dialer := c.derpRegionDialer.Load()
+	if dialer != nil {
+		dc.SetRegionDialer(*dialer)
+	}
 
 	ctx, cancel := context.WithCancel(c.connCtx)
 	ch := make(chan derpWriteRequest, bufferedDerpWritesBeforeDrop())
@@ -374,6 +387,8 @@ func (c *Conn) derpWriteChanOfAddr(addr netip.AddrPort, peer key.NodePublic) cha
 		startGate = c.derpStarted
 		go func() {
 			dc.Connect(ctx)
+			c.mu.Lock()
+			defer c.mu.Unlock()
 			close(c.derpStarted)
 			c.muCond.Broadcast()
 		}()
diff --git a/wgengine/magicsock/endpoint.go b/wgengine/magicsock/endpoint.go
@@ -1124,6 +1124,7 @@ func (de *endpoint) stopAndReset() {
 func (de *endpoint) resetLocked() {
 	de.lastSend = 0
 	de.lastFullPing = 0
+	de.c.logf("magicsock: disco: node %v %v now using DERP only (reset)", de.publicKey.ShortString(), de.discoShort())
 	de.bestAddr = addrLatency{}
 	de.bestAddrAt = 0
 	de.trustBestAddrUntil = 0
