TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

tsnet: fix netstack leak on Close

Browse Source 
Identified while investigating a goroutine leak in a different repo.

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2022-10-01 16:33:13 -07:00 committed by Maisem Ali
parent 5fc8843c4c
commit 4102a687e3
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tsnet/tsnet.go
View File

@ -84,6 +84,7 @@ type Server struct {
initOnce sync.Once initOnce sync.Once
initErr error initErr error
lb *ipnlocal.LocalBackend lb *ipnlocal.LocalBackend
netstack *netstack.Impl
linkMon *monitor.Mon linkMon *monitor.Mon
localAPIListener net.Listener localAPIListener net.Listener
rootPath string // the state directory rootPath string // the state directory
@ -151,6 +152,10 @@ func (s *Server) Close() error {
}() }()
} }
if s.netstack != nil {
s.netstack.Close()
s.netstack = nil
}
s.shutdownCancel() s.shutdownCancel()
s.lb.Shutdown() s.lb.Shutdown()
s.linkMon.Close() s.linkMon.Close()
@ -296,6 +301,7 @@ func (s *Server) start() (reterr error) {
if err := ns.Start(); err != nil { if err := ns.Start(); err != nil {
return fmt.Errorf("failed to start netstack: %w", err) return fmt.Errorf("failed to start netstack: %w", err)
} }
s.netstack = ns
s.dialer.UseNetstackForIP = func(ip netip.Addr) bool { s.dialer.UseNetstackForIP = func(ip netip.Addr) bool {
_, ok := eng.PeerForIP(ip) _, ok := eng.PeerForIP(ip)
return ok return ok