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

net/tstun,wgengine,ipn/ipnlocal: make tstun's peerConfigTable use RouteManager table

Browse Source 
Previously tstun.Wrapper.SetWGConfig walked wgcfg.Config.Peers on every
netmap to rebuild its own IP-to-peer table for masquerade NAT rewrites
and jailed-peer classification. Now the tun layer instead consumes the
route manager's shared immutable outbound snapshot directly, via a new
Engine.SetPeerRoutes method: LocalBackend pushes the snapshot (plus this
node's native Tailscale addresses) after every route manager commit that
can change it, and per-packet lookups read the interned PeerRoute
attributes from that table.

When no current peer is jailed or masqueraded, LocalBackend installs a
nil table (gated on RouteManager.HasDataPlaneAttrs), preserving the
per-packet nil-check fast path. The exitNodeRequiresMasq machinery is
deleted: its purpose was populating the table with all peers so that
more-specific entries shadow an exit node's /0, and the always-full
route manager table gives that shadowing inherently.

This is the last step before removing the Peers field from wgcfg.Config.

Updates #12542

Change-Id: Ifce09ca929a3f2511303ca1d6efdd583739494ce
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2026-07-14 12:41:11 -07:00
committed by Brad Fitzpatrick
parent e4144230f4
commit f0ce89b715
15 changed files with 318 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/tsaddr/tsaddr_test.go
+25
View File
@@ -5,6 +5,7 @@ package tsaddr
import (
"net/netip"
"slices"
"testing"
"github.com/google/go-cmp/cmp"
@@ -290,3 +291,27 @@ func TestIsTailscaleIP(t *testing.T) {
}
}
}
func TestFirstTailscaleAddrs(t *testing.T) {
pfx := func(s string) netip.Prefix { return netip.MustParsePrefix(s) }
addr := func(s string) netip.Addr { return netip.MustParseAddr(s) }
tests := []struct {
name string
in []netip.Prefix
want4 netip.Addr
want6 netip.Addr
}{
{"empty", nil, netip.Addr{}, netip.Addr{}},
{"both", []netip.Prefix{pfx("100.64.0.1/32"), pfx("fd7a:115c:a1e0::1/128")}, addr("100.64.0.1"), addr("fd7a:115c:a1e0::1")},
{"first-of-each", []netip.Prefix{pfx("100.64.0.1/32"), pfx("100.64.0.2/32"), pfx("fd7a:115c:a1e0::1/128"), pfx("fd7a:115c:a1e0::2/128")}, addr("100.64.0.1"), addr("fd7a:115c:a1e0::1")},
{"non-tailscale-skipped", []netip.Prefix{pfx("192.168.1.1/32"), pfx("2001:db8::1/128"), pfx("100.64.0.9/32")}, addr("100.64.0.9"), netip.Addr{}},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
got4, got6 := FirstTailscaleAddrs(slices.All(tt.in))
if got4 != tt.want4 || got6 != tt.want6 {
t.Errorf("FirstTailscaleAddrs = %v, %v; want %v, %v", got4, got6, tt.want4, tt.want6)
}
})
}
}