diff options
| author | Andrew Dunham <andrew@du.nham.ca> | 2024-07-29 13:49:30 -0400 |
|---|---|---|
| committer | Andrew Dunham <andrew@du.nham.ca> | 2024-07-29 14:10:32 -0400 |
| commit | 35a8fca379189d596341e487b3c595aabb97bea2 (patch) | |
| tree | 0a0d1693c3ec8b0c19f4ec7d50e018f671b140ab | |
| parent | 19b0c8a0248830c8325f340439f00fd75e7ffdc5 (diff) | |
| download | tailscale-35a8fca379189d596341e487b3c595aabb97bea2.tar.xz tailscale-35a8fca379189d596341e487b3c595aabb97bea2.zip | |
cmd/tailscale/cli: release portmap after netcheck
Updates #12954
Signed-off-by: Andrew Dunham <andrew@du.nham.ca>
Change-Id: Ic14f037b48a79b1263b140c6699579b466d89310
| -rw-r--r-- | cmd/tailscale/cli/netcheck.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd/tailscale/cli/netcheck.go b/cmd/tailscale/cli/netcheck.go index 2fbc9d919..682cd99a3 100644 --- a/cmd/tailscale/cli/netcheck.go +++ b/cmd/tailscale/cli/netcheck.go @@ -52,9 +52,15 @@ func runNetcheck(ctx context.Context, args []string) error { if err != nil { return err } + + // Ensure that we close the portmapper after running a netcheck; this + // will release any port mappings created. + pm := portmapper.NewClient(logf, netMon, nil, nil, nil) + defer pm.Close() + c := &netcheck.Client{ NetMon: netMon, - PortMapper: portmapper.NewClient(logf, netMon, nil, nil, nil), + PortMapper: pm, UseDNSCache: false, // always resolve, don't cache } if netcheckArgs.verbose { |