webnet/tailscale
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

ipn/ipnlocal: replace magicDNSAddrs bool params with a flags type

Browse Source 
Two adjacent bool arguments at call sites are easy to transpose and
hard to read. Use an unexported bitmask type instead, per review
feedback on PR #20414.

Updates #cleanup

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Change-Id: I0417270c9c3f4b2522911c39aad375cbaf025a82
This commit is contained in:
Brad Fitzpatrick
2026-07-14 10:59:00 -07:00
committed by Brad Fitzpatrick
parent 3d07b5d6e1
commit 0c4dcbdfeb
1 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipn/ipnlocal/node_backend.go
+31 -12
View File
@@ -1154,10 +1154,15 @@ func (nb *nodeBackend) magicDNSHostAddrs(fqdn dnsname.FQDN) (ips []netip.Addr, o
return nil, false return nil, false
} }
nm := nb.netMap nm := nb.netMap
selfV6Only := nm.GetAddresses().ContainsFunc(tsaddr.PrefixIs6) && var flags magicDNSAddrsFlags
!nm.GetAddresses().ContainsFunc(tsaddr.PrefixIs4) if nm.GetAddresses().ContainsFunc(tsaddr.PrefixIs6) &&
wantAAAA := nm.AllCaps.Contains(tailcfg.NodeAttrMagicDNSPeerAAAA) !nm.GetAddresses().ContainsFunc(tsaddr.PrefixIs4) {
return magicDNSAddrs(n.Addresses(), selfV6Only, wantAAAA), true flags |= selfV6Only
}
if nm.AllCaps.Contains(tailcfg.NodeAttrMagicDNSPeerAAAA) {
flags |= wantAAAA
}
return magicDNSAddrs(n.Addresses(), flags), true
} }
// magicDNSPTR returns the MagicDNS name of the node (peer or self) // magicDNSPTR returns the MagicDNS name of the node (peer or self)
@@ -1215,12 +1220,22 @@ func (nb *nodeBackend) nodeByFQDNLocked(fqdn dnsname.FQDN) (_ tailcfg.NodeView,
return nb.nodeByIDLocked(nid) return nb.nodeByIDLocked(nid)
} }
// magicDNSAddrsFlags is a bitmask of flags for magicDNSAddrs.
type magicDNSAddrsFlags uint8
const (
selfV6Only magicDNSAddrsFlags = 1 << iota // the querying node has only IPv6 addresses
wantAAAA // include IPv6 addresses even for nodes that also have IPv4
)
// magicDNSAddrs returns the MagicDNS answer addresses for a node // magicDNSAddrs returns the MagicDNS answer addresses for a node
// owning the given addresses: all of its IPv6 addresses if this node // owning the given addresses: all of its IPv6 addresses if this node
// (the querier) is IPv6-only, otherwise everything except the node's // (the querier) is IPv6-only, otherwise everything except the node's
// IPv6 addresses when it also has IPv4, unless wantAAAA. The result // IPv6 addresses when it also has IPv4, unless wantAAAA. The result
// may be empty (name exists, no records of the desired family). // may be empty (name exists, no records of the desired family).
func magicDNSAddrs(addrs views.Slice[netip.Prefix], selfV6Only, wantAAAA bool) (ips []netip.Addr) { func magicDNSAddrs(addrs views.Slice[netip.Prefix], flags magicDNSAddrsFlags) (ips []netip.Addr) {
wantAAAA := flags&wantAAAA != 0
selfV6Only := flags&selfV6Only != 0
var have4 bool var have4 bool
for _, addr := range addrs.All() { for _, addr := range addrs.All() {
if addr.Addr().Is4() { if addr.Addr().Is4() {
@@ -1380,12 +1395,16 @@ func dnsConfigForNetmap(nm *netmap.NetworkMap, peers map[tailcfg.NodeID]tailcfg.
Hosts: map[dnsname.FQDN][]netip.Addr{}, Hosts: map[dnsname.FQDN][]netip.Addr{},
} }
// selfV6Only is whether we only have IPv6 addresses ourselves. var addrFlags magicDNSAddrsFlags
selfV6Only := nm.GetAddresses().ContainsFunc(tsaddr.PrefixIs6) && if nm.GetAddresses().ContainsFunc(tsaddr.PrefixIs6) &&
!nm.GetAddresses().ContainsFunc(tsaddr.PrefixIs4) !nm.GetAddresses().ContainsFunc(tsaddr.PrefixIs4) {
dcfg.OnlyIPv6 = selfV6Only // We only have IPv6 addresses ourselves.
addrFlags |= selfV6Only
wantAAAA := nm.AllCaps.Contains(tailcfg.NodeAttrMagicDNSPeerAAAA) dcfg.OnlyIPv6 = true
}
if nm.AllCaps.Contains(tailcfg.NodeAttrMagicDNSPeerAAAA) {
addrFlags |= wantAAAA
}
// Populate MagicDNS records. The internal quad-100 resolver pulls // Populate MagicDNS records. The internal quad-100 resolver pulls
// per-node records on demand from the live node indexes (see // per-node records on demand from the live node indexes (see
@@ -1405,7 +1424,7 @@ func dnsConfigForNetmap(nm *netmap.NetworkMap, peers map[tailcfg.NodeID]tailcfg.
if err != nil { if err != nil {
return // TODO: propagate error? return // TODO: propagate error?
} }
dcfg.Hosts[fqdn] = magicDNSAddrs(addrs, selfV6Only, wantAAAA) dcfg.Hosts[fqdn] = magicDNSAddrs(addrs, addrFlags)
} }
set(nm.SelfName(), nm.GetAddresses()) set(nm.SelfName(), nm.GetAddresses())
for _, peer := range peers { for _, peer := range peers {