TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 13:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: wait for endpoint updater goroutine when closing.

Browse Source 
Fixes #204.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2020-04-27 13:03:22 -07:00 committed by Dave Anderson
parent ad0795efc2
commit 9669b85b41
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wgengine/magicsock/magicsock.go
View File

@ -78,6 +78,7 @@ type Conn struct {
closed bool closed bool
endpointsUpdateWaiter *sync.Cond
endpointsUpdateActive bool endpointsUpdateActive bool
wantEndpointsUpdate string // non-empty for why reason wantEndpointsUpdate string // non-empty for why reason
lastEndpoints []string lastEndpoints []string
@ -236,6 +237,7 @@ func Listen(opts Options) (*Conn, error) {
derps: opts.DERPs, derps: opts.DERPs,
peerLastDerp: make(map[key.Public]int), peerLastDerp: make(map[key.Public]int),
} }
c.endpointsUpdateWaiter = sync.NewCond(&c.mu)
if err := c.initialBind(); err != nil { if err := c.initialBind(); err != nil {
return nil, err return nil, err
@ -289,6 +291,7 @@ func (c *Conn) updateEndpoints(why string) {
go c.updateEndpoints(why) go c.updateEndpoints(why)
} else { } else {
c.endpointsUpdateActive = false c.endpointsUpdateActive = false
c.endpointsUpdateWaiter.Broadcast()
} }
}() }()
@ -1396,7 +1399,15 @@ func (c *Conn) Close() error {
if c.pconn6 != nil { if c.pconn6 != nil {
c.pconn6.Close() c.pconn6.Close()
} }
return c.pconn4.Close() err := c.pconn4.Close()
// Wait on endpoints updating right at the end, once everything is
// already closed. We want everything else in the Conn to be
// consistently in the closed state before we release mu to wait
// on the endpoint updater.
for c.endpointsUpdateActive {
c.endpointsUpdateWaiter.Wait()
}
return err
} }
func (c *Conn) periodicReSTUN() { func (c *Conn) periodicReSTUN() {
@ -1436,6 +1447,11 @@ func (c *Conn) periodicDerpCleanup() {
func (c *Conn) ReSTUN(why string) { func (c *Conn) ReSTUN(why string) {
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
if c.closed {
// raced with a shutdown.
return
}
if c.endpointsUpdateActive { if c.endpointsUpdateActive {
if c.wantEndpointsUpdate != why { if c.wantEndpointsUpdate != why {
c.logf("magicsock: ReSTUN: endpoint update active, need another later (%q)", why) c.logf("magicsock: ReSTUN: endpoint update active, need another later (%q)", why)