]> git.puffer.fish Git - mirror/frr.git/commitdiff
ospfd: fix small issue when exiting from the GR helper mode
authorRenato Westphal <renato@opensourcerouting.org>
Mon, 31 May 2021 13:27:51 +0000 (10:27 -0300)
committerIgor Ryzhov <iryzhov@nfware.com>
Wed, 9 Jun 2021 16:26:39 +0000 (19:26 +0300)
When exiting from the GR helper mode, recalculate the DR only for
interfaces of the appropriate types (broadcast and NMBA).

This fixes a problem where the state of a neighbor reachable over a
p2p interface was changing from Full/DROther to Full/Backup across
a graceful restart.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
ospfd/ospf_gr_helper.c

index 8ee4207b048b84ed3a7639ed84015bd212afb1d2..6e6e7b5c7df45184e25887f5601bf29d52a6e077 100644 (file)
@@ -725,7 +725,8 @@ void ospf_gr_helper_exit(struct ospf_neighbor *nbr,
        }
 
        /*Recalculate the DR for the network segment */
-       ospf_dr_election(oi);
+       if (oi->type == OSPF_IFTYPE_BROADCAST || oi->type == OSPF_IFTYPE_NBMA)
+               ospf_dr_election(oi);
 
        /* Originate a router LSA */
        ospf_router_lsa_update_area(oi->area);