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

wgengine/router,ipn/ipnlocal: add MTU field to router config

Browse Source 
The MacOS client can't set the MTU when creating the tun due to lack
of permissions, so add it to the router config and have MacOS set it
in the callback using a method that it does have permissions for.

Updates #8219

Signed-off-by: Val <valerie@tailscale.com>
This commit is contained in:
Val 2023-07-18 23:51:32 +02:00 committed by valscale
parent 9b5e29761c
commit 1138f4eb5f
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wgengine/router/callback.go
View File

@ -24,9 +24,16 @@ type CallbackRouter struct {
// will return ErrGetBaseConfigNotSupported. // will return ErrGetBaseConfigNotSupported.
GetBaseConfigFunc func() (dns.OSConfig, error) GetBaseConfigFunc func() (dns.OSConfig, error)
mu sync.Mutex // protects all the following // InitialMTU is the MTU the tun should be initialized with.
rcfg *Config // last applied router config // Zero means don't change the MTU from the default. This MTU
dcfg *dns.OSConfig // last applied DNS config // is applied only once, shortly after the TUN is created, and
// ignored thereafter.
InitialMTU uint32
mu sync.Mutex // protects all the following
didSetMTU bool // if we set the MTU already
rcfg *Config // last applied router config
dcfg *dns.OSConfig // last applied DNS config
} }
// Up implements Router. // Up implements Router.
@ -41,6 +48,10 @@ func (r *CallbackRouter) Set(rcfg *Config) error {
if r.rcfg.Equal(rcfg) { if r.rcfg.Equal(rcfg) {
return nil return nil
} }
if r.didSetMTU == false {
r.didSetMTU = true
rcfg.NewMTU = int(r.InitialMTU)
}
r.rcfg = rcfg r.rcfg = rcfg
return r.SetBoth(r.rcfg, r.dcfg) return r.SetBoth(r.rcfg, r.dcfg)
} }

5
wgengine/router/router.go
View File

@ -67,6 +67,11 @@ type Config struct {
// routing rules apply. // routing rules apply.
LocalRoutes []netip.Prefix LocalRoutes []netip.Prefix
// NewMTU is currently only used by the MacOS network extension
// app to set the MTU of the tun in the router configuration
// callback. If zero, the MTU is unchanged.
NewMTU int
// Linux-only things below, ignored on other platforms. // Linux-only things below, ignored on other platforms.
SubnetRoutes []netip.Prefix // subnets being advertised to other Tailscale nodes SubnetRoutes []netip.Prefix // subnets being advertised to other Tailscale nodes
SNATSubnetRoutes bool // SNAT traffic to local subnets SNATSubnetRoutes bool // SNAT traffic to local subnets

14
wgengine/router/router_test.go
View File

@ -21,8 +21,8 @@ func mustCIDRs(ss ...string) []netip.Prefix {
func TestConfigEqual(t *testing.T) { func TestConfigEqual(t *testing.T) {
testedFields := []string{ testedFields := []string{
"LocalAddrs", "Routes", "LocalRoutes", "SubnetRoutes", "LocalAddrs", "Routes", "LocalRoutes", "NewMTU",
"SNATSubnetRoutes", "NetfilterMode", "SubnetRoutes", "SNATSubnetRoutes", "NetfilterMode",
} }
configType := reflect.TypeOf(Config{}) configType := reflect.TypeOf(Config{})
configFields := []string{} configFields := []string{}
@ -134,6 +134,16 @@ func TestConfigEqual(t *testing.T) {
&Config{NetfilterMode: preftype.NetfilterNoDivert}, &Config{NetfilterMode: preftype.NetfilterNoDivert},
true, true,
}, },
{
&Config{NewMTU: 0},
&Config{NewMTU: 0},
true,
},
{
&Config{NewMTU: 1280},
&Config{NewMTU: 0},
false,
},
} }
for i, tt := range tests { for i, tt := range tests {
got := tt.a.Equal(tt.b) got := tt.a.Equal(tt.b)