diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2021-07-02 18:38:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-02 18:38:11 +0200 |
| commit | 30885c7099c8c0621a4b7522b5e1efb49148043e (patch) | |
| tree | ef6b3c3e3e178ee42d7bc63f94e10916faf03078 /ospf6d/ospf6_asbr.c | |
| parent | Merge pull request #8969 from opensourcerouting/msdp-timers (diff) | |
| download | frr-30885c7099c8c0621a4b7522b5e1efb49148043e.tar.xz frr-30885c7099c8c0621a4b7522b5e1efb49148043e.zip | |
Revert "ospf6d: fix LSAs remain in LSDB with an old router-id value"
Diffstat (limited to 'ospf6d/ospf6_asbr.c')
| -rw-r--r-- | ospf6d/ospf6_asbr.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 91e33c858..d4e52f0ed 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -2484,23 +2484,21 @@ void ospf6_asbr_redistribute_disable(struct ospf6 *ospf6) int type; struct ospf6_redist *red; - for (type = 0; type <= ZEBRA_ROUTE_MAX; type++) { - if (type == ZEBRA_ROUTE_OSPF6) - continue; + for (type = 0; type < ZEBRA_ROUTE_MAX; type++) { red = ospf6_redist_lookup(ospf6, type, 0); if (!red) continue; - - if (type == DEFAULT_ROUTE) { - ospf6_asbr_routemap_unset(red); - ospf6_redist_del(ospf6, red, type); - ospf6_redistribute_default_set(ospf6, - DEFAULT_ORIGINATE_NONE); + if (type == ZEBRA_ROUTE_OSPF6) continue; - } ospf6_asbr_redistribute_unset(ospf6, red, type); ospf6_redist_del(ospf6, red, type); } + red = ospf6_redist_lookup(ospf6, DEFAULT_ROUTE, 0); + if (red) { + ospf6_asbr_routemap_unset(red); + ospf6_redist_del(ospf6, red, type); + ospf6_redistribute_default_set(ospf6, DEFAULT_ORIGINATE_NONE); + } } void ospf6_asbr_redistribute_reset(struct ospf6 *ospf6) |