TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-31 13:05:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnstate: include DNSName in tailscale status --json output

Browse Source
This commit is contained in:
Brad Fitzpatrick
2020-08-27 13:24:59 -07:00
parent 2bac125cad
commit 5acbb149a2
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ipn/ipnstate/ipnstate.go
View File

@@ -45,6 +45,7 @@ func (s *Status) Peers() []key.Public {
type PeerStatus struct { type PeerStatus struct {
PublicKey key.Public PublicKey key.Public
HostName string // HostInfo's Hostname (not a DNS name or necessarily unique) HostName string // HostInfo's Hostname (not a DNS name or necessarily unique)
DNSName string
OS string // HostInfo.OS OS string // HostInfo.OS
UserID tailcfg.UserID UserID tailcfg.UserID
@@ -166,6 +167,9 @@ func (sb *StatusBuilder) AddPeer(peer key.Public, st *PeerStatus) {
if v := st.HostName; v != "" { if v := st.HostName; v != "" {
e.HostName = v e.HostName = v
} }
if v := st.DNSName; v != "" {
e.DNSName = v
}
if v := st.Relay; v != "" { if v := st.Relay; v != "" {
e.Relay = v e.Relay = v
} }

1
ipn/local.go
View File

@@ -166,6 +166,7 @@ func (b *LocalBackend) UpdateStatus(sb *ipnstate.StatusBuilder) {
UserID: p.User, UserID: p.User,
TailAddr: tailAddr, TailAddr: tailAddr,
HostName: p.Hostinfo.Hostname, HostName: p.Hostinfo.Hostname,
DNSName: p.Name,
OS: p.Hostinfo.OS, OS: p.Hostinfo.OS,
KeepAlive: p.KeepAlive, KeepAlive: p.KeepAlive,
Created: p.Created, Created: p.Created,