TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn, wgengine/magicsock: fix tailscale status display.

Browse Source 
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2020-12-15 18:45:13 -08:00 committed by Dave Anderson
parent 891110e64c
commit 294ceb513c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ipn/local.go
View File

@ -209,8 +209,14 @@ func (b *LocalBackend) UpdateStatus(sb *ipnstate.StatusBuilder) {
lastSeen = *p.LastSeen lastSeen = *p.LastSeen
} }
var tailAddr string var tailAddr string
if len(p.Addresses) > 0 { for _, addr := range p.Addresses {
tailAddr = strings.TrimSuffix(p.Addresses[0].String(), "/32") // The peer struct currently only allows a single
// Tailscale IP address. For compatibility with the
// old display, make sure it's the IPv4 address.
if addr.IP.Is4() && addr.Mask == 32 && tsaddr.IsTailscaleIP(netaddr.IPFrom16(addr.IP.Addr)) {
tailAddr = addr.IP.String()
break
}
} }
sb.AddPeer(key.Public(p.Key), &ipnstate.PeerStatus{ sb.AddPeer(key.Public(p.Key), &ipnstate.PeerStatus{
InNetworkMap: true, InNetworkMap: true,

7
wgengine/magicsock/magicsock.go
View File

@ -2725,7 +2725,12 @@ func (c *Conn) UpdateStatus(sb *ipnstate.StatusBuilder) {
continue continue
} }
sb.AddTailscaleIP(ip) sb.AddTailscaleIP(ip)
ss.TailAddr = ip.String() // TailAddr only allows for a single Tailscale IP. For
// readability of `tailscale status`, make it the IPv4
// address.
if addr.IP.Is4() {
ss.TailAddr = ip.String()
}
} }
} }
sb.SetSelfStatus(ss) sb.SetSelfStatus(ss)