TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-12-01 22:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

more discover: don't remove local routes

Browse Source
This commit is contained in:
Fran Bull 2024-04-10 09:31:06 -07:00
parent 71a36fe15f
commit 767389a70b
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
appc/appconnector.go
View File

@ -226,7 +226,13 @@ func (e *AppConnector) updateDomains(domains []string) {
// everything left in oldDiscovered a) won't be in e.domains and b) can be unadvertised if it's not in local or control // everything left in oldDiscovered a) won't be in e.domains and b) can be unadvertised if it's not in local or control
for domainName, domainsRoutes := range oldDiscovered { for domainName, domainsRoutes := range oldDiscovered {
if domainsRoutes != nil { if domainsRoutes != nil {
toRemove := domainsRoutes.RoutesSlice() toRemove := []netip.Prefix{}
for _, route := range domainsRoutes.RoutesSlice() {
if !slices.Contains(routeInfo.Local, route) {
toRemove = append(toRemove, route)
}
// TODO check control also
}
e.logf("unadvertising %d routes for domain: %s", len(toRemove), domainName) e.logf("unadvertising %d routes for domain: %s", len(toRemove), domainName)
e.scheduleUnadvertisement(domainName, toRemove...) e.scheduleUnadvertisement(domainName, toRemove...)
} }

16
ipn/ipnlocal/local_test.go
View File

@ -2775,14 +2775,15 @@ func TestPatchPrefsHandlerWithoutPresistStore(t *testing.T) {
} }
func TestFran(t *testing.T) { func TestFran(t *testing.T) {
prefixSortFunc := func(i, j netip.Prefix) int {
return i.Addr().Compare(j.Addr())
}
epIP2 := netip.MustParsePrefix("192.1.0.9/32") epIP2 := netip.MustParsePrefix("192.1.0.9/32")
explicitlyAdvertisedRoutes := []netip.Prefix{netip.MustParsePrefix("192.1.0.8/32"), epIP2} explicitlyAdvertisedRoutes := []netip.Prefix{netip.MustParsePrefix("192.1.0.8/32"), epIP2}
oneRoutes := []netip.Prefix{netip.MustParsePrefix("192.0.0.8/32"), netip.MustParsePrefix("192.0.0.16/32")} oneRoutes := []netip.Prefix{netip.MustParsePrefix("192.0.0.8/32"), netip.MustParsePrefix("192.0.0.16/32")}
//twoRoutes := []netip.Prefix{netip.MustParsePrefix("192.0.0.10/32"), netip.MustParsePrefix("192.0.0.18/32"), epIP2} twoRoutes := []netip.Prefix{netip.MustParsePrefix("192.0.0.10/32"), netip.MustParsePrefix("192.0.0.18/32"), epIP2}
twoRoutes := []netip.Prefix{netip.MustParsePrefix("192.0.0.10/32"), netip.MustParsePrefix("192.0.0.18/32")}
for _, shouldStore := range []bool{true, false} { for _, shouldStore := range []bool{true, false} {
//for _, shouldStore := range []bool{false} {
b := newTestBackend(t) b := newTestBackend(t)
b.ControlKnobs().AppCStoreRoutes.Store(shouldStore) b.ControlKnobs().AppCStoreRoutes.Store(shouldStore)
// make b an app connector // make b an app connector
@ -2826,9 +2827,13 @@ func TestFran(t *testing.T) {
afterTwoRoutes := append([]netip.Prefix{}, explicitlyAdvertisedRoutes...) afterTwoRoutes := append([]netip.Prefix{}, explicitlyAdvertisedRoutes...)
afterTwoRoutes = append(afterTwoRoutes, oneRoutes...) afterTwoRoutes = append(afterTwoRoutes, oneRoutes...)
afterTwoRoutes = append(afterTwoRoutes, twoRoutes...) afterTwoRoutes = append(afterTwoRoutes, twoRoutes...)
slices.SortFunc(afterTwoRoutes, prefixSortFunc)
afterTwoRoutes = slices.Compact(afterTwoRoutes)
afterOneRoutes := append([]netip.Prefix{}, explicitlyAdvertisedRoutes...) afterOneRoutes := append([]netip.Prefix{}, explicitlyAdvertisedRoutes...)
afterOneRoutes = append(afterOneRoutes, oneRoutes...) afterOneRoutes = append(afterOneRoutes, oneRoutes...)
slices.SortFunc(afterOneRoutes, prefixSortFunc)
afterOneRoutes = slices.Compact(afterOneRoutes)
for _, tst := range []struct { for _, tst := range []struct {
domain string domain string
@ -2840,11 +2845,12 @@ func TestFran(t *testing.T) {
// doesn't care about example.com, so still just the route for one.com // doesn't care about example.com, so still just the route for one.com
{domain: "example.com", route: []string{"192.0.0.9", "192.0.0.17"}, wantAfter: afterOneRoutes}, {domain: "example.com", route: []string{"192.0.0.9", "192.0.0.17"}, wantAfter: afterOneRoutes},
// learns the route for two.com as well // learns the route for two.com as well
{domain: "two.com", route: []string{"192.0.0.10", "192.0.0.18"}, wantAfter: afterTwoRoutes}, {domain: "two.com", route: []string{"192.0.0.10", "192.0.0.18", "192.1.0.9"}, wantAfter: afterTwoRoutes},
} { } {
b.ObserveDNSResponse(dnsResponse(tst.domain+".", tst.route)) b.ObserveDNSResponse(dnsResponse(tst.domain+".", tst.route))
b.appConnector.Wait(context.Background()) b.appConnector.Wait(context.Background())
routesNow := b.pm.prefs.AdvertiseRoutes().AsSlice() routesNow := b.pm.prefs.AdvertiseRoutes().AsSlice()
slices.SortFunc(routesNow, prefixSortFunc)
if !slices.Equal(routesNow, tst.wantAfter) { if !slices.Equal(routesNow, tst.wantAfter) {
t.Fatalf("after dns response for %s got routes %v, want %v", tst.domain, routesNow, tst.wantAfter) t.Fatalf("after dns response for %s got routes %v, want %v", tst.domain, routesNow, tst.wantAfter)
} }
@ -2857,6 +2863,7 @@ func TestFran(t *testing.T) {
if !shouldStore { if !shouldStore {
wantRoutes = afterTwoRoutes wantRoutes = afterTwoRoutes
} }
slices.SortFunc(routesNow, prefixSortFunc)
if !slices.Equal(routesNow, wantRoutes) { if !slices.Equal(routesNow, wantRoutes) {
t.Fatalf("after removing two.com (shouldStore=%t), got %v, want %v", shouldStore, routesNow, wantRoutes) t.Fatalf("after removing two.com (shouldStore=%t), got %v, want %v", shouldStore, routesNow, wantRoutes)
} }
@ -2879,6 +2886,7 @@ func TestFran(t *testing.T) {
if !shouldStore { if !shouldStore {
wantRoutes = afterTwoRoutes wantRoutes = afterTwoRoutes
} }
slices.SortFunc(routesNow, prefixSortFunc)
if !slices.Equal(routesNow, wantRoutes) { if !slices.Equal(routesNow, wantRoutes) {
t.Fatalf("after becoming not an app connector got routes %v, want %v", routesNow, wantRoutes) t.Fatalf("after becoming not an app connector got routes %v, want %v", routesNow, wantRoutes)
} }