wgengine/magicsock: close disco listeners on Conn.Close, fix Linux root TestNewConn

TestNewConn now passes as root on Linux. It wasn't closing the BPF
listeners and their goroutines.

The code is still a mess of two Close overlapping code paths, but that
can be refactored later. For now, make the two close paths more similar.

Updates #9945

Change-Id: I8a3cf5fb04d22ba29094243b8e645de293d9ed85
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/9949/head
Brad Fitzpatrick 1 year ago committed by Brad Fitzpatrick
parent 593c086866
commit 514539b611

@ -2134,6 +2134,12 @@ func (c *Conn) Close() error {
// They will frequently have been closed already by a call to connBind.Close. // They will frequently have been closed already by a call to connBind.Close.
c.pconn6.Close() c.pconn6.Close()
c.pconn4.Close() c.pconn4.Close()
if c.closeDisco4 != nil {
c.closeDisco4.Close()
}
if c.closeDisco6 != nil {
c.closeDisco6.Close()
}
// Wait on goroutines updating right at the end, once everything is // Wait on goroutines updating right at the end, once everything is
// already closed. We want everything else in the Conn to be // already closed. We want everything else in the Conn to be

Loading…
Cancel
Save