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

{ipn,net,tsnet}: use tsaddr helpers

Browse Source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby
2024-09-25 11:10:46 +02:00
committed by Kristoffer Dalby
parent f03e82a97c
commit 7d1160ddaa
2 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ipn/ipnlocal/local.go
View File

@@ -4593,11 +4593,6 @@ func magicDNSRootDomains(nm *netmap.NetworkMap) []dnsname.FQDN {
return nil
}
var (
ipv4Default = netip.MustParsePrefix("0.0.0.0/0")
ipv6Default = netip.MustParsePrefix("::/0")
)
// peerRoutes returns the routerConfig.Routes to access peers.
// If there are over cgnatThreshold CGNAT routes, one big CGNAT route
// is used instead.
@@ -4698,9 +4693,9 @@ func (b *LocalBackend) routerConfig(cfg *wgcfg.Config, prefs ipn.PrefsView, oneC
var default4, default6 bool
for _, route := range rs.Routes {
switch route {
case ipv4Default:
case tsaddr.AllIPv4():
default4 = true
case ipv6Default:
case tsaddr.AllIPv6():
default6 = true
}
if default4 && default6 {
@@ -4708,10 +4703,10 @@ func (b *LocalBackend) routerConfig(cfg *wgcfg.Config, prefs ipn.PrefsView, oneC
}
}
if !default4 {
rs.Routes = append(rs.Routes, ipv4Default)
rs.Routes = append(rs.Routes, tsaddr.AllIPv4())
}
if !default6 {
rs.Routes = append(rs.Routes, ipv6Default)
rs.Routes = append(rs.Routes, tsaddr.AllIPv6())
}
internalIPs, externalIPs, err := internalAndExternalInterfaces()
if err != nil {
@@ -4768,14 +4763,7 @@ func (b *LocalBackend) applyPrefsToHostinfoLocked(hi *tailcfg.Hostinfo, prefs ip
hi.ShieldsUp = prefs.ShieldsUp()
hi.AllowsUpdate = envknob.AllowsRemoteUpdate() || prefs.AutoUpdate().Apply.EqualBool(true)
// count routes without exit node routes
var routes int64
for _, route := range hi.RoutableIPs {
if route.Bits() != 0 {
routes++
}
}
b.metrics.advertisedRoutes.Set(float64(routes))
b.metrics.advertisedRoutes.Set(float64(tsaddr.WithoutExitRoute(prefs.AdvertiseRoutes()).Len()))
var sshHostKeys []string
if prefs.RunSSH() && envknob.CanSSHD() {