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

ipn/{ipnlocal,ipnstate}: add Tags and PrimaryRoutes to PeerStatus

Browse Source 
Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2022-02-21 14:53:20 -08:00 committed by Maisem Ali
parent 0fc1479633
commit 9cbb0913be
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/ipnlocal/local.go
View File

@ -448,6 +448,8 @@ func (b *LocalBackend) populatePeerStatusLocked(sb *ipnstate.StatusBuilder) {
ID: p.StableID, ID: p.StableID,
UserID: p.User, UserID: p.User,
TailscaleIPs: tailscaleIPs, TailscaleIPs: tailscaleIPs,
Tags: p.Tags,
PrimaryRoutes: p.PrimaryRoutes,
HostName: p.Hostinfo.Hostname(), HostName: p.Hostinfo.Hostname(),
DNSName: p.Name, DNSName: p.Name,
OS: p.Hostinfo.OS(), OS: p.Hostinfo.OS(),

28
ipn/ipnstate/ipnstate.go
View File

@ -101,15 +101,23 @@ type PeerStatusLite struct {
} }
type PeerStatus struct { type PeerStatus struct {
ID tailcfg.StableNodeID ID tailcfg.StableNodeID
PublicKey key.NodePublic PublicKey key.NodePublic
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 DNSName string
OS string // HostInfo.OS OS string // HostInfo.OS
UserID tailcfg.UserID UserID tailcfg.UserID
TailscaleIPs []netaddr.IP // Tailscale IP(s) assigned to this node TailscaleIPs []netaddr.IP // Tailscale IP(s) assigned to this node
// Tags are the list of ACL tags applied to this node.
// See tailscale.com/tailcfg#Node.Tags for more information.
Tags []string `json:",omitempty"`
// PrimaryRoutes are the routes this node is currently the primary
// subnet router for, as determined by the control plane. It does
// not include the IPs in TailscaleIPs.
PrimaryRoutes []netaddr.IPPrefix `json:",omitempty"`
// Endpoints: // Endpoints:
Addrs []string Addrs []string
CurAddr string // one of Addrs, or unique if roaming CurAddr string // one of Addrs, or unique if roaming
@ -266,6 +274,12 @@ func (sb *StatusBuilder) AddPeer(peer key.NodePublic, st *PeerStatus) {
if v := st.TailscaleIPs; v != nil { if v := st.TailscaleIPs; v != nil {
e.TailscaleIPs = v e.TailscaleIPs = v
} }
if v := st.PrimaryRoutes; v != nil {
e.PrimaryRoutes = v
}
if v := st.Tags; v != nil {
e.Tags = v
}
if v := st.OS; v != "" { if v := st.OS; v != "" {
e.OS = st.OS e.OS = st.OS
} }