]> git.puffer.fish Git - matthieu/frr.git/commit
ospfd: Ensure correct handling of router-id change
authorvivek <vivek@cumulusnetworks.com>
Wed, 20 Jul 2016 02:17:38 +0000 (19:17 -0700)
committervivek <vivek@cumulusnetworks.com>
Wed, 20 Jul 2016 02:17:38 +0000 (19:17 -0700)
commit58136de99d37b5f5d9905e43f2e385d29f751251
tree97221a709824a605f97c580b6a852a633177920e
parent5be7afc8bb6dce6f6bcf77faad3a754e52812408
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 <vivek@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Ticket: CM-11861
Reviewed By: CCR-4980
Testing Done: Manual, failed test
ospfd/ospf_interface.c
ospfd/ospf_neighbor.c
ospfd/ospf_neighbor.h
ospfd/ospfd.c