mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-02-27 18:42:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

net/portmapper: add UPnP-IGD release timeout

Browse Source 
Smallest possible change that could help mitigate a deadlock if a release
is haning.

Updates tailscale/corp#33619

Signed-off-by: Claus Lensbøl <claus@tailscale.com>
This commit is contained in:
Claus Lensbøl 2025-10-22 10:59:28 -04:00
parent afaa23c3b4
commit c686a9d6d0
No known key found for this signature in database
GPG Key ID: 060429CBEC62B1B4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/portmapper/portmapper.go
View File

@ -395,7 +395,9 @@ func (c *Client) listenPacket(ctx context.Context, network, addr string) (nettyp
func (c *Client) invalidateMappingsLocked(releaseOld bool) {
if c.mapping != nil {
if releaseOld {
c.mapping.Release(context.Background())
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
c.mapping.Release(ctx)
}
c.mapping = nil
}