From d87f595b6730fe6d6472dd700e6f8744f60fde33 Mon Sep 17 00:00:00 2001 From: ajs Date: Fri, 19 May 2006 13:53:23 +0000 Subject: [interface configuration] Preserve flag indicating address was set by quagga. 2006-05-19 Andrew J. Schorr * connected.c: (connected_add_ipv4,connected_add_ipv6) If the new struct connected matches an already existing one (that will consequently be removed by connected_withdraw), then be sure to preserve the ZEBRA_IFC_CONFIGURED flag. --- zebra/connected.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'zebra/connected.c') diff --git a/zebra/connected.c b/zebra/connected.c index 7e4f0fc7..39f47805 100644 --- a/zebra/connected.c +++ b/zebra/connected.c @@ -225,7 +225,11 @@ connected_add_ipv4 (struct interface *ifp, int flags, struct in_addr *addr, /* Check same connected route. */ if ((current = connected_check (ifp, (struct prefix *) ifc->address))) - connected_withdraw (current); /* implicit withdraw - freebsd does this */ + { + if (CHECK_FLAG(current->conf, ZEBRA_IFC_CONFIGURED)) + SET_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED); + connected_withdraw (current); /* implicit withdraw - freebsd does this */ + } connected_announce (ifp, ifc); } @@ -364,7 +368,11 @@ connected_add_ipv6 (struct interface *ifp, struct in6_addr *addr, ifc->label = XSTRDUP (MTYPE_CONNECTED_LABEL, label); if ((current = connected_check (ifp, (struct prefix *) ifc->address))) - connected_withdraw (current); /* implicit update of existing address */ + { + if (CHECK_FLAG(current->conf, ZEBRA_IFC_CONFIGURED)) + SET_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED); + connected_withdraw (current); /* implicit update of existing address */ + } connected_announce (ifp, ifc); } -- cgit v1.2.3