TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-02 18:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/filter, wgengine/magicsock: use new IP.BitLen to simplify some code

Browse Source
This commit is contained in:
Brad Fitzpatrick
2020-12-15 12:12:56 -08:00
parent afcf134812
commit fa412c8760
4 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wgengine/magicsock/magicsock.go
View File

@@ -3199,13 +3199,12 @@ func (c *Conn) UpdateStatus(sb *ipnstate.StatusBuilder) {
if c.netMap != nil {
for _, addr := range c.netMap.Addresses {
if (addr.IP.Is4() && addr.Mask != 32) || (addr.IP.Is6() && addr.Mask != 128) {
ip := netaddr.IPFrom16(addr.IP.Addr)
if addr.Mask != ip.BitLen() {
continue
}
if ip, ok := netaddr.FromStdIP(addr.IP.IP()); ok {
sb.AddTailscaleIP(ip)
ss.TailAddr = ip.String()
}
sb.AddTailscaleIP(ip)
ss.TailAddr = ip.String()
}
}
sb.SetSelfStatus(ss)