TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-21 14:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnstate: add AllowedIPs to PeerStatus

Browse Source 
Adds AllowedIPs to PeerStatus, allowing for easier lookup of the
routes allowed to be routed to a node. Will be using the AllowedIPs
of the self node from the web client interface to display approval
status of advertised routes.

Updates #10261

Signed-off-by: Sonia Appasamy <sonia@tailscale.com>
This commit is contained in:
Sonia Appasamy 2023-11-29 11:17:00 -05:00 committed by Sonia Appasamy
parent ac4b416c5b
commit bc4e303846
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipn/ipnlocal/local.go
View File

@ -900,6 +900,10 @@ func peerStatusFromNode(ps *ipnstate.PeerStatus, n tailcfg.NodeView) {
v := n.PrimaryRoutes() v := n.PrimaryRoutes()
ps.PrimaryRoutes = &v ps.PrimaryRoutes = &v
} }
if n.AllowedIPs().Len() != 0 {
v := n.AllowedIPs()
ps.AllowedIPs = &v
}
if n.Expired() { if n.Expired() {
ps.Expired = true ps.Expired = true

5
ipn/ipnstate/ipnstate.go
View File

@ -216,6 +216,8 @@ type PeerStatus struct {
// TailscaleIPs are the IP addresses assigned to the node. // TailscaleIPs are the IP addresses assigned to the node.
TailscaleIPs []netip.Addr TailscaleIPs []netip.Addr
// AllowedIPs are IP addresses allowed to route to this node.
AllowedIPs *views.Slice[netip.Prefix] `json:",omitempty"`
// Tags are the list of ACL tags applied to this node. // Tags are the list of ACL tags applied to this node.
// See tailscale.com/tailcfg#Node.Tags for more information. // See tailscale.com/tailcfg#Node.Tags for more information.
@ -414,6 +416,9 @@ func (sb *StatusBuilder) AddPeer(peer key.NodePublic, st *PeerStatus) {
if v := st.PrimaryRoutes; v != nil && !v.IsNil() { if v := st.PrimaryRoutes; v != nil && !v.IsNil() {
e.PrimaryRoutes = v e.PrimaryRoutes = v
} }
if v := st.AllowedIPs; v != nil && !v.IsNil() {
e.AllowedIPs = v
}
if v := st.Tags; v != nil && !v.IsNil() { if v := st.Tags; v != nil && !v.IsNil() {
e.Tags = v e.Tags = v
} }