Ensure tsnet is closed on exit

Author: coadler

cmd/wush/cp.go

@@ -143,6 +143,7 @@ func cpCmd() *serpent.Command {
 			if err != nil {
 				return err
 			}
+			defer ts.Close()
 
 			logf("Bringing WireGuard up..")
 			ts.Up(ctx)

cmd/wush/portforward.go

@@ -97,8 +97,7 @@ func portForwardCmd() *serpent.Command {
 			if err != nil {
 				return err
 			}
-			ts.Logf = func(string, ...any) {}
-			ts.UserLogf = func(string, ...any) {}
+			defer ts.Close()
 
 			logf("Bringing WireGuard up..")
 			ts.Up(ctx)

cmd/wush/serve.go

@@ -100,6 +100,7 @@ func serveCmd() *serpent.Command {
 			if err != nil {
 				return err
 			}
+			defer ts.Close()
 
 			ts.Up(ctx)
 			fs := afero.NewOsFs()

cmd/wush/ssh.go

@@ -41,6 +41,7 @@ func sshCmd() *serpent.Command {
 		),
 		Handler: func(inv *serpent.Invocation) error {
 			ctx := inv.Context()
+			defer fmt.Fprintln(inv.Stderr, "[exited]")
 
 			s, err := tsserver.NewServer(ctx, logger, send)
 			if err != nil {
@@ -61,6 +62,7 @@ func sshCmd() *serpent.Command {
 			if err != nil {
 				return err
 			}
+			defer ts.Close()
 
 			logf("Bringing WireGuard up..")
 			ts.Up(ctx)