diff options
| author | Brad Fitzpatrick <bradfitz@tailscale.com> | 2022-12-05 18:22:53 -0800 |
|---|---|---|
| committer | Brad Fitzpatrick <brad@danga.com> | 2022-12-05 18:50:24 -0800 |
| commit | 1598cd0361f3ca74fd052d4d804e052cb091cab9 (patch) | |
| tree | 099b1722413f92b09756b052c7a50a0f7ae2848a /ipn | |
| parent | 4b34c88426de324255f0906db8ae6ecb6da5d107 (diff) | |
| download | tailscale-1598cd0361f3ca74fd052d4d804e052cb091cab9.tar.xz tailscale-1598cd0361f3ca74fd052d4d804e052cb091cab9.zip | |
net/tsaddr: remove ContainsFunc helpers (they're now in x/exp/slices)
x/exp/slices now has ContainsFunc (golang/go#53983) so we can delete
our versions.
Change-Id: I5157a403bfc1b30e243bf31c8b611da25e995078
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Diffstat (limited to 'ipn')
| -rw-r--r-- | ipn/ipnlocal/local.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index 4158ca68b..07c7aeaa1 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -2827,8 +2827,8 @@ func dnsConfigForNetmap(nm *netmap.NetworkMap, prefs ipn.PrefsView, logf logger. } // selfV6Only is whether we only have IPv6 addresses ourselves. - selfV6Only := tsaddr.PrefixesContainsFunc(nm.Addresses, tsaddr.PrefixIs6) && - !tsaddr.PrefixesContainsFunc(nm.Addresses, tsaddr.PrefixIs4) + selfV6Only := slices.ContainsFunc(nm.Addresses, tsaddr.PrefixIs6) && + !slices.ContainsFunc(nm.Addresses, tsaddr.PrefixIs4) dcfg.OnlyIPv6 = selfV6Only // Populate MagicDNS records. We do this unconditionally so that @@ -2844,7 +2844,7 @@ func dnsConfigForNetmap(nm *netmap.NetworkMap, prefs ipn.PrefsView, logf logger. if err != nil { return // TODO: propagate error? } - have4 := tsaddr.PrefixesContainsFunc(addrs, tsaddr.PrefixIs4) + have4 := slices.ContainsFunc(addrs, tsaddr.PrefixIs4) var ips []netip.Addr for _, addr := range addrs { if selfV6Only { @@ -3258,7 +3258,7 @@ func (b *LocalBackend) routerConfig(cfg *wgcfg.Config, prefs ipn.PrefsView, oneC } } - if tsaddr.PrefixesContainsFunc(rs.LocalAddrs, tsaddr.PrefixIs4) { + if slices.ContainsFunc(rs.LocalAddrs, tsaddr.PrefixIs4) { rs.Routes = append(rs.Routes, netip.PrefixFrom(tsaddr.TailscaleServiceIP(), 32)) } |