TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-01 09:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/router: refactor udm-pro into broader ubnt support

Browse Source 
Fixes #14453

Signed-off-by: Jason Barnett <J@sonBarnett.com>
This commit is contained in:
Jason Barnett
2024-12-22 13:18:40 -07:00
committed by Adrian Dewhurst
parent e3bcb2ec83
commit 17b881538a
3 changed files with 17 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wgengine/router/router_linux.go
View File

@@ -1184,7 +1184,7 @@ var (
)
// baseIPRules are the policy routing rules that Tailscale uses, when not
// running on a UDM-Pro.
// running on a UBNT device.
//
// The priority is the value represented here added to r.ipPolicyPrefBase,
// which is usually 5200.
@@ -1236,15 +1236,15 @@ var baseIPRules = []netlink.Rule{
// usual rules (pref 32766 and 32767, ie. main and default).
}
// udmProIPRules are the policy routing rules that Tailscale uses, when running
// on a UDM-Pro.
// ubntIPRules are the policy routing rules that Tailscale uses, when running
// on a UBNT device.
//
// The priority is the value represented here added to
// r.ipPolicyPrefBase, which is usually 5200.
//
// This represents an experiment that will be used to gather more information.
// If this goes well, Tailscale may opt to use this for all of Linux.
var udmProIPRules = []netlink.Rule{
var ubntIPRules = []netlink.Rule{
// non-fwmark packets fall through to the usual rules (pref 32766 and 32767,
// ie. main and default).
{
@@ -1256,10 +1256,10 @@ var udmProIPRules = []netlink.Rule{
}
// ipRules returns the appropriate list of ip rules to be used by Tailscale. See
// comments on baseIPRules and udmProIPRules for more details.
// comments on baseIPRules and ubntIPRules for more details.
func ipRules() []netlink.Rule {
if getDistroFunc() == distro.UDMPro {
return udmProIPRules
if getDistroFunc() == distro.UBNT {
return ubntIPRules
}
return baseIPRules
}

6
wgengine/router/router_linux_test.go
View File

@@ -1233,14 +1233,14 @@ func adjustFwmask(t *testing.T, s string) string {
return fwmaskAdjustRe.ReplaceAllString(s, "$1")
}
func TestIPRulesForUDMPro(t *testing.T) {
func TestIPRulesForUBNT(t *testing.T) {
// Override the global getDistroFunc
getDistroFunc = func() distro.Distro {
return distro.UDMPro
return distro.UBNT
}
defer func() { getDistroFunc = distro.Get }() // Restore original after the test
expected := udmProIPRules
expected := ubntIPRules
actual := ipRules()
if len(expected) != len(actual) {