Skip to content

fix(vpn): send subnet masks and prefix lengths from router #16317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 29, 2025
Merged

fix(vpn): send subnet masks and prefix lengths from router #16317

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d53a4d8
fix(vpn): send subnet masks and prefix lengths from router
ethanndickson Jan 29, 2025
9d15ec0
bump tailscale
ethanndickson Jan 29, 2025
d79989e
test
ethanndickson Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
test
  • Loading branch information
@ethanndickson
ethanndickson committed Jan 29, 2025
commit d79989e6e3213682bb046fe65dc8108519dbce46
18 changes: 6 additions & 12 deletions vpn/router_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ func TestConvertRouterConfig(t *testing.T) {
expected: &NetworkSettingsRequest{
Mtu: 1500,
Ipv4Settings: &NetworkSettingsRequest_IPv4Settings{
Addrs: []string{"100.64.0.1/32"},
Addrs: []string{"100.64.0.1"},
SubnetMasks: []string{"255.255.255.255"},
IncludedRoutes: []*NetworkSettingsRequest_IPv4Settings_IPv4Route{
{Destination: "192.168.0.0", Mask: "255.255.255.0", Router: ""},
},
Expand All @@ -36,7 +37,8 @@ func TestConvertRouterConfig(t *testing.T) {
},
},
Ipv6Settings: &NetworkSettingsRequest_IPv6Settings{
Addrs: []string{"fd7a:115c:a1e0::1/128"},
Addrs: []string{"fd7a:115c:a1e0::1"},
PrefixLengths: []uint32{128},
IncludedRoutes: []*NetworkSettingsRequest_IPv6Settings_IPv6Route{
{Destination: "fd00::", PrefixLength: 64, Router: ""},
},
Expand All @@ -50,16 +52,8 @@ func TestConvertRouterConfig(t *testing.T) {
name: "Empty",
cfg: router.Config{},
expected: &NetworkSettingsRequest{
Ipv4Settings: &NetworkSettingsRequest_IPv4Settings{
Addrs: []string{},
IncludedRoutes: []*NetworkSettingsRequest_IPv4Settings_IPv4Route{},
ExcludedRoutes: []*NetworkSettingsRequest_IPv4Settings_IPv4Route{},
},
Ipv6Settings: &NetworkSettingsRequest_IPv6Settings{
Addrs: []string{},
IncludedRoutes: []*NetworkSettingsRequest_IPv6Settings_IPv6Route{},
ExcludedRoutes: []*NetworkSettingsRequest_IPv6Settings_IPv6Route{},
},
Ipv4Settings: nil,
Ipv6Settings: nil,
},
},
}
Expand Down
Loading