]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #7492 from Niral-Networks/niral_ospfv3_fix_redist
authorRafael Zalamena <rzalamena@users.noreply.github.com>
Thu, 10 Dec 2020 12:01:12 +0000 (09:01 -0300)
committerGitHub <noreply@github.com>
Thu, 10 Dec 2020 12:01:12 +0000 (09:01 -0300)
ospf6d : Code refactoring for route redistribution.

1  2 
ospf6d/ospf6_asbr.c
ospf6d/ospf6_asbr.h
ospf6d/ospf6_top.c

Simple merge
Simple merge
index 908cda43d0b62ec4efb3d962cb6d5bb05cfb9fc9,17f9862b142e5a25ffe5c60bc6e70812759a2660..e461a379235ef65b83634781b515bbcdb408e7e4
@@@ -338,11 -335,12 +338,12 @@@ static void ospf6_disable(struct ospf6 
                        ospf6_area_disable(oa);
  
                /* XXX: This also changes persistent settings */
-               ospf6_asbr_redistribute_reset(o->vrf_id);
+               /* Unregister redistribution */
+               ospf6_asbr_redistribute_reset(o);
  
                ospf6_lsdb_remove_all(o->lsdb);
 -              ospf6_route_remove_all(o->route_table, o);
 -              ospf6_route_remove_all(o->brouter_table, o);
 +              ospf6_route_remove_all(o->route_table);
 +              ospf6_route_remove_all(o->brouter_table);
  
                THREAD_OFF(o->maxage_remover);
                THREAD_OFF(o->t_spf_calc);