From: JR Rivers Date: Mon, 24 Sep 2012 17:26:50 +0000 (+0000) Subject: ospfd: ABR algorithm not propagating MAXAGE LSAs into area X-Git-Tag: frr-2.0-rc1~1773 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=821755530e328182c885c98891af799926bd56bd;p=mirror%2Ffrr.git ospfd: ABR algorithm not propagating MAXAGE LSAs into area When a range (or sub-range) is deleted, the area is notified by propagating a MAXAGE LSA. This LSA stays in the database for a while to both insure propagation as well as in the off chance that it's useful in the near future. Unfortunately, the ABR algorithm was treating these MAXAGE LSAs as unchanged and not propagating them within the areas. Signed-off-by: JR Rivers Signed-off-by: Scott Feldman Reviewed-by: Dinesh Dutt Reviewed-by: Shrijeet Mukherjee Signed-off-by: David Lamparter --- diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c index ef1048b23b..2876eaa71f 100644 --- a/ospfd/ospf_abr.c +++ b/ospfd/ospf_abr.c @@ -729,8 +729,9 @@ ospf_abr_announce_network_to_area (struct prefix_ipv4 *p, u_int32_t cost, zlog_debug ("ospf_abr_announce_network_to_area(): " "old metric: %d, new metric: %d", GET_METRIC (sl->metric), cost); - - if (GET_METRIC (sl->metric) == cost) + + if ((GET_METRIC (sl->metric) == cost) && + ((old->flags & OSPF_LSA_IN_MAXAGE) == 0)) { /* unchanged. simply reapprove it */ if (IS_DEBUG_OSPF_EVENT)