From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Thu, 19 Nov 2009 14:27:30 +0000 (+0100)
Subject: ospfd: Self nbrs needs to be rebuilt when router ID changes.
X-Git-Tag: frr-2.0-rc1~730
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=25a346ebeb8327be596da39709e97739c33c0bbd;p=matthieu%2Ffrr.git

ospfd: Self nbrs needs to be rebuilt when router ID changes.

Some self nbrs are identified by router_id, these needs
to be rebuilt instead of just resetting router ID.
Possibly one could optimize for !(virtual | ptop) links
by doing oi->nbr_self->router_id = router_id instead.

Router ID will change once after startup config has been
read and zebra reports router ID, unless router ID has
been configured in ospf.

(cherry picked from commit 94266fa822baf9b9c9e10ac03ccec8ccf3ce0c98)
---

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 665091d70b..b4da733610 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -118,8 +118,15 @@ ospf_router_id_update (struct ospf *ospf)
     {
 
       for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi))
-        /* Update self-neighbor's router_id. */
-        oi->nbr_self->router_id = router_id;
+	{
+	  /* Some nbrs are identified by router_id, these needs
+	   * to be rebuilt. Possible optimization would be to do
+	   * oi->nbr_self->router_id = router_id for
+	   * !(virtual | ptop) links
+	   */
+	  ospf_nbr_delete(oi->nbr_self);
+	  ospf_nbr_add_self(oi);
+	}
 
       /* If AS-external-LSA is queued, then flush those LSAs. */
       if (router_id_old.s_addr == 0 && ospf->external_origin)