Add closed func

kylecarbs · kylecarbs · commit 5e7197c2dfc0 · 2022-08-21T05:42:49.000Z
diff --git a/agent/conn.go b/agent/conn.go
@@ -138,10 +138,6 @@ type TailnetConn struct {
 	*tailnet.Conn
 }
 
-func (c *TailnetConn) Closed() <-chan struct{} {
-	return nil
-}
-
 func (c *TailnetConn) Ping() (time.Duration, error) {
 	return 0, nil
 }
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -221,6 +221,7 @@ func IP() netip.Addr {
 // Conn is an actively listening Wireguard connection.
 type Conn struct {
 	mutex  sync.Mutex
+	closed chan struct{}
 	logger slog.Logger
 
 	dialer           *tsdial.Dialer
@@ -332,13 +333,25 @@ func (c *Conn) Ping(ip netip.Addr, pingType tailcfg.PingType, cb func(*ipnstate.
 	c.wireguardEngine.Ping(ip, pingType, cb)
 }
 
+// Closed is a channel that ends when the connection has
+// been closed.
+func (c *Conn) Closed() chan<- struct{} {
+	return c.closed
+}
+
 // Close shuts down the Wireguard connection.
 func (c *Conn) Close() error {
 	for _, l := range c.listeners {
 		_ = l.Close()
 	}
 	c.mutex.Lock()
 	defer c.mutex.Unlock()
+	select {
+	case <-c.closed:
+		return nil
+	default:
+	}
+	close(c.closed)
 	_ = c.dialer.Close()
 	_ = c.magicConn.Close()
 	_ = c.netStack.Close()

Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,6 @@ type TailnetConn struct {`
`138`	`138`	`*tailnet.Conn`
`139`	`139`	`}`
`140`	`140`
`141`		`-func (c *TailnetConn) Closed() <-chan struct{} {`
`142`		`- return nil`
`143`		`-}`
`144`		`-`
`145`	`141`	`func (c *TailnetConn) Ping() (time.Duration, error) {`
`146`	`142`	`return 0, nil`
`147`	`143`	`}`