From: Don Slice <dslice@cumulusnetworks.com>
Date: Thu, 24 Mar 2016 15:40:50 +0000 (+0000)
Subject: zebra: add or delete router-id when interface moves vrfs
X-Git-Tag: frr-2.0-rc1~1038^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=99ffac1827958ec43bf39e6d5d106ba58beb1c5e;p=matthieu%2Ffrr.git

zebra: add or delete router-id when interface moves vrfs

When an interface changes which vrf it is part of, it needs to be added
to the list of possible router-id choices in the new vrf and removed
from the old vrf/default.

Ticket: CM-9074
Signed-off-by: Don Slice
Reviewed-by: Vivek Venkatraman
---

diff --git a/zebra/interface.c b/zebra/interface.c
index 0ea06d6f5a..38fe6988eb 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -498,6 +498,7 @@ if_install_connected (struct interface *ifp)
       for (ALL_LIST_ELEMENTS (ifp->connected, node, next, ifc))
 	{
 	  p = ifc->address;
+	  zebra_interface_address_add_update (ifp, ifc);
 
 	  if (p->family == AF_INET)
 	    connected_up_ipv4 (ifp, ifc);
@@ -521,6 +522,7 @@ if_uninstall_connected (struct interface *ifp)
       for (ALL_LIST_ELEMENTS (ifp->connected, node, next, ifc))
 	{
 	  p = ifc->address;
+	  zebra_interface_address_delete_update (ifp, ifc);
 
 	  if (p->family == AF_INET)
 	    connected_down_ipv4 (ifp, ifc);