Merge c0792347f5 into 909e9eabe4

cmd/tailscale/cli/status.go

@@ -150,6 +150,11 @@ func runStatus(ctx context.Context, args []string) error {
 
 	var buf bytes.Buffer
 	f := func(format string, a ...any) { fmt.Fprintf(&buf, format, a...) }
+
+	if st.CurrentTailnet != nil {
+		f("# Tailnet name: %s\n\n", st.CurrentTailnet.MagicDNSSuffix)
+	}
+
 	printPS := func(ps *ipnstate.PeerStatus) {
 		f("%-15s %-20s %-12s %-7s ",
 			firstIPString(ps.TailscaleIPs),

ipn/ipnstate/ipnstate.go

@@ -500,6 +500,9 @@ table tbody tr:nth-child(even) td { background-color: #f5f5f5; }
 		ips = append(ips, ip.String())
 	}
 	f("<p>Tailscale IP: %s", strings.Join(ips, ", "))
+	if st.CurrentTailnet != nil {
+		f("<p>Tailnet Name: %s", st.CurrentTailnet.MagicDNSSuffix)
+	}
 
 	f("<table>\n<thead>\n")
 	f("<tr><th>Peer</th><th>OS</th><th>Node</th><th>Owner</th><th>Rx</th><th>Tx</th><th>Activity</th><th>Connection</th></tr>\n")