From d3200382f60f1faf6656ee955eebcfe7d96bdf8b Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Mon, 5 Dec 2022 23:18:23 +0100 Subject: [PATCH] fix: agent panics on closed network (#5295) * fix: agent panics on closed network * Remove a.network = network * Fix * Fix * Fix --- agent/agent.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/agent/agent.go b/agent/agent.go index 822297ad70..b03cdb11c6 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -245,13 +245,13 @@ func (a *agent) trackConnGoroutine(fn func()) error { return nil } -func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (network *tailnet.Conn, err error) { +func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (_ *tailnet.Conn, err error) { a.closeMutex.Lock() if a.isClosed() { a.closeMutex.Unlock() return nil, xerrors.New("closed") } - network, err = tailnet.NewConn(&tailnet.Options{ + network, err := tailnet.NewConn(&tailnet.Options{ Addresses: []netip.Prefix{netip.PrefixFrom(codersdk.TailnetIP, 128)}, DERPMap: derpMap, Logger: a.logger.Named("tailnet"), @@ -266,7 +266,6 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (ne network.Close() } }() - a.network = network a.closeMutex.Unlock() sshListener, err := network.Listen("tcp", ":"+strconv.Itoa(codersdk.TailnetSSHPort))