From 58136de99d37b5f5d9905e43f2e385d29f751251 Mon Sep 17 00:00:00 2001 From: vivek Date: Tue, 19 Jul 2016 19:17:38 -0700 Subject: ospfd: Ensure correct handling of router-id change Upon router-id change, one object that needs to be updated is the "nbr_self" structure that is created to contain information about the local router and is used during DR election, among other things. In the past, the code used to just change the router-id field of this structure. This is actually not sufficient - the neighbor has to be deleted and re-added into the tree. This was fixed upstream and the fix is now available in our tree, but those changes don't work well with prior Cumulus changes to defer updating the router-id in the OSPF instance until other cleanup has happened. Fixed code to update the "nbr_self" structure correctly while continuing to defer the router_id update in the OSPF structure. Signed-off-by: Vivek Venkatraman Reviewed-by: Donald Sharp Ticket: CM-11861 Reviewed By: CCR-4980 Testing Done: Manual, failed test --- ospfd/ospfd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ospfd/ospfd.c') diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c index ea66042f2..2034ed1db 100644 --- a/ospfd/ospfd.c +++ b/ospfd/ospfd.c @@ -124,7 +124,7 @@ ospf_router_id_update (struct ospf *ospf) * oi->nbr_self->router_id = router_id for * !(virtual | ptop) links */ - ospf_nbr_self_reset (oi); + ospf_nbr_self_reset (oi, router_id); } /* If AS-external-LSA is queued, then flush those LSAs. */ @@ -888,7 +888,7 @@ add_ospf_interface (struct interface *ifp, struct ospf_area *area, oi->type = IF_DEF_PARAMS (ifp)->type; /* Add pseudo neighbor. */ - ospf_nbr_self_reset (oi); + ospf_nbr_self_reset (oi, oi->ospf->router_id); ospf_area_add_if (oi->area, oi); @@ -1160,7 +1160,7 @@ ospf_network_run_interface (struct prefix *p, struct ospf_area *area, oi->output_cost = ospf_if_get_output_cost (oi); /* Add pseudo neighbor. */ - ospf_nbr_add_self (oi); + ospf_nbr_add_self (oi, oi->ospf->router_id); /* Relate ospf interface to ospf instance. */ oi->ospf = area->ospf; -- cgit v1.2.3