]> git.puffer.fish Git - mirror/frr.git/commitdiff
ospf6d: always free redistribute config
authorIgor Ryzhov <iryzhov@nfware.com>
Fri, 7 May 2021 14:05:40 +0000 (17:05 +0300)
committerIgor Ryzhov <iryzhov@nfware.com>
Mon, 17 May 2021 22:27:16 +0000 (01:27 +0300)
When the ospf6 instance in unknown VRF is deleted, the redistribution
config is not freed, because it is not registered in zebra. We should
always free the config regardless of zebra registration status.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
ospf6d/ospf6_asbr.c

index c37d89bcb8a8be8400ef0ef4b576e404ac37feaa..6981baba99d1a18e1222a1e62b66442e7509cdee 100644 (file)
@@ -2302,10 +2302,8 @@ void ospf6_asbr_redistribute_reset(struct ospf6 *ospf6)
                        continue;
                if (type == ZEBRA_ROUTE_OSPF6)
                        continue;
-               if (ospf6_zebra_is_redistribute(type, ospf6->vrf_id)) {
-                       ospf6_asbr_redistribute_unset(ospf6, red, type);
-                       ospf6_redist_del(ospf6, red, type);
-               }
+               ospf6_asbr_redistribute_unset(ospf6, red, type);
+               ospf6_redist_del(ospf6, red, type);
        }
 }