Merge pull request #13024 from opensourcerouting/fix/bgpd_prefix-list_changes_not_aff...

[mirror_frr.git] / ospf6d / ospf6_gr.c

diff --git a/ospf6d/ospf6_gr.c b/ospf6d/ospf6_gr.c
index c182e48f2e7a6f613127545bf0acb8a75ea705d3..847531361eaaa9cc9fb1f7e998108eab633ccccc 100644 (file)
--- a/ospf6d/ospf6_gr.c
+++ b/ospf6d/ospf6_gr.c
@@ -127,6 +127,7 @@ static void ospf6_gr_restart_exit(struct ospf6 *ospf6, const char *reason)
 {
        struct ospf6_area *area;
        struct listnode *onode, *anode;
+       struct ospf6_route *route;
 
        if (IS_DEBUG_OSPF6_GR)
                zlog_debug("GR: exiting graceful restart: %s", reason);
@@ -148,8 +149,16 @@ static void ospf6_gr_restart_exit(struct ospf6 *ospf6, const char *reason)
                 */
                OSPF6_ROUTER_LSA_EXECUTE(area);
 
+               /*
+                * Force reorigination of intra-area-prefix-LSAs to handle
+                * areas without any full adjacency.
+                */
+               OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(area);
+
                for (ALL_LIST_ELEMENTS_RO(area->if_list, anode, oi)) {
-                       OSPF6_LINK_LSA_EXECUTE(oi);
+                       /* Reoriginate Link-LSA. */
+                       if (oi->type != OSPF_IFTYPE_VIRTUALLINK)
+                               OSPF6_LINK_LSA_EXECUTE(oi);
 
                        /*
                         * 2) The router should reoriginate network-LSAs on all
@@ -160,6 +169,16 @@ static void ospf6_gr_restart_exit(struct ospf6 *ospf6, const char *reason)
                }
        }
 
+       /*
+        * While all self-originated NSSA and AS-external LSAs were already
+        * learned from the helping neighbors, we need to reoriginate them in
+        * order to ensure they will be refreshed periodically.
+        */
+       for (route = ospf6_route_head(ospf6->external_table); route;
+            route = ospf6_route_next(route))
+               ospf6_handle_external_lsa_origination(ospf6, route,
+                                                     &route->prefix);
+
        /*
         * 3) The router reruns its OSPF routing calculations, this time
         *    installing the results into the system forwarding table, and