From 0cce04105f661af2afde59b1785374d28fd0571c Mon Sep 17 00:00:00 2001
From: "M. J. Fromberger" <fromberger@tailscale.com>
Date: Wed, 19 Mar 2025 12:13:35 -0700
Subject: [PATCH] tsnet: shut down the event bus on Close

Updates #15160

Change-Id: I29c8194b4b41e95848e5f160e9970db352588449
Signed-off-by: M. J. Fromberger <fromberger@tailscale.com>
---
 tsnet/tsnet.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tsnet/tsnet.go b/tsnet/tsnet.go
index 5968defff..6d52b3062 100644
--- a/tsnet/tsnet.go
+++ b/tsnet/tsnet.go
@@ -435,8 +435,11 @@ func (s *Server) Close() error {
 	for _, ln := range s.listeners {
 		ln.closeLocked()
 	}
-
 	wg.Wait()
+
+	if bus := s.sys.Bus.Get(); bus != nil {
+		bus.Close()
+	}
 	s.closed = true
 	return nil
 }