TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: actually add to the activeDerp map

Browse Source 
Fixes bug just introduced in 8f9849c140; not tested enough :(
This commit is contained in:
Brad Fitzpatrick 2020-03-05 12:22:33 -08:00
parent 8f9849c140
commit a36ccb8525
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wgengine/magicsock/magicsock.go
View File

@ -647,6 +647,7 @@ func (c *Conn) derpWriteChanOfAddr(addr *net.UDPAddr) chan<- derpWriteRequest {
ad.c = dc ad.c = dc
ad.writeCh = ch ad.writeCh = ch
ad.cancel = cancel ad.cancel = cancel
c.activeDerp[addr.Port] = ad
go c.runDerpReader(ctx, addr, dc) go c.runDerpReader(ctx, addr, dc)
go c.runDerpWriter(ctx, addr, dc, ch) go c.runDerpWriter(ctx, addr, dc, ch)
@ -700,7 +701,7 @@ func (c *Conn) runDerpReader(ctx context.Context, derpFakeAddr *net.UDPAddr, dc
return return
default: default:
} }
log.Printf("derp.Recv: %v", err) c.logf("derp.Recv(derp%d): %v", derpFakeAddr.Port, err)
time.Sleep(250 * time.Millisecond) time.Sleep(250 * time.Millisecond)
continue continue
} }
@ -916,6 +917,7 @@ func (c *Conn) closeAllDerpLocked() {
// c.derpMu must be held. // c.derpMu must be held.
func (c *Conn) closeDerpLocked(node int) { func (c *Conn) closeDerpLocked(node int) {
if ad, ok := c.activeDerp[node]; ok { if ad, ok := c.activeDerp[node]; ok {
c.logf("closing connection to derp%v", node)
go ad.c.Close() go ad.c.Close()
ad.cancel() ad.cancel()
delete(c.activeDerp, node) delete(c.activeDerp, node)