*: reindentreindent-3.0-after

indent.py `git ls-files | pcregrep '\.[ch]$' | pcregrep -v '^(ldpd|babeld|nhrpd)/'`

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

1 files changed, 2011 insertions, 2081 deletions

diff --git a/zebra/interface.c b/zebra/interface.c
index c629dfb3f3..1e3844f6f4 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with GNU Zebra; see the file COPYING.  If not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * 02111-1307, USA.
  */
 
 #include <zebra.h>
@@ -52,285 +52,278 @@
 
 #define ZEBRA_PTM_SUPPORT
 
-#if defined (HAVE_RTADV)
+#if defined(HAVE_RTADV)
 /* Order is intentional.  Matches RFC4191.  This array is also used for
    command matching, so only modify with care. */
-const char *rtadv_pref_strs[] = { "medium", "high", "INVALID", "low", 0 };
+const char *rtadv_pref_strs[] = {"medium", "high", "INVALID", "low", 0};
 #endif /* HAVE_RTADV */
 
-static void if_down_del_nbr_connected (struct interface *ifp);
+static void if_down_del_nbr_connected(struct interface *ifp);
 
-static void
-zebra_if_node_destroy (route_table_delegate_t *delegate,
-		       struct route_table *table, struct route_node *node)
+static void zebra_if_node_destroy(route_table_delegate_t *delegate,
+				  struct route_table *table,
+				  struct route_node *node)
 {
-  if (node->info)
-    list_delete (node->info);
-  route_node_destroy (delegate, table, node);
+	if (node->info)
+		list_delete(node->info);
+	route_node_destroy(delegate, table, node);
 }
 
 route_table_delegate_t zebra_if_table_delegate = {
-  .create_node = route_node_create,
-  .destroy_node = zebra_if_node_destroy
-};
+	.create_node = route_node_create,
+	.destroy_node = zebra_if_node_destroy};
 
 /* Called when new interface is added. */
-static int
-if_zebra_new_hook (struct interface *ifp)
-{
-  struct zebra_if *zebra_if;
-
-  zebra_if = XCALLOC (MTYPE_TMP, sizeof (struct zebra_if));
-
-  zebra_if->multicast = IF_ZEBRA_MULTICAST_UNSPEC;
-  zebra_if->shutdown = IF_ZEBRA_SHUTDOWN_OFF;
-  zebra_ptm_if_init(zebra_if);
-
-  ifp->ptm_enable = zebra_ptm_get_enable_state();
-#if defined (HAVE_RTADV)
-  {
-    /* Set default router advertise values. */
-    struct rtadvconf *rtadv;
-
-    rtadv = &zebra_if->rtadv;
-
-    rtadv->AdvSendAdvertisements = 0;
-    rtadv->MaxRtrAdvInterval = RTADV_MAX_RTR_ADV_INTERVAL;
-    rtadv->MinRtrAdvInterval = RTADV_MIN_RTR_ADV_INTERVAL;
-    rtadv->AdvIntervalTimer = 0;
-    rtadv->AdvManagedFlag = 0;
-    rtadv->AdvOtherConfigFlag = 0;
-    rtadv->AdvHomeAgentFlag = 0;
-    rtadv->AdvLinkMTU = 0;
-    rtadv->AdvReachableTime = 0;
-    rtadv->AdvRetransTimer = 0;
-    rtadv->AdvCurHopLimit = 0;
-    rtadv->AdvDefaultLifetime = -1; /* derive from MaxRtrAdvInterval */
-    rtadv->HomeAgentPreference = 0;
-    rtadv->HomeAgentLifetime = -1; /* derive from AdvDefaultLifetime */
-    rtadv->AdvIntervalOption = 0;
-    rtadv->DefaultPreference = RTADV_PREF_MEDIUM;
-
-    rtadv->AdvPrefixList = list_new ();
-  }    
+static int if_zebra_new_hook(struct interface *ifp)
+{
+	struct zebra_if *zebra_if;
+
+	zebra_if = XCALLOC(MTYPE_TMP, sizeof(struct zebra_if));
+
+	zebra_if->multicast = IF_ZEBRA_MULTICAST_UNSPEC;
+	zebra_if->shutdown = IF_ZEBRA_SHUTDOWN_OFF;
+	zebra_ptm_if_init(zebra_if);
+
+	ifp->ptm_enable = zebra_ptm_get_enable_state();
+#if defined(HAVE_RTADV)
+	{
+		/* Set default router advertise values. */
+		struct rtadvconf *rtadv;
+
+		rtadv = &zebra_if->rtadv;
+
+		rtadv->AdvSendAdvertisements = 0;
+		rtadv->MaxRtrAdvInterval = RTADV_MAX_RTR_ADV_INTERVAL;
+		rtadv->MinRtrAdvInterval = RTADV_MIN_RTR_ADV_INTERVAL;
+		rtadv->AdvIntervalTimer = 0;
+		rtadv->AdvManagedFlag = 0;
+		rtadv->AdvOtherConfigFlag = 0;
+		rtadv->AdvHomeAgentFlag = 0;
+		rtadv->AdvLinkMTU = 0;
+		rtadv->AdvReachableTime = 0;
+		rtadv->AdvRetransTimer = 0;
+		rtadv->AdvCurHopLimit = 0;
+		rtadv->AdvDefaultLifetime =
+			-1; /* derive from MaxRtrAdvInterval */
+		rtadv->HomeAgentPreference = 0;
+		rtadv->HomeAgentLifetime =
+			-1; /* derive from AdvDefaultLifetime */
+		rtadv->AdvIntervalOption = 0;
+		rtadv->DefaultPreference = RTADV_PREF_MEDIUM;
+
+		rtadv->AdvPrefixList = list_new();
+	}
 #endif /* HAVE_RTADV */
 
-  /* Initialize installed address chains tree. */
-  zebra_if->ipv4_subnets = route_table_init_with_delegate (&zebra_if_table_delegate);
+	/* Initialize installed address chains tree. */
+	zebra_if->ipv4_subnets =
+		route_table_init_with_delegate(&zebra_if_table_delegate);
 
-  ifp->info = zebra_if;
-  return 0;
+	ifp->info = zebra_if;
+	return 0;
 }
 
 /* Called when interface is deleted. */
-static int
-if_zebra_delete_hook (struct interface *ifp)
+static int if_zebra_delete_hook(struct interface *ifp)
 {
-  struct zebra_if *zebra_if;
-  
-  if (ifp->info)
-    {
-      zebra_if = ifp->info;
+	struct zebra_if *zebra_if;
 
-      /* Free installed address chains tree. */
-      if (zebra_if->ipv4_subnets)
-	route_table_finish (zebra_if->ipv4_subnets);
- #if defined (HAVE_RTADV)
+	if (ifp->info) {
+		zebra_if = ifp->info;
 
-      struct rtadvconf *rtadv;
+		/* Free installed address chains tree. */
+		if (zebra_if->ipv4_subnets)
+			route_table_finish(zebra_if->ipv4_subnets);
+#if defined(HAVE_RTADV)
 
-      rtadv = &zebra_if->rtadv;
-      list_free (rtadv->AdvPrefixList);
- #endif /* HAVE_RTADV */
+		struct rtadvconf *rtadv;
 
-      XFREE (MTYPE_TMP, zebra_if);
-    }
+		rtadv = &zebra_if->rtadv;
+		list_free(rtadv->AdvPrefixList);
+#endif /* HAVE_RTADV */
 
-  return 0;
+		XFREE(MTYPE_TMP, zebra_if);
+	}
+
+	return 0;
 }
 
 /* Build the table key */
-static void
-if_build_key (u_int32_t ifindex, struct prefix *p)
+static void if_build_key(u_int32_t ifindex, struct prefix *p)
 {
-  p->family = AF_INET;
-  p->prefixlen = IPV4_MAX_BITLEN;
-  p->u.prefix4.s_addr = ifindex;
+	p->family = AF_INET;
+	p->prefixlen = IPV4_MAX_BITLEN;
+	p->u.prefix4.s_addr = ifindex;
 }
 
 /* Link an interface in a per NS interface tree */
-struct interface *
-if_link_per_ns (struct zebra_ns *ns, struct interface *ifp)
+struct interface *if_link_per_ns(struct zebra_ns *ns, struct interface *ifp)
 {
-  struct prefix p;
-  struct route_node *rn;
+	struct prefix p;
+	struct route_node *rn;
 
-  if (ifp->ifindex == IFINDEX_INTERNAL)
-    return NULL;
+	if (ifp->ifindex == IFINDEX_INTERNAL)
+		return NULL;
 
-  if_build_key (ifp->ifindex, &p);
-  rn = route_node_get (ns->if_table, &p);
-  if (rn->info)
-    {
-      ifp = (struct interface *)rn->info;
-      route_unlock_node (rn); /* get */
-      return ifp;
-    }
+	if_build_key(ifp->ifindex, &p);
+	rn = route_node_get(ns->if_table, &p);
+	if (rn->info) {
+		ifp = (struct interface *)rn->info;
+		route_unlock_node(rn); /* get */
+		return ifp;
+	}
 
-  rn->info = ifp;
-  ifp->node = rn;
+	rn->info = ifp;
+	ifp->node = rn;
 
-  return ifp;
+	return ifp;
 }
 
 /* Delete a VRF. This is called in vrf_terminate(). */
-void
-if_unlink_per_ns (struct interface *ifp)
+void if_unlink_per_ns(struct interface *ifp)
 {
-  ifp->node->info = NULL;
-  route_unlock_node(ifp->node);
-  ifp->node = NULL;
+	ifp->node->info = NULL;
+	route_unlock_node(ifp->node);
+	ifp->node = NULL;
 }
 
 /* Look up an interface by identifier within a NS */
-struct interface *
-if_lookup_by_index_per_ns (struct zebra_ns *ns, u_int32_t ifindex)
-{
-  struct prefix p;
-  struct route_node *rn;
-  struct interface *ifp = NULL;
-
-  if_build_key (ifindex, &p);
-  rn = route_node_lookup (ns->if_table, &p);
-  if (rn)
-    {
-      ifp = (struct interface *)rn->info;
-      route_unlock_node (rn); /* lookup */
-    }
-  return ifp;
+struct interface *if_lookup_by_index_per_ns(struct zebra_ns *ns,
+					    u_int32_t ifindex)
+{
+	struct prefix p;
+	struct route_node *rn;
+	struct interface *ifp = NULL;
+
+	if_build_key(ifindex, &p);
+	rn = route_node_lookup(ns->if_table, &p);
+	if (rn) {
+		ifp = (struct interface *)rn->info;
+		route_unlock_node(rn); /* lookup */
+	}
+	return ifp;
 }
 
 /* Look up an interface by name within a NS */
-struct interface *
-if_lookup_by_name_per_ns (struct zebra_ns *ns, const char *ifname)
+struct interface *if_lookup_by_name_per_ns(struct zebra_ns *ns,
+					   const char *ifname)
 {
-  struct route_node *rn;
-  struct interface *ifp;
+	struct route_node *rn;
+	struct interface *ifp;
 
-  for (rn = route_top (ns->if_table); rn; rn = route_next (rn))
-    {
-      ifp = (struct interface *)rn->info;
-      if (ifp && strcmp (ifp->name, ifname) == 0)
-	return (ifp);
-    }
+	for (rn = route_top(ns->if_table); rn; rn = route_next(rn)) {
+		ifp = (struct interface *)rn->info;
+		if (ifp && strcmp(ifp->name, ifname) == 0)
+			return (ifp);
+	}
 
-  return NULL;
+	return NULL;
 }
 
-const char *
-ifindex2ifname_per_ns (struct zebra_ns *zns, unsigned int ifindex)
+const char *ifindex2ifname_per_ns(struct zebra_ns *zns, unsigned int ifindex)
 {
-  struct interface *ifp;
+	struct interface *ifp;
 
-  return ((ifp = if_lookup_by_index_per_ns (zns, ifindex)) != NULL) ?
-  	 ifp->name : "unknown";
+	return ((ifp = if_lookup_by_index_per_ns(zns, ifindex)) != NULL)
+		       ? ifp->name
+		       : "unknown";
 }
 
 /* Tie an interface address to its derived subnet list of addresses. */
-int
-if_subnet_add (struct interface *ifp, struct connected *ifc)
-{
-  struct route_node *rn;
-  struct zebra_if *zebra_if;
-  struct prefix cp;
-  struct list *addr_list;
-
-  assert (ifp && ifp->info && ifc);
-  zebra_if = ifp->info;
-
-  /* Get address derived subnet node and associated address list, while marking
-     address secondary attribute appropriately. */
-  cp = *ifc->address;
-  apply_mask (&cp);
-  rn = route_node_get (zebra_if->ipv4_subnets, &cp);
-
-  if ((addr_list = rn->info))
-    SET_FLAG (ifc->flags, ZEBRA_IFA_SECONDARY);
-  else
-    {
-      UNSET_FLAG (ifc->flags, ZEBRA_IFA_SECONDARY);
-      rn->info = addr_list = list_new ();
-      route_lock_node (rn);
-    }
-
-  /* Tie address at the tail of address list. */
-  listnode_add (addr_list, ifc);
-  
-  /* Return list element count. */
-  return (addr_list->count);
+int if_subnet_add(struct interface *ifp, struct connected *ifc)
+{
+	struct route_node *rn;
+	struct zebra_if *zebra_if;
+	struct prefix cp;
+	struct list *addr_list;
+
+	assert(ifp && ifp->info && ifc);
+	zebra_if = ifp->info;
+
+	/* Get address derived subnet node and associated address list, while
+	   marking
+	   address secondary attribute appropriately. */
+	cp = *ifc->address;
+	apply_mask(&cp);
+	rn = route_node_get(zebra_if->ipv4_subnets, &cp);
+
+	if ((addr_list = rn->info))
+		SET_FLAG(ifc->flags, ZEBRA_IFA_SECONDARY);
+	else {
+		UNSET_FLAG(ifc->flags, ZEBRA_IFA_SECONDARY);
+		rn->info = addr_list = list_new();
+		route_lock_node(rn);
+	}
+
+	/* Tie address at the tail of address list. */
+	listnode_add(addr_list, ifc);
+
+	/* Return list element count. */
+	return (addr_list->count);
 }
 
 /* Untie an interface address from its derived subnet list of addresses. */
-int
-if_subnet_delete (struct interface *ifp, struct connected *ifc)
-{
-  struct route_node *rn;
-  struct zebra_if *zebra_if;
-  struct list *addr_list;
-
-  assert (ifp && ifp->info && ifc);
-  zebra_if = ifp->info;
-
-  /* Get address derived subnet node. */
-  rn = route_node_lookup (zebra_if->ipv4_subnets, ifc->address);
-  if (! (rn && rn->info))
-    {
-      zlog_warn("Trying to remove an address from an unknown subnet."
-                " (please report this bug)");
-      return -1;
-    }
-  route_unlock_node (rn);
-  
-  /* Untie address from subnet's address list. */
-  addr_list = rn->info;
-
-  /* Deleting an address that is not registered is a bug.
-   * In any case, we shouldn't decrement the lock counter if the address
-   * is unknown. */
-  if (!listnode_lookup(addr_list, ifc))
-    {
-      zlog_warn("Trying to remove an address from a subnet where it is not"
-                " currently registered. (please report this bug)");
-      return -1;
-    }
-
-  listnode_delete (addr_list, ifc);
-  route_unlock_node (rn);
-
-  /* Return list element count, if not empty. */
-  if (addr_list->count)
-    {
-      /* If deleted address is primary, mark subsequent one as such and distribute. */
-      if (! CHECK_FLAG (ifc->flags, ZEBRA_IFA_SECONDARY))
-	{
-	  ifc = listgetdata ((struct listnode *)listhead (addr_list));
-	  zebra_interface_address_delete_update (ifp, ifc);
-	  UNSET_FLAG (ifc->flags, ZEBRA_IFA_SECONDARY);
-	  /* XXX: Linux kernel removes all the secondary addresses when the primary
-	   * address is removed. We could try to work around that, though this is
-	   * non-trivial. */
-	  zebra_interface_address_add_update (ifp, ifc);
-	}
-      
-      return addr_list->count;
-    }
-  
-  /* Otherwise, free list and route node. */
-  list_free (addr_list);
-  rn->info = NULL;
-  route_unlock_node (rn);
-
-  return 0;
+int if_subnet_delete(struct interface *ifp, struct connected *ifc)
+{
+	struct route_node *rn;
+	struct zebra_if *zebra_if;
+	struct list *addr_list;
+
+	assert(ifp && ifp->info && ifc);
+	zebra_if = ifp->info;
+
+	/* Get address derived subnet node. */
+	rn = route_node_lookup(zebra_if->ipv4_subnets, ifc->address);
+	if (!(rn && rn->info)) {
+		zlog_warn(
+			"Trying to remove an address from an unknown subnet."
+			" (please report this bug)");
+		return -1;
+	}
+	route_unlock_node(rn);
+
+	/* Untie address from subnet's address list. */
+	addr_list = rn->info;
+
+	/* Deleting an address that is not registered is a bug.
+	 * In any case, we shouldn't decrement the lock counter if the address
+	 * is unknown. */
+	if (!listnode_lookup(addr_list, ifc)) {
+		zlog_warn(
+			"Trying to remove an address from a subnet where it is not"
+			" currently registered. (please report this bug)");
+		return -1;
+	}
+
+	listnode_delete(addr_list, ifc);
+	route_unlock_node(rn);
+
+	/* Return list element count, if not empty. */
+	if (addr_list->count) {
+		/* If deleted address is primary, mark subsequent one as such
+		 * and distribute. */
+		if (!CHECK_FLAG(ifc->flags, ZEBRA_IFA_SECONDARY)) {
+			ifc = listgetdata(
+				(struct listnode *)listhead(addr_list));
+			zebra_interface_address_delete_update(ifp, ifc);
+			UNSET_FLAG(ifc->flags, ZEBRA_IFA_SECONDARY);
+			/* XXX: Linux kernel removes all the secondary addresses
+			 * when the primary
+			 * address is removed. We could try to work around that,
+			 * though this is
+			 * non-trivial. */
+			zebra_interface_address_add_update(ifp, ifc);
+		}
+
+		return addr_list->count;
+	}
+
+	/* Otherwise, free list and route node. */
+	list_free(addr_list);
+	rn->info = NULL;
+	route_unlock_node(rn);
+
+	return 0;
 }
 
 /* if_flags_mangle: A place for hacks that require mangling
@@ -339,10 +332,10 @@ if_subnet_delete (struct interface *ifp, struct connected *ifc)
  * ******************** Solaris flags hacks **************************
  *
  * Solaris IFF_UP flag reflects only the primary interface as the
- * routing socket only sends IFINFO for the primary interface.  Hence  
- * ~IFF_UP does not per se imply all the logical interfaces are also   
+ * routing socket only sends IFINFO for the primary interface.  Hence
+ * ~IFF_UP does not per se imply all the logical interfaces are also
  * down - which we only know of as addresses. Instead we must determine
- * whether the interface really is up or not according to how many   
+ * whether the interface really is up or not according to how many
  * addresses are still attached. (Solaris always sends RTM_DELADDR if
  * an interface, logical or not, goes ~IFF_UP).
  *
@@ -357,19 +350,18 @@ if_subnet_delete (struct interface *ifp, struct connected *ifc)
  * interface will affect only the primary interface/address on Solaris.
  ************************End Solaris flags hacks ***********************
  */
-static void
-if_flags_mangle (struct interface *ifp, uint64_t *newflags)
+static void if_flags_mangle(struct interface *ifp, uint64_t *newflags)
 {
 #ifdef SUNOS_5
-  struct zebra_if *zif = ifp->info;
-  
-  zif->primary_state = *newflags & (IFF_UP & 0xff);
-  
-  if (CHECK_FLAG (zif->primary_state, IFF_UP)
-      || listcount(ifp->connected) > 0)
-    SET_FLAG (*newflags, IFF_UP);
-  else
-    UNSET_FLAG (*newflags, IFF_UP);
+	struct zebra_if *zif = ifp->info;
+
+	zif->primary_state = *newflags & (IFF_UP & 0xff);
+
+	if (CHECK_FLAG(zif->primary_state, IFF_UP)
+	    || listcount(ifp->connected) > 0)
+		SET_FLAG(*newflags, IFF_UP);
+	else
+		UNSET_FLAG(*newflags, IFF_UP);
 #endif /* SUNOS_5 */
 }
 
@@ -379,903 +371,897 @@ if_flags_mangle (struct interface *ifp, uint64_t *newflags)
  *
  * newflags should be the raw value, as obtained from the OS.
  */
-void
-if_flags_update (struct interface *ifp, uint64_t newflags)
-{
-  if_flags_mangle (ifp, &newflags);
-    
-  if (if_is_no_ptm_operative (ifp))
-    {
-      /* operative -> inoperative? */
-      ifp->flags = newflags;
-      if (!if_is_operative (ifp))
-        if_down (ifp);
-    }
-  else
-    {
-      /* inoperative -> operative? */
-      ifp->flags = newflags;
-      if (if_is_operative (ifp))
-        if_up (ifp);
-    }
+void if_flags_update(struct interface *ifp, uint64_t newflags)
+{
+	if_flags_mangle(ifp, &newflags);
+
+	if (if_is_no_ptm_operative(ifp)) {
+		/* operative -> inoperative? */
+		ifp->flags = newflags;
+		if (!if_is_operative(ifp))
+			if_down(ifp);
+	} else {
+		/* inoperative -> operative? */
+		ifp->flags = newflags;
+		if (if_is_operative(ifp))
+			if_up(ifp);
+	}
 }
 
 /* Wake up configured address if it is not in current kernel
    address. */
-static void
-if_addr_wakeup (struct interface *ifp)
-{
-  struct listnode *node, *nnode;
-  struct connected *ifc;
-  struct prefix *p;
-  int ret;
-
-  for (ALL_LIST_ELEMENTS (ifp->connected, node, nnode, ifc))
-    {
-      p = ifc->address;
-	
-      if (CHECK_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED)
-	  && ! CHECK_FLAG (ifc->conf, ZEBRA_IFC_QUEUED))
-	{
-	  /* Address check. */
-	  if (p->family == AF_INET)
-	    {
-	      if (! if_is_up (ifp))
-		{
-		  /* Assume zebra is configured like following:
-		   *
-		   *   interface gre0
-		   *    ip addr 192.0.2.1/24
-		   *   !
-		   *
-		   * As soon as zebra becomes first aware that gre0 exists in the
-		   * kernel, it will set gre0 up and configure its addresses.
-		   *
-		   * (This may happen at startup when the interface already exists
-		   * or during runtime when the interface is added to the kernel)
-		   *
-		   * XXX: IRDP code is calling here via if_add_update - this seems
-		   * somewhat weird.
-		   * XXX: RUNNING is not a settable flag on any system
-		   * I (paulj) am aware of.
-		  */
-		  if_set_flags (ifp, IFF_UP | IFF_RUNNING);
-		  if_refresh (ifp);
-		}
-
-	      ret = if_set_prefix (ifp, ifc);
-	      if (ret < 0)
-		{
-		  zlog_warn ("Can't set interface's address: %s", 
-			     safe_strerror(errno));
-		  continue;
-		}
+static void if_addr_wakeup(struct interface *ifp)
+{
+	struct listnode *node, *nnode;
+	struct connected *ifc;
+	struct prefix *p;
+	int ret;
 
-	      SET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
-	      /* The address will be advertised to zebra clients when the notification
-	       * from the kernel has been received.
-	       * It will also be added to the interface's subnet list then. */
-	    }
-	  if (p->family == AF_INET6)
-	    {
-	      if (! if_is_up (ifp))
-		{
-		  /* See long comment above */
-		  if_set_flags (ifp, IFF_UP | IFF_RUNNING);
-		  if_refresh (ifp);
-		}
+	for (ALL_LIST_ELEMENTS(ifp->connected, node, nnode, ifc)) {
+		p = ifc->address;
 
-	      ret = if_prefix_add_ipv6 (ifp, ifc);
-	      if (ret < 0)
-		{
-		  zlog_warn ("Can't set interface's address: %s", 
-			     safe_strerror(errno));
-		  continue;
+		if (CHECK_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED)
+		    && !CHECK_FLAG(ifc->conf, ZEBRA_IFC_QUEUED)) {
+			/* Address check. */
+			if (p->family == AF_INET) {
+				if (!if_is_up(ifp)) {
+					/* Assume zebra is configured like
+					 * following:
+					 *
+					 *   interface gre0
+					 *    ip addr 192.0.2.1/24
+					 *   !
+					 *
+					 * As soon as zebra becomes first aware
+					 * that gre0 exists in the
+					 * kernel, it will set gre0 up and
+					 * configure its addresses.
+					 *
+					 * (This may happen at startup when the
+					 * interface already exists
+					 * or during runtime when the interface
+					 * is added to the kernel)
+					 *
+					 * XXX: IRDP code is calling here via
+					 * if_add_update - this seems
+					 * somewhat weird.
+					 * XXX: RUNNING is not a settable flag
+					 * on any system
+					 * I (paulj) am aware of.
+					*/
+					if_set_flags(ifp, IFF_UP | IFF_RUNNING);
+					if_refresh(ifp);
+				}
+
+				ret = if_set_prefix(ifp, ifc);
+				if (ret < 0) {
+					zlog_warn(
+						"Can't set interface's address: %s",
+						safe_strerror(errno));
+					continue;
+				}
+
+				SET_FLAG(ifc->conf, ZEBRA_IFC_QUEUED);
+				/* The address will be advertised to zebra
+				 * clients when the notification
+				 * from the kernel has been received.
+				 * It will also be added to the interface's
+				 * subnet list then. */
+			}
+			if (p->family == AF_INET6) {
+				if (!if_is_up(ifp)) {
+					/* See long comment above */
+					if_set_flags(ifp, IFF_UP | IFF_RUNNING);
+					if_refresh(ifp);
+				}
+
+				ret = if_prefix_add_ipv6(ifp, ifc);
+				if (ret < 0) {
+					zlog_warn(
+						"Can't set interface's address: %s",
+						safe_strerror(errno));
+					continue;
+				}
+
+				SET_FLAG(ifc->conf, ZEBRA_IFC_QUEUED);
+				/* The address will be advertised to zebra
+				 * clients when the notification
+				 * from the kernel has been received. */
+			}
 		}
-
-	      SET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
-	      /* The address will be advertised to zebra clients when the notification
-	       * from the kernel has been received. */
-	    }
 	}
-    }
 }
 
 /* Handle interface addition */
-void
-if_add_update (struct interface *ifp)
+void if_add_update(struct interface *ifp)
 {
-  struct zebra_if *if_data;
+	struct zebra_if *if_data;
 
-  if_link_per_ns(zebra_ns_lookup (NS_DEFAULT), ifp);
+	if_link_per_ns(zebra_ns_lookup(NS_DEFAULT), ifp);
 
-  if_data = ifp->info;
-  assert(if_data);
+	if_data = ifp->info;
+	assert(if_data);
 
-  if (if_data->multicast == IF_ZEBRA_MULTICAST_ON)
-    if_set_flags (ifp, IFF_MULTICAST);
-  else if (if_data->multicast == IF_ZEBRA_MULTICAST_OFF)
-    if_unset_flags (ifp, IFF_MULTICAST);
+	if (if_data->multicast == IF_ZEBRA_MULTICAST_ON)
+		if_set_flags(ifp, IFF_MULTICAST);
+	else if (if_data->multicast == IF_ZEBRA_MULTICAST_OFF)
+		if_unset_flags(ifp, IFF_MULTICAST);
 
-  zebra_ptm_if_set_ptm_state(ifp, if_data);
+	zebra_ptm_if_set_ptm_state(ifp, if_data);
 
-  zebra_interface_add_update (ifp);
+	zebra_interface_add_update(ifp);
 
-  if (! CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE))
-    {
-      SET_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE);
+	if (!CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE)) {
+		SET_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE);
 
-      if (if_data && if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON)
-	{
-	  if (IS_ZEBRA_DEBUG_KERNEL)
-	    zlog_debug ("interface %s vrf %u index %d is shutdown. "
-			"Won't wake it up.",
-			ifp->name, ifp->vrf_id, ifp->ifindex);
-	  return;
-	}
-
-      if_addr_wakeup (ifp);
+		if (if_data && if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON) {
+			if (IS_ZEBRA_DEBUG_KERNEL)
+				zlog_debug(
+					"interface %s vrf %u index %d is shutdown. "
+					"Won't wake it up.",
+					ifp->name, ifp->vrf_id, ifp->ifindex);
+			return;
+		}
 
-      if (IS_ZEBRA_DEBUG_KERNEL)
-	zlog_debug ("interface %s vrf %u index %d becomes active.",
-		    ifp->name, ifp->vrf_id, ifp->ifindex);
-      static_ifindex_update(ifp, true);
-    }
-  else
-    {
-      if (IS_ZEBRA_DEBUG_KERNEL)
-	zlog_debug ("interface %s vrf %u index %d is added.",
-		    ifp->name, ifp->vrf_id, ifp->ifindex);
-    }
+		if_addr_wakeup(ifp);
+
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug(
+				"interface %s vrf %u index %d becomes active.",
+				ifp->name, ifp->vrf_id, ifp->ifindex);
+		static_ifindex_update(ifp, true);
+	} else {
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug("interface %s vrf %u index %d is added.",
+				   ifp->name, ifp->vrf_id, ifp->ifindex);
+	}
 }
 
 /* Install connected routes corresponding to an interface. */
-static void
-if_install_connected (struct interface *ifp)
-{
-  struct listnode *node;
-  struct listnode *next;
-  struct connected *ifc;
-  struct prefix *p;
-
-  if (ifp->connected)
-    {
-      for (ALL_LIST_ELEMENTS (ifp->connected, node, next, ifc))
-	{
-	  if (CHECK_FLAG(ifc->conf, ZEBRA_IFC_REAL))
-	    zebra_interface_address_add_update (ifp, ifc);
-
-	  p = ifc->address;
-	  if (p->family == AF_INET)
-	    connected_up_ipv4 (ifp, ifc);
-	  else if (p->family == AF_INET6)
-	    connected_up_ipv6 (ifp, ifc);
+static void if_install_connected(struct interface *ifp)
+{
+	struct listnode *node;
+	struct listnode *next;
+	struct connected *ifc;
+	struct prefix *p;
+
+	if (ifp->connected) {
+		for (ALL_LIST_ELEMENTS(ifp->connected, node, next, ifc)) {
+			if (CHECK_FLAG(ifc->conf, ZEBRA_IFC_REAL))
+				zebra_interface_address_add_update(ifp, ifc);
+
+			p = ifc->address;
+			if (p->family == AF_INET)
+				connected_up_ipv4(ifp, ifc);
+			else if (p->family == AF_INET6)
+				connected_up_ipv6(ifp, ifc);
+		}
 	}
-    }
 }
 
 /* Uninstall connected routes corresponding to an interface. */
-static void
-if_uninstall_connected (struct interface *ifp)
-{
-  struct listnode *node;
-  struct listnode *next;
-  struct connected *ifc;
-  struct prefix *p;
-
-  if (ifp->connected)
-    {
-      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);
-	  else if (p->family == AF_INET6)
-	    connected_down_ipv6 (ifp, ifc);
+static void if_uninstall_connected(struct interface *ifp)
+{
+	struct listnode *node;
+	struct listnode *next;
+	struct connected *ifc;
+	struct prefix *p;
+
+	if (ifp->connected) {
+		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);
+			else if (p->family == AF_INET6)
+				connected_down_ipv6(ifp, ifc);
+		}
 	}
-    }
 }
 
 /* Uninstall and delete connected routes corresponding to an interface. */
 /* TODO - Check why IPv4 handling here is different from install or if_down */
-static void
-if_delete_connected (struct interface *ifp)
-{
-  struct connected *ifc;
-  struct prefix *p;
-  struct route_node *rn;
-  struct zebra_if *zebra_if;
-
-  zebra_if = ifp->info;
-
-  if (ifp->connected)
-    {
-      struct listnode *node;
-      struct listnode *last = NULL;
-
-      while ((node = (last ? last->next : listhead (ifp->connected))))
-	{
-	  ifc = listgetdata (node);
-	  p = ifc->address;
-	  
-	  if (p->family == AF_INET
-	      && (rn = route_node_lookup (zebra_if->ipv4_subnets, p)))
-	    {
-	      struct listnode *anode;
-	      struct listnode *next;
-	      struct listnode *first;
-	      struct list *addr_list;
-	      
-	      route_unlock_node (rn);
-	      addr_list = (struct list *) rn->info;
-	      
-	      /* Remove addresses, secondaries first. */
-	      first = listhead (addr_list);
-	      for (anode = first->next; anode || first; anode = next)
-		{
-		  if (!anode)
-		    {
-		      anode = first;
-		      first = NULL;
-		    }
-		  next = anode->next;
-
-		  ifc = listgetdata (anode);
-		  connected_down_ipv4 (ifp, ifc);
-
-		  /* XXX: We have to send notifications here explicitly, because we destroy
-		   * the ifc before receiving the notification about the address being deleted.
-		   */
-		  zebra_interface_address_delete_update (ifp, ifc);
-
-		  UNSET_FLAG (ifc->conf, ZEBRA_IFC_REAL);
-		  UNSET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
-
-		  /* Remove from subnet chain. */
-		  list_delete_node (addr_list, anode);
-		  route_unlock_node (rn);
-		  
-		  /* Remove from interface address list (unconditionally). */
-		  if (!CHECK_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED))
-		    {
-		      listnode_delete (ifp->connected, ifc);
-		      connected_free (ifc);
-                    }
-                  else
-                    last = node;
+static void if_delete_connected(struct interface *ifp)
+{
+	struct connected *ifc;
+	struct prefix *p;
+	struct route_node *rn;
+	struct zebra_if *zebra_if;
+
+	zebra_if = ifp->info;
+
+	if (ifp->connected) {
+		struct listnode *node;
+		struct listnode *last = NULL;
+
+		while ((node = (last ? last->next
+				     : listhead(ifp->connected)))) {
+			ifc = listgetdata(node);
+			p = ifc->address;
+
+			if (p->family == AF_INET
+			    && (rn = route_node_lookup(zebra_if->ipv4_subnets,
+						       p))) {
+				struct listnode *anode;
+				struct listnode *next;
+				struct listnode *first;
+				struct list *addr_list;
+
+				route_unlock_node(rn);
+				addr_list = (struct list *)rn->info;
+
+				/* Remove addresses, secondaries first. */
+				first = listhead(addr_list);
+				for (anode = first->next; anode || first;
+				     anode = next) {
+					if (!anode) {
+						anode = first;
+						first = NULL;
+					}
+					next = anode->next;
+
+					ifc = listgetdata(anode);
+					connected_down_ipv4(ifp, ifc);
+
+					/* XXX: We have to send notifications
+					 * here explicitly, because we destroy
+					 * the ifc before receiving the
+					 * notification about the address being
+					 * deleted.
+					 */
+					zebra_interface_address_delete_update(
+						ifp, ifc);
+
+					UNSET_FLAG(ifc->conf, ZEBRA_IFC_REAL);
+					UNSET_FLAG(ifc->conf, ZEBRA_IFC_QUEUED);
+
+					/* Remove from subnet chain. */
+					list_delete_node(addr_list, anode);
+					route_unlock_node(rn);
+
+					/* Remove from interface address list
+					 * (unconditionally). */
+					if (!CHECK_FLAG(ifc->conf,
+							ZEBRA_IFC_CONFIGURED)) {
+						listnode_delete(ifp->connected,
+								ifc);
+						connected_free(ifc);
+					} else
+						last = node;
+				}
+
+				/* Free chain list and respective route node. */
+				list_delete(addr_list);
+				rn->info = NULL;
+				route_unlock_node(rn);
+			} else if (p->family == AF_INET6) {
+				connected_down_ipv6(ifp, ifc);
+
+				zebra_interface_address_delete_update(ifp, ifc);
+
+				UNSET_FLAG(ifc->conf, ZEBRA_IFC_REAL);
+				UNSET_FLAG(ifc->conf, ZEBRA_IFC_QUEUED);
+
+				if (CHECK_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED))
+					last = node;
+				else {
+					listnode_delete(ifp->connected, ifc);
+					connected_free(ifc);
+				}
+			} else {
+				last = node;
+			}
 		}
-
-	      /* Free chain list and respective route node. */
-	      list_delete (addr_list);
-	      rn->info = NULL;
-	      route_unlock_node (rn);
-	    }
-	  else if (p->family == AF_INET6)
-	    {
-	      connected_down_ipv6 (ifp, ifc);
-
-	      zebra_interface_address_delete_update (ifp, ifc);
-
-	      UNSET_FLAG (ifc->conf, ZEBRA_IFC_REAL);
-	      UNSET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
-
-	      if (CHECK_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED))
-		last = node;
-	      else
-		{
-		  listnode_delete (ifp->connected, ifc);
-		  connected_free (ifc);
-		}
-	    }
-	  else
-	    {
-	      last = node;
-	    }
 	}
-    }
 }
 
 /* Handle an interface delete event */
-void
-if_delete_update (struct interface *ifp)
+void if_delete_update(struct interface *ifp)
 {
-  if (if_is_up(ifp))
-    {
-      zlog_err ("interface %s vrf %u index %d is still up while being deleted.",
-                ifp->name, ifp->vrf_id, ifp->ifindex);
-      return;
-    }
+	if (if_is_up(ifp)) {
+		zlog_err(
+			"interface %s vrf %u index %d is still up while being deleted.",
+			ifp->name, ifp->vrf_id, ifp->ifindex);
+		return;
+	}
 
-  /* Mark interface as inactive */
-  UNSET_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE);
+	/* Mark interface as inactive */
+	UNSET_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE);
 
-  if (IS_ZEBRA_DEBUG_KERNEL)
-    zlog_debug ("interface %s vrf %u index %d is now inactive.",
-                ifp->name, ifp->vrf_id, ifp->ifindex);
+	if (IS_ZEBRA_DEBUG_KERNEL)
+		zlog_debug("interface %s vrf %u index %d is now inactive.",
+			   ifp->name, ifp->vrf_id, ifp->ifindex);
 
-  static_ifindex_update(ifp, false);
+	static_ifindex_update(ifp, false);
 
-  /* Delete connected routes from the kernel. */
-  if_delete_connected (ifp);
+	/* Delete connected routes from the kernel. */
+	if_delete_connected(ifp);
 
-  /* Send out notification on interface delete. */
-  zebra_interface_delete_update (ifp);
+	/* Send out notification on interface delete. */
+	zebra_interface_delete_update(ifp);
 
-  if_unlink_per_ns(ifp);
+	if_unlink_per_ns(ifp);
 
-  /* Update ifindex after distributing the delete message.  This is in
-     case any client needs to have the old value of ifindex available
-     while processing the deletion.  Each client daemon is responsible
-     for setting ifindex to IFINDEX_INTERNAL after processing the
-     interface deletion message. */
-  ifp->ifindex = IFINDEX_INTERNAL;
+	/* Update ifindex after distributing the delete message.  This is in
+	   case any client needs to have the old value of ifindex available
+	   while processing the deletion.  Each client daemon is responsible
+	   for setting ifindex to IFINDEX_INTERNAL after processing the
+	   interface deletion message. */
+	ifp->ifindex = IFINDEX_INTERNAL;
 
-  /* if the ifp is in a vrf, move it to default so vrf can be deleted if desired */
-  if (ifp->vrf_id)
-    if_handle_vrf_change (ifp, VRF_DEFAULT);
+	/* if the ifp is in a vrf, move it to default so vrf can be deleted if
+	 * desired */
+	if (ifp->vrf_id)
+		if_handle_vrf_change(ifp, VRF_DEFAULT);
 }
 
 /* VRF change for an interface */
-void
-if_handle_vrf_change (struct interface *ifp, vrf_id_t vrf_id)
+void if_handle_vrf_change(struct interface *ifp, vrf_id_t vrf_id)
 {
-  vrf_id_t old_vrf_id;
+	vrf_id_t old_vrf_id;
 
-  old_vrf_id = ifp->vrf_id;
+	old_vrf_id = ifp->vrf_id;
 
-  static_ifindex_update(ifp, false);
+	static_ifindex_update(ifp, false);
 
-  /* Uninstall connected routes. */
-  if_uninstall_connected (ifp);
+	/* Uninstall connected routes. */
+	if_uninstall_connected(ifp);
 
-  /* Delete any IPv4 neighbors created to implement RFC 5549 */
-  if_nbr_ipv6ll_to_ipv4ll_neigh_del_all (ifp);
+	/* Delete any IPv4 neighbors created to implement RFC 5549 */
+	if_nbr_ipv6ll_to_ipv4ll_neigh_del_all(ifp);
 
-  /* Delete all neighbor addresses learnt through IPv6 RA */
-  if_down_del_nbr_connected (ifp);
+	/* Delete all neighbor addresses learnt through IPv6 RA */
+	if_down_del_nbr_connected(ifp);
 
-  /* Send out notification on interface VRF change. */
-  /* This is to issue an UPDATE or a DELETE, as appropriate. */
-  zebra_interface_vrf_update_del (ifp, vrf_id);
+	/* Send out notification on interface VRF change. */
+	/* This is to issue an UPDATE or a DELETE, as appropriate. */
+	zebra_interface_vrf_update_del(ifp, vrf_id);
 
-  /* update VRF */
-  if_update (ifp, ifp->name, strlen (ifp->name), vrf_id);
+	/* update VRF */
+	if_update(ifp, ifp->name, strlen(ifp->name), vrf_id);
 
-  /* Send out notification on interface VRF change. */
-  /* This is to issue an ADD, if needed. */
-  zebra_interface_vrf_update_add (ifp, old_vrf_id);
+	/* Send out notification on interface VRF change. */
+	/* This is to issue an ADD, if needed. */
+	zebra_interface_vrf_update_add(ifp, old_vrf_id);
 
-  /* Install connected routes (in new VRF). */
-  if_install_connected (ifp);
+	/* Install connected routes (in new VRF). */
+	if_install_connected(ifp);
 
-  static_ifindex_update(ifp, true);
+	static_ifindex_update(ifp, true);
 
-  /* Due to connected route change, schedule RIB processing for both old
-   * and new VRF.
-   */
-  if (IS_ZEBRA_DEBUG_RIB_DETAILED)
-    zlog_debug ("%u: IF %s VRF change, scheduling RIB processing",
-                ifp->vrf_id, ifp->name);
-  rib_update (old_vrf_id, RIB_UPDATE_IF_CHANGE);
-  rib_update (ifp->vrf_id, RIB_UPDATE_IF_CHANGE);
+	/* Due to connected route change, schedule RIB processing for both old
+	 * and new VRF.
+	 */
+	if (IS_ZEBRA_DEBUG_RIB_DETAILED)
+		zlog_debug("%u: IF %s VRF change, scheduling RIB processing",
+			   ifp->vrf_id, ifp->name);
+	rib_update(old_vrf_id, RIB_UPDATE_IF_CHANGE);
+	rib_update(ifp->vrf_id, RIB_UPDATE_IF_CHANGE);
 }
 
-static void
-ipv6_ll_address_to_mac (struct in6_addr *address, u_char *mac)
+static void ipv6_ll_address_to_mac(struct in6_addr *address, u_char *mac)
 {
-  mac[0] = address->s6_addr[8] ^ 0x02;
-  mac[1] = address->s6_addr[9];
-  mac[2] = address->s6_addr[10];
-  mac[3] = address->s6_addr[13];
-  mac[4] = address->s6_addr[14];
-  mac[5] = address->s6_addr[15];
+	mac[0] = address->s6_addr[8] ^ 0x02;
+	mac[1] = address->s6_addr[9];
+	mac[2] = address->s6_addr[10];
+	mac[3] = address->s6_addr[13];
+	mac[4] = address->s6_addr[14];
+	mac[5] = address->s6_addr[15];
 }
 
-void
-if_nbr_ipv6ll_to_ipv4ll_neigh_update (struct interface *ifp,
-                                      struct in6_addr *address,
-                                      int add)
+void if_nbr_ipv6ll_to_ipv4ll_neigh_update(struct interface *ifp,
+					  struct in6_addr *address, int add)
 {
-  char buf[16] = "169.254.0.1";
-  struct in_addr ipv4_ll;
-  char mac[6];
+	char buf[16] = "169.254.0.1";
+	struct in_addr ipv4_ll;
+	char mac[6];
 
-  inet_pton (AF_INET, buf, &ipv4_ll);
+	inet_pton(AF_INET, buf, &ipv4_ll);
 
-  ipv6_ll_address_to_mac(address, (u_char *)mac);
-  kernel_neigh_update (add, ifp->ifindex, ipv4_ll.s_addr, mac, 6);
+	ipv6_ll_address_to_mac(address, (u_char *)mac);
+	kernel_neigh_update(add, ifp->ifindex, ipv4_ll.s_addr, mac, 6);
 }
 
-static void
-if_nbr_ipv6ll_to_ipv4ll_neigh_add_all (struct interface *ifp)
+static void if_nbr_ipv6ll_to_ipv4ll_neigh_add_all(struct interface *ifp)
 {
-  if (listhead(ifp->nbr_connected))
-    {
-      struct nbr_connected *nbr_connected;
-      struct listnode *node;
+	if (listhead(ifp->nbr_connected)) {
+		struct nbr_connected *nbr_connected;
+		struct listnode *node;
 
-      for (ALL_LIST_ELEMENTS_RO (ifp->nbr_connected, node, nbr_connected))
-        if_nbr_ipv6ll_to_ipv4ll_neigh_update (ifp,
-                                              &nbr_connected->address->u.prefix6,
-                                              1);
-    }
+		for (ALL_LIST_ELEMENTS_RO(ifp->nbr_connected, node,
+					  nbr_connected))
+			if_nbr_ipv6ll_to_ipv4ll_neigh_update(
+				ifp, &nbr_connected->address->u.prefix6, 1);
+	}
 }
 
-void
-if_nbr_ipv6ll_to_ipv4ll_neigh_del_all (struct interface *ifp)
+void if_nbr_ipv6ll_to_ipv4ll_neigh_del_all(struct interface *ifp)
 {
-  if (listhead(ifp->nbr_connected))
-    {
-      struct nbr_connected *nbr_connected;
-      struct listnode *node;
+	if (listhead(ifp->nbr_connected)) {
+		struct nbr_connected *nbr_connected;
+		struct listnode *node;
 
-      for (ALL_LIST_ELEMENTS_RO (ifp->nbr_connected, node, nbr_connected))
-        if_nbr_ipv6ll_to_ipv4ll_neigh_update (ifp,
-                                              &nbr_connected->address->u.prefix6,
-                                              0);
-    }
+		for (ALL_LIST_ELEMENTS_RO(ifp->nbr_connected, node,
+					  nbr_connected))
+			if_nbr_ipv6ll_to_ipv4ll_neigh_update(
+				ifp, &nbr_connected->address->u.prefix6, 0);
+	}
 }
 
-static void
-if_down_del_nbr_connected (struct interface *ifp)
+static void if_down_del_nbr_connected(struct interface *ifp)
 {
-  struct nbr_connected *nbr_connected;
-  struct listnode *node, *nnode;
+	struct nbr_connected *nbr_connected;
+	struct listnode *node, *nnode;
 
-  for (ALL_LIST_ELEMENTS (ifp->nbr_connected, node, nnode, nbr_connected))
-    {
-      listnode_delete (ifp->nbr_connected, nbr_connected);
-      nbr_connected_free (nbr_connected);
-    }
+	for (ALL_LIST_ELEMENTS(ifp->nbr_connected, node, nnode,
+			       nbr_connected)) {
+		listnode_delete(ifp->nbr_connected, nbr_connected);
+		nbr_connected_free(nbr_connected);
+	}
 }
 
 /* Interface is up. */
-void
-if_up (struct interface *ifp)
+void if_up(struct interface *ifp)
 {
-  struct zebra_if *zif;
+	struct zebra_if *zif;
 
-  zif = ifp->info;
-  zif->up_count++;
-  quagga_timestamp (2, zif->up_last, sizeof (zif->up_last));
+	zif = ifp->info;
+	zif->up_count++;
+	quagga_timestamp(2, zif->up_last, sizeof(zif->up_last));
 
-  /* Notify the protocol daemons. */
-  if (ifp->ptm_enable && (ifp->ptm_status == ZEBRA_PTM_STATUS_DOWN)) {
-    zlog_warn("%s: interface %s hasn't passed ptm check\n", __func__,
-	      ifp->name);
-    return;
-  }
-  zebra_interface_up_update (ifp);
+	/* Notify the protocol daemons. */
+	if (ifp->ptm_enable && (ifp->ptm_status == ZEBRA_PTM_STATUS_DOWN)) {
+		zlog_warn("%s: interface %s hasn't passed ptm check\n",
+			  __func__, ifp->name);
+		return;
+	}
+	zebra_interface_up_update(ifp);
 
-  if_nbr_ipv6ll_to_ipv4ll_neigh_add_all (ifp);
+	if_nbr_ipv6ll_to_ipv4ll_neigh_add_all(ifp);
 
-  /* Enable fast tx of RA if enabled && RA interval is not in msecs */
-  if (zif->rtadv.AdvSendAdvertisements &&
-      (zif->rtadv.MaxRtrAdvInterval >= 1000))
-    {
-      zif->rtadv.inFastRexmit = 1;
-      zif->rtadv.NumFastReXmitsRemain = RTADV_NUM_FAST_REXMITS;
-    }
+	/* Enable fast tx of RA if enabled && RA interval is not in msecs */
+	if (zif->rtadv.AdvSendAdvertisements
+	    && (zif->rtadv.MaxRtrAdvInterval >= 1000)) {
+		zif->rtadv.inFastRexmit = 1;
+		zif->rtadv.NumFastReXmitsRemain = RTADV_NUM_FAST_REXMITS;
+	}
 
-  /* Install connected routes to the kernel. */
-  if_install_connected (ifp);
+	/* Install connected routes to the kernel. */
+	if_install_connected(ifp);
 
-  if (IS_ZEBRA_DEBUG_RIB_DETAILED)
-    zlog_debug ("%u: IF %s up, scheduling RIB processing",
-                ifp->vrf_id, ifp->name);
-  rib_update (ifp->vrf_id, RIB_UPDATE_IF_CHANGE);
+	if (IS_ZEBRA_DEBUG_RIB_DETAILED)
+		zlog_debug("%u: IF %s up, scheduling RIB processing",
+			   ifp->vrf_id, ifp->name);
+	rib_update(ifp->vrf_id, RIB_UPDATE_IF_CHANGE);
 }
 
 /* Interface goes down.  We have to manage different behavior of based
    OS. */
-void
-if_down (struct interface *ifp)
+void if_down(struct interface *ifp)
 {
-  struct zebra_if *zif;
+	struct zebra_if *zif;
 
-  zif = ifp->info;
-  zif->down_count++;
-  quagga_timestamp (2, zif->down_last, sizeof (zif->down_last));
+	zif = ifp->info;
+	zif->down_count++;
+	quagga_timestamp(2, zif->down_last, sizeof(zif->down_last));
 
-  /* Notify to the protocol daemons. */
-  zebra_interface_down_update (ifp);
+	/* Notify to the protocol daemons. */
+	zebra_interface_down_update(ifp);
 
-  /* Uninstall connected routes from the kernel. */
-  if_uninstall_connected (ifp);
+	/* Uninstall connected routes from the kernel. */
+	if_uninstall_connected(ifp);
 
-  if (IS_ZEBRA_DEBUG_RIB_DETAILED)
-    zlog_debug ("%u: IF %s down, scheduling RIB processing",
-                ifp->vrf_id, ifp->name);
-  rib_update (ifp->vrf_id, RIB_UPDATE_IF_CHANGE);
+	if (IS_ZEBRA_DEBUG_RIB_DETAILED)
+		zlog_debug("%u: IF %s down, scheduling RIB processing",
+			   ifp->vrf_id, ifp->name);
+	rib_update(ifp->vrf_id, RIB_UPDATE_IF_CHANGE);
 
-  if_nbr_ipv6ll_to_ipv4ll_neigh_del_all (ifp);
+	if_nbr_ipv6ll_to_ipv4ll_neigh_del_all(ifp);
 
-  /* Delete all neighbor addresses learnt through IPv6 RA */
-  if_down_del_nbr_connected (ifp);
+	/* Delete all neighbor addresses learnt through IPv6 RA */
+	if_down_del_nbr_connected(ifp);
 }
 
-void
-if_refresh (struct interface *ifp)
+void if_refresh(struct interface *ifp)
 {
-  if_get_flags (ifp);
+	if_get_flags(ifp);
 }
 
 
 /* Output prefix string to vty. */
-static int
-prefix_vty_out (struct vty *vty, struct prefix *p)
+static int prefix_vty_out(struct vty *vty, struct prefix *p)
 {
-  char str[INET6_ADDRSTRLEN];
+	char str[INET6_ADDRSTRLEN];
 
-  inet_ntop (p->family, &p->u.prefix, str, sizeof (str));
-  vty_out (vty, "%s", str);
-  return strlen (str);
+	inet_ntop(p->family, &p->u.prefix, str, sizeof(str));
+	vty_out(vty, "%s", str);
+	return strlen(str);
 }
 
 /* Dump if address information to vty. */
-static void
-connected_dump_vty (struct vty *vty, struct connected *connected)
+static void connected_dump_vty(struct vty *vty, struct connected *connected)
 {
-  struct prefix *p;
+	struct prefix *p;
 
-  /* Print interface address. */
-  p = connected->address;
-  vty_out (vty, "  %s ", prefix_family_str (p));
-  prefix_vty_out (vty, p);
-  vty_out (vty, "/%d", p->prefixlen);
+	/* Print interface address. */
+	p = connected->address;
+	vty_out(vty, "  %s ", prefix_family_str(p));
+	prefix_vty_out(vty, p);
+	vty_out(vty, "/%d", p->prefixlen);
 
-  /* If there is destination address, print it. */
-  if (connected->destination)
-    {
-      vty_out (vty, (CONNECTED_PEER(connected) ? " peer " : " broadcast "));
-      prefix_vty_out (vty, connected->destination);
-    }
+	/* If there is destination address, print it. */
+	if (connected->destination) {
+		vty_out(vty,
+			(CONNECTED_PEER(connected) ? " peer " : " broadcast "));
+		prefix_vty_out(vty, connected->destination);
+	}
 
-  if (CHECK_FLAG (connected->flags, ZEBRA_IFA_SECONDARY))
-    vty_out (vty, " secondary");
+	if (CHECK_FLAG(connected->flags, ZEBRA_IFA_SECONDARY))
+		vty_out(vty, " secondary");
 
-  if (CHECK_FLAG (connected->flags, ZEBRA_IFA_UNNUMBERED))
-    vty_out (vty, " unnumbered");
+	if (CHECK_FLAG(connected->flags, ZEBRA_IFA_UNNUMBERED))
+		vty_out(vty, " unnumbered");
 
-  if (connected->label)
-    vty_out (vty, " %s", connected->label);
+	if (connected->label)
+		vty_out(vty, " %s", connected->label);
 
-  vty_out (vty, "%s", VTY_NEWLINE);
+	vty_out(vty, "%s", VTY_NEWLINE);
 }
 
 /* Dump interface neighbor address information to vty. */
-static void
-nbr_connected_dump_vty (struct vty *vty, struct nbr_connected *connected)
+static void nbr_connected_dump_vty(struct vty *vty,
+				   struct nbr_connected *connected)
 {
-  struct prefix *p;
+	struct prefix *p;
 
-  /* Print interface address. */
-  p = connected->address;
-  vty_out (vty, "  %s ", prefix_family_str (p));
-  prefix_vty_out (vty, p);
-  vty_out (vty, "/%d", p->prefixlen);
+	/* Print interface address. */
+	p = connected->address;
+	vty_out(vty, "  %s ", prefix_family_str(p));
+	prefix_vty_out(vty, p);
+	vty_out(vty, "/%d", p->prefixlen);
 
-  vty_out (vty, "%s", VTY_NEWLINE);
+	vty_out(vty, "%s", VTY_NEWLINE);
 }
 
-#if defined (HAVE_RTADV)
+#if defined(HAVE_RTADV)
 /* Dump interface ND information to vty. */
-static void
-nd_dump_vty (struct vty *vty, struct interface *ifp)
-{
-  struct zebra_if *zif;
-  struct rtadvconf *rtadv;
-  int interval;
-
-  zif = (struct zebra_if *) ifp->info;
-  rtadv = &zif->rtadv;
-
-  if (rtadv->AdvSendAdvertisements)
-    {
-      vty_out (vty, "  ND advertised reachable time is %d milliseconds%s",
-	       rtadv->AdvReachableTime, VTY_NEWLINE);
-      vty_out (vty, "  ND advertised retransmit interval is %d milliseconds%s",
-	       rtadv->AdvRetransTimer, VTY_NEWLINE);
-      vty_out (vty, "  ND router advertisements sent: %d rcvd: %d%s",
-	       zif->ra_sent, zif->ra_rcvd, VTY_NEWLINE);
-      interval = rtadv->MaxRtrAdvInterval;
-      if (interval % 1000)
-        vty_out (vty, "  ND router advertisements are sent every "
-			"%d milliseconds%s", interval,
-		 VTY_NEWLINE);
-      else
-        vty_out (vty, "  ND router advertisements are sent every "
-			"%d seconds%s", interval / 1000,
-		 VTY_NEWLINE);
-      if (rtadv->AdvDefaultLifetime != -1)
-	vty_out (vty, "  ND router advertisements live for %d seconds%s",
-		 rtadv->AdvDefaultLifetime, VTY_NEWLINE);
-      else
-	vty_out (vty, "  ND router advertisements lifetime tracks ra-interval%s",
-		 VTY_NEWLINE);
-      vty_out (vty, "  ND router advertisement default router preference is "
-			"%s%s", rtadv_pref_strs[rtadv->DefaultPreference],
-		 VTY_NEWLINE);
-      if (rtadv->AdvManagedFlag)
-	vty_out (vty, "  Hosts use DHCP to obtain routable addresses.%s",
-		 VTY_NEWLINE);
-      else
-	vty_out (vty, "  Hosts use stateless autoconfig for addresses.%s",
-		 VTY_NEWLINE);
-      if (rtadv->AdvHomeAgentFlag)
-      {
-      	vty_out (vty, "  ND router advertisements with "
+static void nd_dump_vty(struct vty *vty, struct interface *ifp)
+{
+	struct zebra_if *zif;
+	struct rtadvconf *rtadv;
+	int interval;
+
+	zif = (struct zebra_if *)ifp->info;
+	rtadv = &zif->rtadv;
+
+	if (rtadv->AdvSendAdvertisements) {
+		vty_out(vty,
+			"  ND advertised reachable time is %d milliseconds%s",
+			rtadv->AdvReachableTime, VTY_NEWLINE);
+		vty_out(vty,
+			"  ND advertised retransmit interval is %d milliseconds%s",
+			rtadv->AdvRetransTimer, VTY_NEWLINE);
+		vty_out(vty, "  ND router advertisements sent: %d rcvd: %d%s",
+			zif->ra_sent, zif->ra_rcvd, VTY_NEWLINE);
+		interval = rtadv->MaxRtrAdvInterval;
+		if (interval % 1000)
+			vty_out(vty,
+				"  ND router advertisements are sent every "
+				"%d milliseconds%s",
+				interval, VTY_NEWLINE);
+		else
+			vty_out(vty,
+				"  ND router advertisements are sent every "
+				"%d seconds%s",
+				interval / 1000, VTY_NEWLINE);
+		if (rtadv->AdvDefaultLifetime != -1)
+			vty_out(vty,
+				"  ND router advertisements live for %d seconds%s",
+				rtadv->AdvDefaultLifetime, VTY_NEWLINE);
+		else
+			vty_out(vty,
+				"  ND router advertisements lifetime tracks ra-interval%s",
+				VTY_NEWLINE);
+		vty_out(vty,
+			"  ND router advertisement default router preference is "
+			"%s%s",
+			rtadv_pref_strs[rtadv->DefaultPreference], VTY_NEWLINE);
+		if (rtadv->AdvManagedFlag)
+			vty_out(vty,
+				"  Hosts use DHCP to obtain routable addresses.%s",
+				VTY_NEWLINE);
+		else
+			vty_out(vty,
+				"  Hosts use stateless autoconfig for addresses.%s",
+				VTY_NEWLINE);
+		if (rtadv->AdvHomeAgentFlag) {
+			vty_out(vty,
+				"  ND router advertisements with "
 				"Home Agent flag bit set.%s",
-		 VTY_NEWLINE);
-	if (rtadv->HomeAgentLifetime != -1)
-	  vty_out (vty, "  Home Agent lifetime is %u seconds%s",
-	           rtadv->HomeAgentLifetime, VTY_NEWLINE);
-	else
-	  vty_out (vty, "  Home Agent lifetime tracks ra-lifetime%s",
-	           VTY_NEWLINE);
-	vty_out (vty, "  Home Agent preference is %u%s",
-	         rtadv->HomeAgentPreference, VTY_NEWLINE);
-      }
-      if (rtadv->AdvIntervalOption)
-      	vty_out (vty, "  ND router advertisements with Adv. Interval option.%s",
-		 VTY_NEWLINE);
-    }
+				VTY_NEWLINE);
+			if (rtadv->HomeAgentLifetime != -1)
+				vty_out(vty,
+					"  Home Agent lifetime is %u seconds%s",
+					rtadv->HomeAgentLifetime, VTY_NEWLINE);
+			else
+				vty_out(vty,
+					"  Home Agent lifetime tracks ra-lifetime%s",
+					VTY_NEWLINE);
+			vty_out(vty, "  Home Agent preference is %u%s",
+				rtadv->HomeAgentPreference, VTY_NEWLINE);
+		}
+		if (rtadv->AdvIntervalOption)
+			vty_out(vty,
+				"  ND router advertisements with Adv. Interval option.%s",
+				VTY_NEWLINE);
+	}
 }
 #endif /* HAVE_RTADV */
 
 /* Interface's information print out to vty interface. */
-static void
-if_dump_vty (struct vty *vty, struct interface *ifp)
-{
-  struct connected *connected;
-  struct nbr_connected *nbr_connected;
-  struct listnode *node;
-  struct route_node *rn;
-  struct zebra_if *zebra_if;
-  struct vrf *vrf;
-
-  zebra_if = ifp->info;
-
-  vty_out (vty, "Interface %s is ", ifp->name);
-  if (if_is_up(ifp)) {
-    vty_out (vty, "up, line protocol ");
-    
-    if (CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION)) {
-      if (if_is_running(ifp))
-       vty_out (vty, "is up%s", VTY_NEWLINE);
-      else
-	vty_out (vty, "is down%s", VTY_NEWLINE);
-    } else {
-      vty_out (vty, "detection is disabled%s", VTY_NEWLINE);
-    }
-  } else {
-    vty_out (vty, "down%s", VTY_NEWLINE);
-  }
-
-  vty_out (vty, "  Link ups:   %5u    last: %s%s", zebra_if->up_count,
-           zebra_if->up_last[0] ? zebra_if->up_last : "(never)", VTY_NEWLINE);
-  vty_out (vty, "  Link downs: %5u    last: %s%s", zebra_if->down_count,
-           zebra_if->down_last[0] ? zebra_if->down_last : "(never)", VTY_NEWLINE);
-
-  zebra_ptm_show_status(vty, ifp);
-
-  vrf = vrf_lookup_by_id (ifp->vrf_id);
-  vty_out (vty, "  vrf: %s%s", vrf->name, VTY_NEWLINE);
-
-  if (ifp->desc)
-    vty_out (vty, "  Description: %s%s", ifp->desc,
-	     VTY_NEWLINE);
-  if (ifp->ifindex == IFINDEX_INTERNAL)
-    {
-      vty_out(vty, "  pseudo interface%s", VTY_NEWLINE);
-      return;
-    }
-  else if (! CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE))
-    {
-      vty_out(vty, "  index %d inactive interface%s", 
-	      ifp->ifindex, 
-	      VTY_NEWLINE);
-      return;
-    }
-
-  vty_out (vty, "  index %d metric %d mtu %d speed %u ",
-	   ifp->ifindex, ifp->metric, ifp->mtu, ifp->speed);
-  if (ifp->mtu6 != ifp->mtu)
-    vty_out (vty, "mtu6 %d ", ifp->mtu6);
-  vty_out (vty, "%s  flags: %s%s", VTY_NEWLINE,
-           if_flag_dump (ifp->flags), VTY_NEWLINE);
-  
-  /* Hardware address. */
-  vty_out (vty, "  Type: %s%s", if_link_type_str (ifp->ll_type), VTY_NEWLINE);
-  if (ifp->hw_addr_len != 0)
-    {
-      int i;
-
-      vty_out (vty, "  HWaddr: ");
-      for (i = 0; i < ifp->hw_addr_len; i++)
-	vty_out (vty, "%s%02x", i == 0 ? "" : ":", ifp->hw_addr[i]);
-      vty_out (vty, "%s", VTY_NEWLINE);
-    }
-  
-  /* Bandwidth in Mbps */
-  if (ifp->bandwidth != 0)
-    {
-      vty_out(vty, "  bandwidth %u Mbps", ifp->bandwidth);
-      vty_out(vty, "%s", VTY_NEWLINE);
-    }
-
-  for (rn = route_top (zebra_if->ipv4_subnets); rn; rn = route_next (rn))
-    {
-      if (! rn->info)
-	continue;
-
-      for (ALL_LIST_ELEMENTS_RO ((struct list *)rn->info, node, connected))
-        connected_dump_vty (vty, connected);
-    }
-
-  for (ALL_LIST_ELEMENTS_RO (ifp->connected, node, connected))
-    {
-      if (CHECK_FLAG (connected->conf, ZEBRA_IFC_REAL) &&
-	  (connected->address->family == AF_INET6))
-	connected_dump_vty (vty, connected);
-    }
-
-  if (HAS_LINK_PARAMS(ifp))
-    {
-      int i;
-      struct if_link_params *iflp = ifp->link_params;
-      vty_out(vty, "  Traffic Engineering Link Parameters:%s", VTY_NEWLINE);
-      if (IS_PARAM_SET(iflp, LP_TE_METRIC))
-        vty_out(vty, "    TE metric %u%s",iflp->te_metric, VTY_NEWLINE);
-      if (IS_PARAM_SET(iflp, LP_MAX_BW))
-        vty_out(vty, "    Maximum Bandwidth %g (Byte/s)%s", iflp->max_bw, VTY_NEWLINE);
-      if (IS_PARAM_SET(iflp, LP_MAX_RSV_BW))
-        vty_out(vty, "    Maximum Reservable Bandwidth %g (Byte/s)%s", iflp->max_rsv_bw, VTY_NEWLINE);
-      if (IS_PARAM_SET(iflp, LP_UNRSV_BW)) {
-        vty_out(vty, "    Unreserved Bandwidth per Class Type in Byte/s:%s", VTY_NEWLINE);
-        for (i = 0; i < MAX_CLASS_TYPE; i+=2)
-          vty_out(vty, "      [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)%s",
-                  i, iflp->unrsv_bw[i], i+1, iflp->unrsv_bw[i+1], VTY_NEWLINE);
-      }
-
-      if (IS_PARAM_SET(iflp, LP_ADM_GRP))
-        vty_out(vty, "    Administrative Group:%u%s", iflp->admin_grp, VTY_NEWLINE);
-      if (IS_PARAM_SET(iflp, LP_DELAY))
-        {
-          vty_out(vty, "    Link Delay Average: %u (micro-sec.)", iflp->av_delay);
-          if (IS_PARAM_SET(iflp, LP_MM_DELAY))
-            {
-              vty_out(vty, " Min:  %u (micro-sec.)", iflp->min_delay);
-              vty_out(vty, " Max:  %u (micro-sec.)", iflp->max_delay);
-            }
-          vty_out(vty, "%s", VTY_NEWLINE);
-        }
-      if (IS_PARAM_SET(iflp, LP_DELAY_VAR))
-        vty_out(vty, "    Link Delay Variation %u (micro-sec.)%s", iflp->delay_var, VTY_NEWLINE);
-      if (IS_PARAM_SET(iflp, LP_PKT_LOSS))
-        vty_out(vty, "    Link Packet Loss %g (in %%)%s", iflp->pkt_loss, VTY_NEWLINE);
-      if (IS_PARAM_SET(iflp, LP_AVA_BW))
-        vty_out(vty, "    Available Bandwidth %g (Byte/s)%s", iflp->ava_bw, VTY_NEWLINE);
-      if (IS_PARAM_SET(iflp, LP_RES_BW))
-        vty_out(vty, "    Residual Bandwidth %g (Byte/s)%s", iflp->res_bw, VTY_NEWLINE);
-      if (IS_PARAM_SET(iflp, LP_USE_BW))
-        vty_out(vty, "    Utilized Bandwidth %g (Byte/s)%s", iflp->use_bw, VTY_NEWLINE);
-      if (IS_PARAM_SET(iflp, LP_RMT_AS))
-        vty_out(vty, "    Neighbor ASBR IP: %s AS: %u %s", inet_ntoa(iflp->rmt_ip), iflp->rmt_as, VTY_NEWLINE);
-    }
-
- #ifdef RTADV
-   nd_dump_vty (vty, ifp);
- #endif /* RTADV */
-#if defined (HAVE_RTADV)
-  nd_dump_vty (vty, ifp);
+static void if_dump_vty(struct vty *vty, struct interface *ifp)
+{
+	struct connected *connected;
+	struct nbr_connected *nbr_connected;
+	struct listnode *node;
+	struct route_node *rn;
+	struct zebra_if *zebra_if;
+	struct vrf *vrf;
+
+	zebra_if = ifp->info;
+
+	vty_out(vty, "Interface %s is ", ifp->name);
+	if (if_is_up(ifp)) {
+		vty_out(vty, "up, line protocol ");
+
+		if (CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION)) {
+			if (if_is_running(ifp))
+				vty_out(vty, "is up%s", VTY_NEWLINE);
+			else
+				vty_out(vty, "is down%s", VTY_NEWLINE);
+		} else {
+			vty_out(vty, "detection is disabled%s", VTY_NEWLINE);
+		}
+	} else {
+		vty_out(vty, "down%s", VTY_NEWLINE);
+	}
+
+	vty_out(vty, "  Link ups:   %5u    last: %s%s", zebra_if->up_count,
+		zebra_if->up_last[0] ? zebra_if->up_last : "(never)",
+		VTY_NEWLINE);
+	vty_out(vty, "  Link downs: %5u    last: %s%s", zebra_if->down_count,
+		zebra_if->down_last[0] ? zebra_if->down_last : "(never)",
+		VTY_NEWLINE);
+
+	zebra_ptm_show_status(vty, ifp);
+
+	vrf = vrf_lookup_by_id(ifp->vrf_id);
+	vty_out(vty, "  vrf: %s%s", vrf->name, VTY_NEWLINE);
+
+	if (ifp->desc)
+		vty_out(vty, "  Description: %s%s", ifp->desc, VTY_NEWLINE);
+	if (ifp->ifindex == IFINDEX_INTERNAL) {
+		vty_out(vty, "  pseudo interface%s", VTY_NEWLINE);
+		return;
+	} else if (!CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE)) {
+		vty_out(vty, "  index %d inactive interface%s", ifp->ifindex,
+			VTY_NEWLINE);
+		return;
+	}
+
+	vty_out(vty, "  index %d metric %d mtu %d speed %u ", ifp->ifindex,
+		ifp->metric, ifp->mtu, ifp->speed);
+	if (ifp->mtu6 != ifp->mtu)
+		vty_out(vty, "mtu6 %d ", ifp->mtu6);
+	vty_out(vty, "%s  flags: %s%s", VTY_NEWLINE, if_flag_dump(ifp->flags),
+		VTY_NEWLINE);
+
+	/* Hardware address. */
+	vty_out(vty, "  Type: %s%s", if_link_type_str(ifp->ll_type),
+		VTY_NEWLINE);
+	if (ifp->hw_addr_len != 0) {
+		int i;
+
+		vty_out(vty, "  HWaddr: ");
+		for (i = 0; i < ifp->hw_addr_len; i++)
+			vty_out(vty, "%s%02x", i == 0 ? "" : ":",
+				ifp->hw_addr[i]);
+		vty_out(vty, "%s", VTY_NEWLINE);
+	}
+
+	/* Bandwidth in Mbps */
+	if (ifp->bandwidth != 0) {
+		vty_out(vty, "  bandwidth %u Mbps", ifp->bandwidth);
+		vty_out(vty, "%s", VTY_NEWLINE);
+	}
+
+	for (rn = route_top(zebra_if->ipv4_subnets); rn; rn = route_next(rn)) {
+		if (!rn->info)
+			continue;
+
+		for (ALL_LIST_ELEMENTS_RO((struct list *)rn->info, node,
+					  connected))
+			connected_dump_vty(vty, connected);
+	}
+
+	for (ALL_LIST_ELEMENTS_RO(ifp->connected, node, connected)) {
+		if (CHECK_FLAG(connected->conf, ZEBRA_IFC_REAL)
+		    && (connected->address->family == AF_INET6))
+			connected_dump_vty(vty, connected);
+	}
+
+	if (HAS_LINK_PARAMS(ifp)) {
+		int i;
+		struct if_link_params *iflp = ifp->link_params;
+		vty_out(vty, "  Traffic Engineering Link Parameters:%s",
+			VTY_NEWLINE);
+		if (IS_PARAM_SET(iflp, LP_TE_METRIC))
+			vty_out(vty, "    TE metric %u%s", iflp->te_metric,
+				VTY_NEWLINE);
+		if (IS_PARAM_SET(iflp, LP_MAX_BW))
+			vty_out(vty, "    Maximum Bandwidth %g (Byte/s)%s",
+				iflp->max_bw, VTY_NEWLINE);
+		if (IS_PARAM_SET(iflp, LP_MAX_RSV_BW))
+			vty_out(vty,
+				"    Maximum Reservable Bandwidth %g (Byte/s)%s",
+				iflp->max_rsv_bw, VTY_NEWLINE);
+		if (IS_PARAM_SET(iflp, LP_UNRSV_BW)) {
+			vty_out(vty,
+				"    Unreserved Bandwidth per Class Type in Byte/s:%s",
+				VTY_NEWLINE);
+			for (i = 0; i < MAX_CLASS_TYPE; i += 2)
+				vty_out(vty,
+					"      [%d]: %g (Bytes/sec),\t[%d]: %g (Bytes/sec)%s",
+					i, iflp->unrsv_bw[i], i + 1,
+					iflp->unrsv_bw[i + 1], VTY_NEWLINE);
+		}
+
+		if (IS_PARAM_SET(iflp, LP_ADM_GRP))
+			vty_out(vty, "    Administrative Group:%u%s",
+				iflp->admin_grp, VTY_NEWLINE);
+		if (IS_PARAM_SET(iflp, LP_DELAY)) {
+			vty_out(vty, "    Link Delay Average: %u (micro-sec.)",
+				iflp->av_delay);
+			if (IS_PARAM_SET(iflp, LP_MM_DELAY)) {
+				vty_out(vty, " Min:  %u (micro-sec.)",
+					iflp->min_delay);
+				vty_out(vty, " Max:  %u (micro-sec.)",
+					iflp->max_delay);
+			}
+			vty_out(vty, "%s", VTY_NEWLINE);
+		}
+		if (IS_PARAM_SET(iflp, LP_DELAY_VAR))
+			vty_out(vty,
+				"    Link Delay Variation %u (micro-sec.)%s",
+				iflp->delay_var, VTY_NEWLINE);
+		if (IS_PARAM_SET(iflp, LP_PKT_LOSS))
+			vty_out(vty, "    Link Packet Loss %g (in %%)%s",
+				iflp->pkt_loss, VTY_NEWLINE);
+		if (IS_PARAM_SET(iflp, LP_AVA_BW))
+			vty_out(vty, "    Available Bandwidth %g (Byte/s)%s",
+				iflp->ava_bw, VTY_NEWLINE);
+		if (IS_PARAM_SET(iflp, LP_RES_BW))
+			vty_out(vty, "    Residual Bandwidth %g (Byte/s)%s",
+				iflp->res_bw, VTY_NEWLINE);
+		if (IS_PARAM_SET(iflp, LP_USE_BW))
+			vty_out(vty, "    Utilized Bandwidth %g (Byte/s)%s",
+				iflp->use_bw, VTY_NEWLINE);
+		if (IS_PARAM_SET(iflp, LP_RMT_AS))
+			vty_out(vty, "    Neighbor ASBR IP: %s AS: %u %s",
+				inet_ntoa(iflp->rmt_ip), iflp->rmt_as,
+				VTY_NEWLINE);
+	}
+
+#ifdef RTADV
+	nd_dump_vty(vty, ifp);
+#endif /* RTADV */
+#if defined(HAVE_RTADV)
+	nd_dump_vty(vty, ifp);
 #endif /* HAVE_RTADV */
-  if (listhead(ifp->nbr_connected))
-    vty_out (vty, "  Neighbor address(s):%s", VTY_NEWLINE);
-  for (ALL_LIST_ELEMENTS_RO (ifp->nbr_connected, node, nbr_connected))
-    nbr_connected_dump_vty (vty, nbr_connected);
+	if (listhead(ifp->nbr_connected))
+		vty_out(vty, "  Neighbor address(s):%s", VTY_NEWLINE);
+	for (ALL_LIST_ELEMENTS_RO(ifp->nbr_connected, node, nbr_connected))
+		nbr_connected_dump_vty(vty, nbr_connected);
 
 #ifdef HAVE_PROC_NET_DEV
-  /* Statistics print out using proc file system. */
-  vty_out (vty, "    %lu input packets (%lu multicast), %lu bytes, "
-	   "%lu dropped%s",
-	   ifp->stats.rx_packets, ifp->stats.rx_multicast,
-	   ifp->stats.rx_bytes, ifp->stats.rx_dropped, VTY_NEWLINE);
-
-  vty_out (vty, "    %lu input errors, %lu length, %lu overrun,"
-	   " %lu CRC, %lu frame%s",
-	   ifp->stats.rx_errors, ifp->stats.rx_length_errors,
-	   ifp->stats.rx_over_errors, ifp->stats.rx_crc_errors,
-	   ifp->stats.rx_frame_errors, VTY_NEWLINE);
-
-  vty_out (vty, "    %lu fifo, %lu missed%s", ifp->stats.rx_fifo_errors,
-	   ifp->stats.rx_missed_errors, VTY_NEWLINE);
-
-  vty_out (vty, "    %lu output packets, %lu bytes, %lu dropped%s",
-	   ifp->stats.tx_packets, ifp->stats.tx_bytes,
-	   ifp->stats.tx_dropped, VTY_NEWLINE);
-
-  vty_out (vty, "    %lu output errors, %lu aborted, %lu carrier,"
-	   " %lu fifo, %lu heartbeat%s",
-	   ifp->stats.tx_errors, ifp->stats.tx_aborted_errors,
-	   ifp->stats.tx_carrier_errors, ifp->stats.tx_fifo_errors,
-	   ifp->stats.tx_heartbeat_errors, VTY_NEWLINE);
-
-  vty_out (vty, "    %lu window, %lu collisions%s",
-	   ifp->stats.tx_window_errors, ifp->stats.collisions, VTY_NEWLINE);
+	/* Statistics print out using proc file system. */
+	vty_out(vty,
+		"    %lu input packets (%lu multicast), %lu bytes, "
+		"%lu dropped%s",
+		ifp->stats.rx_packets, ifp->stats.rx_multicast,
+		ifp->stats.rx_bytes, ifp->stats.rx_dropped, VTY_NEWLINE);
+
+	vty_out(vty,
+		"    %lu input errors, %lu length, %lu overrun,"
+		" %lu CRC, %lu frame%s",
+		ifp->stats.rx_errors, ifp->stats.rx_length_errors,
+		ifp->stats.rx_over_errors, ifp->stats.rx_crc_errors,
+		ifp->stats.rx_frame_errors, VTY_NEWLINE);
+
+	vty_out(vty, "    %lu fifo, %lu missed%s", ifp->stats.rx_fifo_errors,
+		ifp->stats.rx_missed_errors, VTY_NEWLINE);
+
+	vty_out(vty, "    %lu output packets, %lu bytes, %lu dropped%s",
+		ifp->stats.tx_packets, ifp->stats.tx_bytes,
+		ifp->stats.tx_dropped, VTY_NEWLINE);
+
+	vty_out(vty,
+		"    %lu output errors, %lu aborted, %lu carrier,"
+		" %lu fifo, %lu heartbeat%s",
+		ifp->stats.tx_errors, ifp->stats.tx_aborted_errors,
+		ifp->stats.tx_carrier_errors, ifp->stats.tx_fifo_errors,
+		ifp->stats.tx_heartbeat_errors, VTY_NEWLINE);
+
+	vty_out(vty, "    %lu window, %lu collisions%s",
+		ifp->stats.tx_window_errors, ifp->stats.collisions,
+		VTY_NEWLINE);
 #endif /* HAVE_PROC_NET_DEV */
 
 #ifdef HAVE_NET_RT_IFLIST
-#if defined (__bsdi__) || defined (__NetBSD__)
-  /* Statistics print out using sysctl (). */
-  vty_out (vty, "    input packets %llu, bytes %llu, dropped %llu,"
-           " multicast packets %llu%s",
-           (unsigned long long)ifp->stats.ifi_ipackets,
-           (unsigned long long)ifp->stats.ifi_ibytes,
-           (unsigned long long)ifp->stats.ifi_iqdrops,
-           (unsigned long long)ifp->stats.ifi_imcasts,
-           VTY_NEWLINE);
-
-  vty_out (vty, "    input errors %llu%s",
-           (unsigned long long)ifp->stats.ifi_ierrors, VTY_NEWLINE);
-
-  vty_out (vty, "    output packets %llu, bytes %llu,"
-           " multicast packets %llu%s",
-           (unsigned long long)ifp->stats.ifi_opackets,
-           (unsigned long long)ifp->stats.ifi_obytes,
-           (unsigned long long)ifp->stats.ifi_omcasts,
-           VTY_NEWLINE);
-
-  vty_out (vty, "    output errors %llu%s",
-           (unsigned long long)ifp->stats.ifi_oerrors, VTY_NEWLINE);
-
-  vty_out (vty, "    collisions %llu%s",
-           (unsigned long long)ifp->stats.ifi_collisions, VTY_NEWLINE);
+#if defined(__bsdi__) || defined(__NetBSD__)
+	/* Statistics print out using sysctl (). */
+	vty_out(vty,
+		"    input packets %llu, bytes %llu, dropped %llu,"
+		" multicast packets %llu%s",
+		(unsigned long long)ifp->stats.ifi_ipackets,
+		(unsigned long long)ifp->stats.ifi_ibytes,
+		(unsigned long long)ifp->stats.ifi_iqdrops,
+		(unsigned long long)ifp->stats.ifi_imcasts, VTY_NEWLINE);
+
+	vty_out(vty, "    input errors %llu%s",
+		(unsigned long long)ifp->stats.ifi_ierrors, VTY_NEWLINE);
+
+	vty_out(vty,
+		"    output packets %llu, bytes %llu,"
+		" multicast packets %llu%s",
+		(unsigned long long)ifp->stats.ifi_opackets,
+		(unsigned long long)ifp->stats.ifi_obytes,
+		(unsigned long long)ifp->stats.ifi_omcasts, VTY_NEWLINE);
+
+	vty_out(vty, "    output errors %llu%s",
+		(unsigned long long)ifp->stats.ifi_oerrors, VTY_NEWLINE);
+
+	vty_out(vty, "    collisions %llu%s",
+		(unsigned long long)ifp->stats.ifi_collisions, VTY_NEWLINE);
 #else
-  /* Statistics print out using sysctl (). */
-  vty_out (vty, "    input packets %lu, bytes %lu, dropped %lu,"
-	   " multicast packets %lu%s",
-	   ifp->stats.ifi_ipackets, ifp->stats.ifi_ibytes,
-	   ifp->stats.ifi_iqdrops, ifp->stats.ifi_imcasts,
-	   VTY_NEWLINE);
-
-  vty_out (vty, "    input errors %lu%s",
-	   ifp->stats.ifi_ierrors, VTY_NEWLINE);
-
-  vty_out (vty, "    output packets %lu, bytes %lu, multicast packets %lu%s",
-	   ifp->stats.ifi_opackets, ifp->stats.ifi_obytes,
-	   ifp->stats.ifi_omcasts, VTY_NEWLINE);
-
-  vty_out (vty, "    output errors %lu%s",
-	   ifp->stats.ifi_oerrors, VTY_NEWLINE);
-
-  vty_out (vty, "    collisions %lu%s",
-	   ifp->stats.ifi_collisions, VTY_NEWLINE);
+	/* Statistics print out using sysctl (). */
+	vty_out(vty,
+		"    input packets %lu, bytes %lu, dropped %lu,"
+		" multicast packets %lu%s",
+		ifp->stats.ifi_ipackets, ifp->stats.ifi_ibytes,
+		ifp->stats.ifi_iqdrops, ifp->stats.ifi_imcasts, VTY_NEWLINE);
+
+	vty_out(vty, "    input errors %lu%s", ifp->stats.ifi_ierrors,
+		VTY_NEWLINE);
+
+	vty_out(vty,
+		"    output packets %lu, bytes %lu, multicast packets %lu%s",
+		ifp->stats.ifi_opackets, ifp->stats.ifi_obytes,
+		ifp->stats.ifi_omcasts, VTY_NEWLINE);
+
+	vty_out(vty, "    output errors %lu%s", ifp->stats.ifi_oerrors,
+		VTY_NEWLINE);
+
+	vty_out(vty, "    collisions %lu%s", ifp->stats.ifi_collisions,
+		VTY_NEWLINE);
 #endif /* __bsdi__ || __NetBSD__ */
 #endif /* HAVE_NET_RT_IFLIST */
 }
 
-static void
-interface_update_stats (void)
+static void interface_update_stats(void)
 {
 #ifdef HAVE_PROC_NET_DEV
-  /* If system has interface statistics via proc file system, update
-     statistics. */
-  ifstat_update_proc ();
+	/* If system has interface statistics via proc file system, update
+	   statistics. */
+	ifstat_update_proc();
 #endif /* HAVE_PROC_NET_DEV */
 #ifdef HAVE_NET_RT_IFLIST
-  ifstat_update_sysctl ();
+	ifstat_update_sysctl();
 #endif /* HAVE_NET_RT_IFLIST */
 }
 
-struct cmd_node interface_node =
-{
-  INTERFACE_NODE,
-  "%s(config-if)# ",
-  1
-};
+struct cmd_node interface_node = {INTERFACE_NODE, "%s(config-if)# ", 1};
 
 /* Show all interfaces to vty. */
 DEFUN (show_interface,
@@ -1285,20 +1271,20 @@ DEFUN (show_interface,
        "Interface status and configuration\n"
        VRF_CMD_HELP_STR)
 {
-  struct listnode *node;
-  struct interface *ifp;
-  vrf_id_t vrf_id = VRF_DEFAULT;
+	struct listnode *node;
+	struct interface *ifp;
+	vrf_id_t vrf_id = VRF_DEFAULT;
 
-  interface_update_stats ();
+	interface_update_stats();
 
-  if (argc > 2)
-    VRF_GET_ID (vrf_id, argv[3]->arg);
+	if (argc > 2)
+		VRF_GET_ID(vrf_id, argv[3]->arg);
 
-  /* All interface print. */
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (vrf_id), node, ifp))
-    if_dump_vty (vty, ifp);
+	/* All interface print. */
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(vrf_id), node, ifp))
+		if_dump_vty(vty, ifp);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 
@@ -1310,18 +1296,18 @@ DEFUN (show_interface_vrf_all,
        "Interface status and configuration\n"
        VRF_ALL_CMD_HELP_STR)
 {
-  struct vrf *vrf;
-  struct listnode *node;
-  struct interface *ifp;
+	struct vrf *vrf;
+	struct listnode *node;
+	struct interface *ifp;
 
-  interface_update_stats ();
+	interface_update_stats();
 
-  /* All interface print. */
-  RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
-    for (ALL_LIST_ELEMENTS_RO (vrf->iflist, node, ifp))
-      if_dump_vty (vty, ifp);
+	/* All interface print. */
+	RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
+	for (ALL_LIST_ELEMENTS_RO(vrf->iflist, node, ifp))
+		if_dump_vty(vty, ifp);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 /* Show specified interface to vty. */
@@ -1334,26 +1320,25 @@ DEFUN (show_interface_name_vrf,
        "Interface name\n"
        VRF_CMD_HELP_STR)
 {
-  int idx_ifname = 2;
-  int idx_name = 4;
-  struct interface *ifp;
-  vrf_id_t vrf_id = VRF_DEFAULT;
+	int idx_ifname = 2;
+	int idx_name = 4;
+	struct interface *ifp;
+	vrf_id_t vrf_id = VRF_DEFAULT;
 
-  interface_update_stats ();
+	interface_update_stats();
 
-  VRF_GET_ID (vrf_id, argv[idx_name]->arg);
+	VRF_GET_ID(vrf_id, argv[idx_name]->arg);
 
-  /* Specified interface print. */
-  ifp = if_lookup_by_name (argv[idx_ifname]->arg, vrf_id);
-  if (ifp == NULL)
-    {
-      vty_out (vty, "%% Can't find interface %s%s", argv[idx_ifname]->arg,
-               VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-  if_dump_vty (vty, ifp);
+	/* Specified interface print. */
+	ifp = if_lookup_by_name(argv[idx_ifname]->arg, vrf_id);
+	if (ifp == NULL) {
+		vty_out(vty, "%% Can't find interface %s%s",
+			argv[idx_ifname]->arg, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+	if_dump_vty(vty, ifp);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 /* Show specified interface to vty. */
@@ -1365,73 +1350,66 @@ DEFUN (show_interface_name_vrf_all,
        "Interface name\n"
        VRF_ALL_CMD_HELP_STR)
 {
-  int idx_ifname = 2;
-  struct vrf *vrf;
-  struct interface *ifp;
-  int found = 0;
+	int idx_ifname = 2;
+	struct vrf *vrf;
+	struct interface *ifp;
+	int found = 0;
 
-  interface_update_stats ();
+	interface_update_stats();
 
-  /* All interface print. */
-  RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
-    {
-      /* Specified interface print. */
-      ifp = if_lookup_by_name (argv[idx_ifname]->arg, vrf->vrf_id);
-      if (ifp)
-        {
-          if_dump_vty (vty, ifp);
-          found++;
-        }
-    }
+	/* All interface print. */
+	RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
+	{
+		/* Specified interface print. */
+		ifp = if_lookup_by_name(argv[idx_ifname]->arg, vrf->vrf_id);
+		if (ifp) {
+			if_dump_vty(vty, ifp);
+			found++;
+		}
+	}
 
-  if (!found)
-    {
-      vty_out (vty, "%% Can't find interface %s%s", argv[idx_ifname]->arg, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (!found) {
+		vty_out(vty, "%% Can't find interface %s%s",
+			argv[idx_ifname]->arg, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 
-static void
-if_show_description (struct vty *vty, vrf_id_t vrf_id)
+static void if_show_description(struct vty *vty, vrf_id_t vrf_id)
 {
-  struct listnode *node;
-  struct interface *ifp;
+	struct listnode *node;
+	struct interface *ifp;
 
-  vty_out (vty, "Interface       Status  Protocol  Description%s", VTY_NEWLINE);
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (vrf_id), node, ifp))
-    {
-      int len;
+	vty_out(vty, "Interface       Status  Protocol  Description%s",
+		VTY_NEWLINE);
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(vrf_id), node, ifp)) {
+		int len;
 
-      len = vty_out (vty, "%s", ifp->name);
-      vty_out (vty, "%*s", (16 - len), " ");
-      
-      if (if_is_up(ifp))
-	{
-	  vty_out (vty, "up      ");
-	  if (CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION))
-	    {
-	      if (if_is_running(ifp))
-		vty_out (vty, "up        ");
-	      else
-		vty_out (vty, "down      ");
-	    }
-	  else
-	    {
-	      vty_out (vty, "unknown   ");
-	    }
-	}
-      else
-	{
-	  vty_out (vty, "down    down      ");
-	}
+		len = vty_out(vty, "%s", ifp->name);
+		vty_out(vty, "%*s", (16 - len), " ");
+
+		if (if_is_up(ifp)) {
+			vty_out(vty, "up      ");
+			if (CHECK_FLAG(ifp->status,
+				       ZEBRA_INTERFACE_LINKDETECTION)) {
+				if (if_is_running(ifp))
+					vty_out(vty, "up        ");
+				else
+					vty_out(vty, "down      ");
+			} else {
+				vty_out(vty, "unknown   ");
+			}
+		} else {
+			vty_out(vty, "down    down      ");
+		}
 
-      if (ifp->desc)
-	vty_out (vty, "%s", ifp->desc);
-      vty_out (vty, "%s", VTY_NEWLINE);
-    }
+		if (ifp->desc)
+			vty_out(vty, "%s", ifp->desc);
+		vty_out(vty, "%s", VTY_NEWLINE);
+	}
 }
 
 DEFUN (show_interface_desc,
@@ -1442,14 +1420,14 @@ DEFUN (show_interface_desc,
        "Interface description\n"
        VRF_CMD_HELP_STR)
 {
-  vrf_id_t vrf_id = VRF_DEFAULT;
+	vrf_id_t vrf_id = VRF_DEFAULT;
 
-  if (argc > 3)
-    VRF_GET_ID (vrf_id, argv[4]->arg);
+	if (argc > 3)
+		VRF_GET_ID(vrf_id, argv[4]->arg);
 
-  if_show_description (vty, vrf_id);
+	if_show_description(vty, vrf_id);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 
@@ -1461,17 +1439,16 @@ DEFUN (show_interface_desc_vrf_all,
        "Interface description\n"
        VRF_ALL_CMD_HELP_STR)
 {
-  struct vrf *vrf;
+	struct vrf *vrf;
 
-  RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
-    if (!list_isempty (vrf->iflist))
-      {
-        vty_out (vty, "%s\tVRF %u%s%s", VTY_NEWLINE, vrf->vrf_id,
-		 VTY_NEWLINE, VTY_NEWLINE);
-        if_show_description (vty, vrf->vrf_id);
-      }
+	RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
+	if (!list_isempty(vrf->iflist)) {
+		vty_out(vty, "%s\tVRF %u%s%s", VTY_NEWLINE, vrf->vrf_id,
+			VTY_NEWLINE, VTY_NEWLINE);
+		if_show_description(vty, vrf->vrf_id);
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (multicast,
@@ -1479,24 +1456,22 @@ DEFUN (multicast,
        "multicast",
        "Set multicast flag to interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  int ret;
-  struct zebra_if *if_data;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int ret;
+	struct zebra_if *if_data;
 
-  if (CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE))
-    {
-      ret = if_set_flags (ifp, IFF_MULTICAST);
-      if (ret < 0)
-	{
-	  vty_out (vty, "Can't set multicast flag%s", VTY_NEWLINE);
-	  return CMD_WARNING;
+	if (CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE)) {
+		ret = if_set_flags(ifp, IFF_MULTICAST);
+		if (ret < 0) {
+			vty_out(vty, "Can't set multicast flag%s", VTY_NEWLINE);
+			return CMD_WARNING;
+		}
+		if_refresh(ifp);
 	}
-      if_refresh (ifp);
-    }
-  if_data = ifp->info;
-  if_data->multicast = IF_ZEBRA_MULTICAST_ON;
+	if_data = ifp->info;
+	if_data->multicast = IF_ZEBRA_MULTICAST_ON;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_multicast,
@@ -1505,24 +1480,23 @@ DEFUN (no_multicast,
        NO_STR
        "Unset multicast flag to interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  int ret;
-  struct zebra_if *if_data;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int ret;
+	struct zebra_if *if_data;
 
-  if (CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE))
-    {
-      ret = if_unset_flags (ifp, IFF_MULTICAST);
-      if (ret < 0)
-	{
-	  vty_out (vty, "Can't unset multicast flag%s", VTY_NEWLINE);
-	  return CMD_WARNING;
+	if (CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE)) {
+		ret = if_unset_flags(ifp, IFF_MULTICAST);
+		if (ret < 0) {
+			vty_out(vty, "Can't unset multicast flag%s",
+				VTY_NEWLINE);
+			return CMD_WARNING;
+		}
+		if_refresh(ifp);
 	}
-      if_refresh (ifp);
-    }
-  if_data = ifp->info;
-  if_data->multicast = IF_ZEBRA_MULTICAST_OFF;
+	if_data = ifp->info;
+	if_data->multicast = IF_ZEBRA_MULTICAST_OFF;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (linkdetect,
@@ -1530,19 +1504,20 @@ DEFUN (linkdetect,
        "link-detect",
        "Enable link detection on interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  int if_was_operative;
-  
-  if_was_operative = if_is_no_ptm_operative(ifp);
-  SET_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int if_was_operative;
+
+	if_was_operative = if_is_no_ptm_operative(ifp);
+	SET_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION);
 
-  /* When linkdetection is enabled, if might come down */
-  if (!if_is_no_ptm_operative(ifp) && if_was_operative) if_down(ifp);
+	/* When linkdetection is enabled, if might come down */
+	if (!if_is_no_ptm_operative(ifp) && if_was_operative)
+		if_down(ifp);
 
-  /* FIXME: Will defer status change forwarding if interface
-     does not come down! */
+	/* FIXME: Will defer status change forwarding if interface
+	   does not come down! */
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 
@@ -1552,18 +1527,19 @@ DEFUN (no_linkdetect,
        NO_STR
        "Disable link detection on interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  int if_was_operative;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int if_was_operative;
 
-  if_was_operative = if_is_no_ptm_operative(ifp);
-  UNSET_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION);
-  
-  /* Interface may come up after disabling link detection */
-  if (if_is_operative(ifp) && !if_was_operative) if_up(ifp);
+	if_was_operative = if_is_no_ptm_operative(ifp);
+	UNSET_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION);
 
-  /* FIXME: see linkdetect_cmd */
+	/* Interface may come up after disabling link detection */
+	if (if_is_operative(ifp) && !if_was_operative)
+		if_up(ifp);
 
-  return CMD_SUCCESS;
+	/* FIXME: see linkdetect_cmd */
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (shutdown_if,
@@ -1571,24 +1547,22 @@ DEFUN (shutdown_if,
        "shutdown",
        "Shutdown the selected interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  int ret;
-  struct zebra_if *if_data;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int ret;
+	struct zebra_if *if_data;
 
-  if (ifp->ifindex != IFINDEX_INTERNAL)
-    {
-        ret = if_unset_flags (ifp, IFF_UP);
-        if (ret < 0)
-          {
-            vty_out (vty, "Can't shutdown interface%s", VTY_NEWLINE);
-            return CMD_WARNING;
-          }
-        if_refresh (ifp);
-    }
-  if_data = ifp->info;
-  if_data->shutdown = IF_ZEBRA_SHUTDOWN_ON;
+	if (ifp->ifindex != IFINDEX_INTERNAL) {
+		ret = if_unset_flags(ifp, IFF_UP);
+		if (ret < 0) {
+			vty_out(vty, "Can't shutdown interface%s", VTY_NEWLINE);
+			return CMD_WARNING;
+		}
+		if_refresh(ifp);
+	}
+	if_data = ifp->info;
+	if_data->shutdown = IF_ZEBRA_SHUTDOWN_ON;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_shutdown_if,
@@ -1597,30 +1571,29 @@ DEFUN (no_shutdown_if,
        NO_STR
        "Shutdown the selected interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  int ret;
-  struct zebra_if *if_data;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int ret;
+	struct zebra_if *if_data;
 
-  if (ifp->ifindex != IFINDEX_INTERNAL)
-    {
-      ret = if_set_flags (ifp, IFF_UP | IFF_RUNNING);
-      if (ret < 0)
-	{
-	  vty_out (vty, "Can't up interface%s", VTY_NEWLINE);
-	  return CMD_WARNING;
-	}
-      if_refresh (ifp);
+	if (ifp->ifindex != IFINDEX_INTERNAL) {
+		ret = if_set_flags(ifp, IFF_UP | IFF_RUNNING);
+		if (ret < 0) {
+			vty_out(vty, "Can't up interface%s", VTY_NEWLINE);
+			return CMD_WARNING;
+		}
+		if_refresh(ifp);
 
-      /* Some addresses (in particular, IPv6 addresses on Linux) get
-       * removed when the interface goes down. They need to be readded.
-       */
-      if_addr_wakeup(ifp);
-    }
+		/* Some addresses (in particular, IPv6 addresses on Linux) get
+		 * removed when the interface goes down. They need to be
+		 * readded.
+		 */
+		if_addr_wakeup(ifp);
+	}
 
-  if_data = ifp->info;
-  if_data->shutdown = IF_ZEBRA_SHUTDOWN_OFF;
+	if_data = ifp->info;
+	if_data->shutdown = IF_ZEBRA_SHUTDOWN_OFF;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (bandwidth_if,
@@ -1629,26 +1602,25 @@ DEFUN (bandwidth_if,
        "Set bandwidth informational parameter\n"
        "Bandwidth in megabits\n")
 {
-  int idx_number = 1;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  unsigned int bandwidth;
-  
-  bandwidth = strtol(argv[idx_number]->arg, NULL, 10);
+	int idx_number = 1;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	unsigned int bandwidth;
+
+	bandwidth = strtol(argv[idx_number]->arg, NULL, 10);
+
+	/* bandwidth range is <1-100000> */
+	if (bandwidth < 1 || bandwidth > 100000) {
+		vty_out(vty, "Bandwidth is invalid%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	ifp->bandwidth = bandwidth;
 
-  /* bandwidth range is <1-100000> */
-  if (bandwidth < 1 || bandwidth > 100000)
-    {
-      vty_out (vty, "Bandwidth is invalid%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-  
-  ifp->bandwidth = bandwidth;
+	/* force protocols to recalculate routes due to cost change */
+	if (if_is_operative(ifp))
+		zebra_interface_up_update(ifp);
 
-  /* force protocols to recalculate routes due to cost change */
-  if (if_is_operative (ifp))
-    zebra_interface_up_update (ifp);
-  
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_bandwidth_if,
@@ -1658,69 +1630,63 @@ DEFUN (no_bandwidth_if,
        "Set bandwidth informational parameter\n"
        "Bandwidth in megabits\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  ifp->bandwidth = 0;
-  
-  /* force protocols to recalculate routes due to cost change */
-  if (if_is_operative (ifp))
-    zebra_interface_up_update (ifp);
+	ifp->bandwidth = 0;
 
-  return CMD_SUCCESS;
+	/* force protocols to recalculate routes due to cost change */
+	if (if_is_operative(ifp))
+		zebra_interface_up_update(ifp);
+
+	return CMD_SUCCESS;
 }
 
 
-struct cmd_node link_params_node =
-{
-  LINK_PARAMS_NODE,
-  "%s(config-link-params)# ",
-  1,
+struct cmd_node link_params_node = {
+	LINK_PARAMS_NODE, "%s(config-link-params)# ", 1,
 };
 
-static void
-link_param_cmd_set_uint32 (struct interface *ifp, uint32_t *field,
-                           uint32_t type, uint32_t value)
+static void link_param_cmd_set_uint32(struct interface *ifp, uint32_t *field,
+				      uint32_t type, uint32_t value)
 {
-  /* Update field as needed */
-  if (IS_PARAM_UNSET(ifp->link_params, type) || *field != value)
-    {
-      *field = value;
-      SET_PARAM(ifp->link_params, type);
+	/* Update field as needed */
+	if (IS_PARAM_UNSET(ifp->link_params, type) || *field != value) {
+		*field = value;
+		SET_PARAM(ifp->link_params, type);
 
-      /* force protocols to update LINK STATE due to parameters change */
-      if (if_is_operative (ifp))
-        zebra_interface_parameters_update (ifp);
-    }
+		/* force protocols to update LINK STATE due to parameters change
+		 */
+		if (if_is_operative(ifp))
+			zebra_interface_parameters_update(ifp);
+	}
 }
-static void
-link_param_cmd_set_float (struct interface *ifp, float *field,
-                          uint32_t type, float value)
+static void link_param_cmd_set_float(struct interface *ifp, float *field,
+				     uint32_t type, float value)
 {
 
-  /* Update field as needed */
-  if (IS_PARAM_UNSET(ifp->link_params, type) || *field != value)
-    {
-      *field = value;
-      SET_PARAM(ifp->link_params, type);
+	/* Update field as needed */
+	if (IS_PARAM_UNSET(ifp->link_params, type) || *field != value) {
+		*field = value;
+		SET_PARAM(ifp->link_params, type);
 
-      /* force protocols to update LINK STATE due to parameters change */
-      if (if_is_operative (ifp))
-        zebra_interface_parameters_update (ifp);
-    }
+		/* force protocols to update LINK STATE due to parameters change
+		 */
+		if (if_is_operative(ifp))
+			zebra_interface_parameters_update(ifp);
+	}
 }
 
-static void
-link_param_cmd_unset (struct interface *ifp, uint32_t type)
+static void link_param_cmd_unset(struct interface *ifp, uint32_t type)
 {
-  if (ifp->link_params == NULL)
-    return;
+	if (ifp->link_params == NULL)
+		return;
 
-  /* Unset field */
-  UNSET_PARAM(ifp->link_params, type);
+	/* Unset field */
+	UNSET_PARAM(ifp->link_params, type);
 
-  /* force protocols to update LINK STATE due to parameters change */
-  if (if_is_operative (ifp))
-    zebra_interface_parameters_update (ifp);
+	/* force protocols to update LINK STATE due to parameters change */
+	if (if_is_operative(ifp))
+		zebra_interface_parameters_update(ifp);
 }
 
 DEFUN_NOSH (link_params,
@@ -1728,10 +1694,10 @@ DEFUN_NOSH (link_params,
        "link-params",
        LINK_PARAMS_STR)
 {
-  /* vty->qobj_index stays the same @ interface pointer */
-  vty->node = LINK_PARAMS_NODE;
+	/* vty->qobj_index stays the same @ interface pointer */
+	vty->node = LINK_PARAMS_NODE;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN_NOSH (exit_link_params,
@@ -1739,9 +1705,9 @@ DEFUN_NOSH (exit_link_params,
        "exit-link-params",
        "Exit from Link Params configuration mode\n")
 {
-  if (vty->node == LINK_PARAMS_NODE)
-    vty->node = INTERFACE_NODE;
-  return CMD_SUCCESS;
+	if (vty->node == LINK_PARAMS_NODE)
+		vty->node = INTERFACE_NODE;
+	return CMD_SUCCESS;
 }
 
 /* Specific Traffic Engineering parameters commands */
@@ -1750,27 +1716,30 @@ DEFUN (link_params_enable,
        "enable",
        "Activate link parameters on this interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  /* This command could be issue at startup, when activate MPLS TE */
-  /* on a new interface or after a ON / OFF / ON toggle */
-  /* In all case, TE parameters are reset to their default factory */
-  if (IS_ZEBRA_DEBUG_EVENT)
-    zlog_debug ("Link-params: enable TE link parameters on interface %s", ifp->name);
+	/* This command could be issue at startup, when activate MPLS TE */
+	/* on a new interface or after a ON / OFF / ON toggle */
+	/* In all case, TE parameters are reset to their default factory */
+	if (IS_ZEBRA_DEBUG_EVENT)
+		zlog_debug(
+			"Link-params: enable TE link parameters on interface %s",
+			ifp->name);
 
-  if (!if_link_params_get (ifp))
-    {
-      if (IS_ZEBRA_DEBUG_EVENT)
-        zlog_debug ("Link-params: failed to init TE link parameters  %s", ifp->name);
+	if (!if_link_params_get(ifp)) {
+		if (IS_ZEBRA_DEBUG_EVENT)
+			zlog_debug(
+				"Link-params: failed to init TE link parameters  %s",
+				ifp->name);
 
-      return CMD_WARNING;
-    }
+		return CMD_WARNING;
+	}
 
-  /* force protocols to update LINK STATE due to parameters change */
-  if (if_is_operative (ifp))
-    zebra_interface_parameters_update (ifp);
+	/* force protocols to update LINK STATE due to parameters change */
+	if (if_is_operative(ifp))
+		zebra_interface_parameters_update(ifp);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_link_params_enable,
@@ -1779,17 +1748,18 @@ DEFUN (no_link_params_enable,
        NO_STR
        "Disable link parameters on this interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  zlog_debug ("MPLS-TE: disable TE link parameters on interface %s", ifp->name);
+	zlog_debug("MPLS-TE: disable TE link parameters on interface %s",
+		   ifp->name);
 
-  if_link_params_free (ifp);
+	if_link_params_free(ifp);
 
-  /* force protocols to update LINK STATE due to parameters change */
-  if (if_is_operative (ifp))
-    zebra_interface_parameters_update (ifp);
+	/* force protocols to update LINK STATE due to parameters change */
+	if (if_is_operative(ifp))
+		zebra_interface_parameters_update(ifp);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 /* STANDARD TE metrics */
@@ -1799,17 +1769,17 @@ DEFUN (link_params_metric,
        "Link metric for MPLS-TE purpose\n"
        "Metric value in decimal\n")
 {
-  int idx_number = 1;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  u_int32_t metric;
+	int idx_number = 1;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	u_int32_t metric;
 
-  VTY_GET_ULONG("metric", metric, argv[idx_number]->arg);
+	VTY_GET_ULONG("metric", metric, argv[idx_number]->arg);
 
-  /* Update TE metric if needed */
-  link_param_cmd_set_uint32 (ifp, &iflp->te_metric, LP_TE_METRIC, metric);
+	/* Update TE metric if needed */
+	link_param_cmd_set_uint32(ifp, &iflp->te_metric, LP_TE_METRIC, metric);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_link_params_metric,
@@ -1818,12 +1788,12 @@ DEFUN (no_link_params_metric,
        NO_STR
        "Disable Link Metric on this interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  /* Unset TE Metric */
-  link_param_cmd_unset(ifp, LP_TE_METRIC);
+	/* Unset TE Metric */
+	link_param_cmd_unset(ifp, LP_TE_METRIC);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (link_params_maxbw,
@@ -1832,43 +1802,36 @@ DEFUN (link_params_maxbw,
        "Maximum bandwidth that can be used\n"
        "Bytes/second (IEEE floating point format)\n")
 {
-  int idx_bandwidth = 1;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-
-  float bw;
-
-  if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
-    {
-      vty_out (vty, "link_params_maxbw: fscanf: %s%s", safe_strerror (errno),
-               VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  /* Check that Maximum bandwidth is not lower than other bandwidth parameters */
-  if ((bw <= iflp->max_rsv_bw)
-      || (bw <= iflp->unrsv_bw[0])
-      || (bw <= iflp->unrsv_bw[1])
-      || (bw <= iflp->unrsv_bw[2])
-      || (bw <= iflp->unrsv_bw[3])
-      || (bw <= iflp->unrsv_bw[4])
-      || (bw <= iflp->unrsv_bw[5])
-      || (bw <= iflp->unrsv_bw[6])
-      || (bw <= iflp->unrsv_bw[7])
-      || (bw <= iflp->ava_bw)
-      || (bw <= iflp->res_bw)
-      || (bw <= iflp->use_bw))
-    {
-      vty_out (vty,
-               "Maximum Bandwidth could not be lower than others bandwidth%s",
-               VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  /* Update Maximum Bandwidth if needed */
-  link_param_cmd_set_float (ifp, &iflp->max_bw, LP_MAX_BW, bw);
-
-  return CMD_SUCCESS;
+	int idx_bandwidth = 1;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+
+	float bw;
+
+	if (sscanf(argv[idx_bandwidth]->arg, "%g", &bw) != 1) {
+		vty_out(vty, "link_params_maxbw: fscanf: %s%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* Check that Maximum bandwidth is not lower than other bandwidth
+	 * parameters */
+	if ((bw <= iflp->max_rsv_bw) || (bw <= iflp->unrsv_bw[0])
+	    || (bw <= iflp->unrsv_bw[1]) || (bw <= iflp->unrsv_bw[2])
+	    || (bw <= iflp->unrsv_bw[3]) || (bw <= iflp->unrsv_bw[4])
+	    || (bw <= iflp->unrsv_bw[5]) || (bw <= iflp->unrsv_bw[6])
+	    || (bw <= iflp->unrsv_bw[7]) || (bw <= iflp->ava_bw)
+	    || (bw <= iflp->res_bw) || (bw <= iflp->use_bw)) {
+		vty_out(vty,
+			"Maximum Bandwidth could not be lower than others bandwidth%s",
+			VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* Update Maximum Bandwidth if needed */
+	link_param_cmd_set_float(ifp, &iflp->max_bw, LP_MAX_BW, bw);
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (link_params_max_rsv_bw,
@@ -1877,31 +1840,30 @@ DEFUN (link_params_max_rsv_bw,
        "Maximum bandwidth that may be reserved\n"
        "Bytes/second (IEEE floating point format)\n")
 {
-  int idx_bandwidth = 1;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  float bw;
+	int idx_bandwidth = 1;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	float bw;
 
-  if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
-    {
-      vty_out (vty, "link_params_max_rsv_bw: fscanf: %s%s", safe_strerror (errno),
-               VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (sscanf(argv[idx_bandwidth]->arg, "%g", &bw) != 1) {
+		vty_out(vty, "link_params_max_rsv_bw: fscanf: %s%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  /* Check that bandwidth is not greater than maximum bandwidth parameter */
-  if (bw > iflp->max_bw)
-    {
-      vty_out (vty,
-               "Maximum Reservable Bandwidth could not be greater than Maximum Bandwidth (%g)%s",
-               iflp->max_bw, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	/* Check that bandwidth is not greater than maximum bandwidth parameter
+	 */
+	if (bw > iflp->max_bw) {
+		vty_out(vty,
+			"Maximum Reservable Bandwidth could not be greater than Maximum Bandwidth (%g)%s",
+			iflp->max_bw, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  /* Update Maximum Reservable Bandwidth if needed */
-  link_param_cmd_set_float (ifp, &iflp->max_rsv_bw, LP_MAX_RSV_BW, bw);
+	/* Update Maximum Reservable Bandwidth if needed */
+	link_param_cmd_set_float(ifp, &iflp->max_rsv_bw, LP_MAX_RSV_BW, bw);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (link_params_unrsv_bw,
@@ -1911,41 +1873,40 @@ DEFUN (link_params_unrsv_bw,
        "Priority\n"
        "Bytes/second (IEEE floating point format)\n")
 {
-  int idx_number = 1;
-  int idx_bandwidth = 2;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  int priority;
-  float bw;
-
-  /* We don't have to consider about range check here. */
-  if (sscanf (argv[idx_number]->arg, "%d", &priority) != 1)
-    {
-      vty_out (vty, "link_params_unrsv_bw: fscanf: %s%s", safe_strerror (errno),
-               VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
-    {
-      vty_out (vty, "link_params_unrsv_bw: fscanf: %s%s", safe_strerror (errno),
-               VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  /* Check that bandwidth is not greater than maximum bandwidth parameter */
-  if (bw > iflp->max_bw)
-    {
-      vty_out (vty,
-               "UnReserved Bandwidth could not be greater than Maximum Bandwidth (%g)%s",
-               iflp->max_bw, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  /* Update Unreserved Bandwidth if needed */
-  link_param_cmd_set_float (ifp, &iflp->unrsv_bw[priority], LP_UNRSV_BW, bw);
-
-  return CMD_SUCCESS;
+	int idx_number = 1;
+	int idx_bandwidth = 2;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	int priority;
+	float bw;
+
+	/* We don't have to consider about range check here. */
+	if (sscanf(argv[idx_number]->arg, "%d", &priority) != 1) {
+		vty_out(vty, "link_params_unrsv_bw: fscanf: %s%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	if (sscanf(argv[idx_bandwidth]->arg, "%g", &bw) != 1) {
+		vty_out(vty, "link_params_unrsv_bw: fscanf: %s%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* Check that bandwidth is not greater than maximum bandwidth parameter
+	 */
+	if (bw > iflp->max_bw) {
+		vty_out(vty,
+			"UnReserved Bandwidth could not be greater than Maximum Bandwidth (%g)%s",
+			iflp->max_bw, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* Update Unreserved Bandwidth if needed */
+	link_param_cmd_set_float(ifp, &iflp->unrsv_bw[priority], LP_UNRSV_BW,
+				 bw);
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (link_params_admin_grp,
@@ -1954,22 +1915,21 @@ DEFUN (link_params_admin_grp,
        "Administrative group membership\n"
        "32-bit Hexadecimal value (e.g. 0xa1)\n")
 {
-  int idx_bitpattern = 1;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  unsigned long value;
+	int idx_bitpattern = 1;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	unsigned long value;
 
-  if (sscanf (argv[idx_bitpattern]->arg, "0x%lx", &value) != 1)
-    {
-      vty_out (vty, "link_params_admin_grp: fscanf: %s%s",
-               safe_strerror (errno), VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (sscanf(argv[idx_bitpattern]->arg, "0x%lx", &value) != 1) {
+		vty_out(vty, "link_params_admin_grp: fscanf: %s%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  /* Update Administrative Group if needed */
-  link_param_cmd_set_uint32 (ifp, &iflp->admin_grp, LP_ADM_GRP, value);
+	/* Update Administrative Group if needed */
+	link_param_cmd_set_uint32(ifp, &iflp->admin_grp, LP_ADM_GRP, value);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_link_params_admin_grp,
@@ -1978,12 +1938,12 @@ DEFUN (no_link_params_admin_grp,
        NO_STR
        "Disable Administrative group membership on this interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  /* Unset Admin Group */
-  link_param_cmd_unset(ifp, LP_ADM_GRP);
+	/* Unset Admin Group */
+	link_param_cmd_unset(ifp, LP_ADM_GRP);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 /* RFC5392 & RFC5316: INTER-AS */
@@ -1995,37 +1955,36 @@ DEFUN (link_params_inter_as,
        "Remote AS number\n"
        "AS number in the range <1-4294967295>\n")
 {
-  int idx_ipv4 = 1;
-  int idx_number = 3;
+	int idx_ipv4 = 1;
+	int idx_number = 3;
 
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  struct in_addr addr;
-  u_int32_t as;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	struct in_addr addr;
+	u_int32_t as;
 
-  if (!inet_aton (argv[idx_ipv4]->arg, &addr))
-    {
-      vty_out (vty, "Please specify Router-Addr by A.B.C.D%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (!inet_aton(argv[idx_ipv4]->arg, &addr)) {
+		vty_out(vty, "Please specify Router-Addr by A.B.C.D%s",
+			VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  VTY_GET_ULONG("AS number", as, argv[idx_number]->arg);
+	VTY_GET_ULONG("AS number", as, argv[idx_number]->arg);
 
-  /* Update Remote IP and Remote AS fields if needed */
-  if (IS_PARAM_UNSET(iflp, LP_RMT_AS)
-      || iflp->rmt_as != as
-      || iflp->rmt_ip.s_addr != addr.s_addr)
-    {
+	/* Update Remote IP and Remote AS fields if needed */
+	if (IS_PARAM_UNSET(iflp, LP_RMT_AS) || iflp->rmt_as != as
+	    || iflp->rmt_ip.s_addr != addr.s_addr) {
 
-      iflp->rmt_as = as;
-      iflp->rmt_ip.s_addr = addr.s_addr;
-      SET_PARAM(iflp, LP_RMT_AS);
+		iflp->rmt_as = as;
+		iflp->rmt_ip.s_addr = addr.s_addr;
+		SET_PARAM(iflp, LP_RMT_AS);
 
-      /* force protocols to update LINK STATE due to parameters change */
-      if (if_is_operative (ifp))
-        zebra_interface_parameters_update (ifp);
-    }
-  return CMD_SUCCESS;
+		/* force protocols to update LINK STATE due to parameters change
+		 */
+		if (if_is_operative(ifp))
+			zebra_interface_parameters_update(ifp);
+	}
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_link_params_inter_as,
@@ -2034,22 +1993,23 @@ DEFUN (no_link_params_inter_as,
        NO_STR
        "Remove Neighbor IP address and AS number for Inter-AS TE\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
 
-  /* Reset Remote IP and AS neighbor */
-  iflp->rmt_as = 0;
-  iflp->rmt_ip.s_addr = 0;
-  UNSET_PARAM(iflp, LP_RMT_AS);
+	/* Reset Remote IP and AS neighbor */
+	iflp->rmt_as = 0;
+	iflp->rmt_ip.s_addr = 0;
+	UNSET_PARAM(iflp, LP_RMT_AS);
 
-  /* force protocols to update LINK STATE due to parameters change */
-  if (if_is_operative (ifp))
-    zebra_interface_parameters_update (ifp);
+	/* force protocols to update LINK STATE due to parameters change */
+	if (if_is_operative(ifp))
+		zebra_interface_parameters_update(ifp);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
-/* RFC7471: OSPF Traffic Engineering (TE) Metric extensions & draft-ietf-isis-metric-extensions-07.txt */
+/* RFC7471: OSPF Traffic Engineering (TE) Metric extensions &
+ * draft-ietf-isis-metric-extensions-07.txt */
 DEFUN (link_params_delay,
        link_params_delay_cmd,
        "delay (0-16777215) [min (0-16777215) max (0-16777215)]",
@@ -2060,75 +2020,68 @@ DEFUN (link_params_delay,
        "Maximum delay\n"
        "Maximum delay in micro-second as decimal (0...16777215)\n")
 {
-  /* Get and Check new delay values */
-  u_int32_t delay = 0, low = 0, high = 0;
-  VTY_GET_ULONG("delay", delay, argv[1]->arg);
-  if (argc == 6)
-  {
-    VTY_GET_ULONG("minimum delay", low, argv[3]->arg);
-    VTY_GET_ULONG("maximum delay", high, argv[5]->arg);
-  }
-
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  u_int8_t update = 0;
-
-  if (argc == 2)
-  {
-    /* Check new delay value against old Min and Max delays if set */
-    if (IS_PARAM_SET(iflp, LP_MM_DELAY)
-        && (delay <= iflp->min_delay || delay >= iflp->max_delay))
-      {
-        vty_out (vty, "Average delay should be comprise between Min (%d) and Max (%d) delay%s",
-                 iflp->min_delay, iflp->max_delay, VTY_NEWLINE);
-        return CMD_WARNING;
-      }
-    /* Update delay if value is not set or change */
-    if (IS_PARAM_UNSET(iflp, LP_DELAY)|| iflp->av_delay != delay)
-      {
-        iflp->av_delay = delay;
-        SET_PARAM(iflp, LP_DELAY);
-        update = 1;
-      }
-    /* Unset Min and Max delays if already set */
-    if (IS_PARAM_SET(iflp, LP_MM_DELAY))
-      {
-        iflp->min_delay = 0;
-        iflp->max_delay = 0;
-        UNSET_PARAM(iflp, LP_MM_DELAY);
-        update = 1;
-      }
-  }
-  else
-  {
-    /* Check new delays value coherency */
-    if (delay <= low || delay >= high)
-      {
-        vty_out (vty, "Average delay should be comprise between Min (%d) and Max (%d) delay%s",
-                 low, high, VTY_NEWLINE);
-        return CMD_WARNING;
-      }
-    /* Update Delays if needed */
-    if (IS_PARAM_UNSET(iflp, LP_DELAY)
-        || IS_PARAM_UNSET(iflp, LP_MM_DELAY)
-        || iflp->av_delay != delay
-        || iflp->min_delay != low
-        || iflp->max_delay != high)
-      {
-        iflp->av_delay = delay;
-        SET_PARAM(iflp, LP_DELAY);
-        iflp->min_delay = low;
-        iflp->max_delay = high;
-        SET_PARAM(iflp, LP_MM_DELAY);
-        update = 1;
-      }
-  }
-
-  /* force protocols to update LINK STATE due to parameters change */
-  if (update == 1 && if_is_operative (ifp))
-    zebra_interface_parameters_update (ifp);
-
-  return CMD_SUCCESS;
+	/* Get and Check new delay values */
+	u_int32_t delay = 0, low = 0, high = 0;
+	VTY_GET_ULONG("delay", delay, argv[1]->arg);
+	if (argc == 6) {
+		VTY_GET_ULONG("minimum delay", low, argv[3]->arg);
+		VTY_GET_ULONG("maximum delay", high, argv[5]->arg);
+	}
+
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	u_int8_t update = 0;
+
+	if (argc == 2) {
+		/* Check new delay value against old Min and Max delays if set
+		 */
+		if (IS_PARAM_SET(iflp, LP_MM_DELAY)
+		    && (delay <= iflp->min_delay || delay >= iflp->max_delay)) {
+			vty_out(vty,
+				"Average delay should be comprise between Min (%d) and Max (%d) delay%s",
+				iflp->min_delay, iflp->max_delay, VTY_NEWLINE);
+			return CMD_WARNING;
+		}
+		/* Update delay if value is not set or change */
+		if (IS_PARAM_UNSET(iflp, LP_DELAY) || iflp->av_delay != delay) {
+			iflp->av_delay = delay;
+			SET_PARAM(iflp, LP_DELAY);
+			update = 1;
+		}
+		/* Unset Min and Max delays if already set */
+		if (IS_PARAM_SET(iflp, LP_MM_DELAY)) {
+			iflp->min_delay = 0;
+			iflp->max_delay = 0;
+			UNSET_PARAM(iflp, LP_MM_DELAY);
+			update = 1;
+		}
+	} else {
+		/* Check new delays value coherency */
+		if (delay <= low || delay >= high) {
+			vty_out(vty,
+				"Average delay should be comprise between Min (%d) and Max (%d) delay%s",
+				low, high, VTY_NEWLINE);
+			return CMD_WARNING;
+		}
+		/* Update Delays if needed */
+		if (IS_PARAM_UNSET(iflp, LP_DELAY)
+		    || IS_PARAM_UNSET(iflp, LP_MM_DELAY)
+		    || iflp->av_delay != delay || iflp->min_delay != low
+		    || iflp->max_delay != high) {
+			iflp->av_delay = delay;
+			SET_PARAM(iflp, LP_DELAY);
+			iflp->min_delay = low;
+			iflp->max_delay = high;
+			SET_PARAM(iflp, LP_MM_DELAY);
+			update = 1;
+		}
+	}
+
+	/* force protocols to update LINK STATE due to parameters change */
+	if (update == 1 && if_is_operative(ifp))
+		zebra_interface_parameters_update(ifp);
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_link_params_delay,
@@ -2137,21 +2090,21 @@ DEFUN (no_link_params_delay,
        NO_STR
        "Disable Unidirectional Average, Min & Max Link Delay on this interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
 
-  /* Unset Delays */
-  iflp->av_delay = 0;
-  UNSET_PARAM(iflp, LP_DELAY);
-  iflp->min_delay = 0;
-  iflp->max_delay = 0;
-  UNSET_PARAM(iflp, LP_MM_DELAY);
+	/* Unset Delays */
+	iflp->av_delay = 0;
+	UNSET_PARAM(iflp, LP_DELAY);
+	iflp->min_delay = 0;
+	iflp->max_delay = 0;
+	UNSET_PARAM(iflp, LP_MM_DELAY);
 
-  /* force protocols to update LINK STATE due to parameters change */
-  if (if_is_operative (ifp))
-    zebra_interface_parameters_update (ifp);
+	/* force protocols to update LINK STATE due to parameters change */
+	if (if_is_operative(ifp))
+		zebra_interface_parameters_update(ifp);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (link_params_delay_var,
@@ -2160,17 +2113,17 @@ DEFUN (link_params_delay_var,
        "Unidirectional Link Delay Variation\n"
        "delay variation in micro-second as decimal (0...16777215)\n")
 {
-  int idx_number = 1;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  u_int32_t value;
+	int idx_number = 1;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	u_int32_t value;
 
-  VTY_GET_ULONG("delay variation", value, argv[idx_number]->arg);
+	VTY_GET_ULONG("delay variation", value, argv[idx_number]->arg);
 
-  /* Update Delay Variation if needed */
-  link_param_cmd_set_uint32 (ifp, &iflp->delay_var, LP_DELAY_VAR, value);
+	/* Update Delay Variation if needed */
+	link_param_cmd_set_uint32(ifp, &iflp->delay_var, LP_DELAY_VAR, value);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_link_params_delay_var,
@@ -2179,12 +2132,12 @@ DEFUN (no_link_params_delay_var,
        NO_STR
        "Disable Unidirectional Delay Variation on this interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  /* Unset Delay Variation */
-  link_param_cmd_unset(ifp, LP_DELAY_VAR);
+	/* Unset Delay Variation */
+	link_param_cmd_unset(ifp, LP_DELAY_VAR);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (link_params_pkt_loss,
@@ -2193,25 +2146,24 @@ DEFUN (link_params_pkt_loss,
        "Unidirectional Link Packet Loss\n"
        "percentage of total traffic by 0.000003% step and less than 50.331642%\n")
 {
-  int idx_percentage = 1;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  float fval;
+	int idx_percentage = 1;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	float fval;
 
-  if (sscanf (argv[idx_percentage]->arg, "%g", &fval) != 1)
-    {
-      vty_out (vty, "link_params_pkt_loss: fscanf: %s%s", safe_strerror (errno),
-               VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (sscanf(argv[idx_percentage]->arg, "%g", &fval) != 1) {
+		vty_out(vty, "link_params_pkt_loss: fscanf: %s%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  if (fval > MAX_PKT_LOSS)
-    fval = MAX_PKT_LOSS;
+	if (fval > MAX_PKT_LOSS)
+		fval = MAX_PKT_LOSS;
 
-  /* Update Packet Loss if needed */
-  link_param_cmd_set_float (ifp, &iflp->pkt_loss, LP_PKT_LOSS, fval);
+	/* Update Packet Loss if needed */
+	link_param_cmd_set_float(ifp, &iflp->pkt_loss, LP_PKT_LOSS, fval);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_link_params_pkt_loss,
@@ -2220,12 +2172,12 @@ DEFUN (no_link_params_pkt_loss,
        NO_STR
        "Disable Unidirectional Link Packet Loss on this interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  /* Unset Packet Loss */
-  link_param_cmd_unset(ifp, LP_PKT_LOSS);
+	/* Unset Packet Loss */
+	link_param_cmd_unset(ifp, LP_PKT_LOSS);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (link_params_res_bw,
@@ -2234,31 +2186,30 @@ DEFUN (link_params_res_bw,
        "Unidirectional Residual Bandwidth\n"
        "Bytes/second (IEEE floating point format)\n")
 {
-  int idx_bandwidth = 1;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  float bw;
+	int idx_bandwidth = 1;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	float bw;
 
-  if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
-    {
-      vty_out (vty, "link_params_res_bw: fscanf: %s%s", safe_strerror (errno),
-               VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (sscanf(argv[idx_bandwidth]->arg, "%g", &bw) != 1) {
+		vty_out(vty, "link_params_res_bw: fscanf: %s%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  /* Check that bandwidth is not greater than maximum bandwidth parameter */
-  if (bw > iflp->max_bw)
-    {
-      vty_out (vty,
-               "Residual Bandwidth could not be greater than Maximum Bandwidth (%g)%s",
-               iflp->max_bw, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	/* Check that bandwidth is not greater than maximum bandwidth parameter
+	 */
+	if (bw > iflp->max_bw) {
+		vty_out(vty,
+			"Residual Bandwidth could not be greater than Maximum Bandwidth (%g)%s",
+			iflp->max_bw, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  /* Update Residual Bandwidth if needed */
-  link_param_cmd_set_float (ifp, &iflp->res_bw, LP_RES_BW, bw);
+	/* Update Residual Bandwidth if needed */
+	link_param_cmd_set_float(ifp, &iflp->res_bw, LP_RES_BW, bw);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_link_params_res_bw,
@@ -2267,12 +2218,12 @@ DEFUN (no_link_params_res_bw,
        NO_STR
        "Disable Unidirectional Residual Bandwidth on this interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  /* Unset Residual Bandwidth */
-  link_param_cmd_unset(ifp, LP_RES_BW);
+	/* Unset Residual Bandwidth */
+	link_param_cmd_unset(ifp, LP_RES_BW);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (link_params_ava_bw,
@@ -2281,31 +2232,30 @@ DEFUN (link_params_ava_bw,
        "Unidirectional Available Bandwidth\n"
        "Bytes/second (IEEE floating point format)\n")
 {
-  int idx_bandwidth = 1;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  float bw;
+	int idx_bandwidth = 1;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	float bw;
 
-  if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
-    {
-      vty_out (vty, "link_params_ava_bw: fscanf: %s%s", safe_strerror (errno),
-               VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (sscanf(argv[idx_bandwidth]->arg, "%g", &bw) != 1) {
+		vty_out(vty, "link_params_ava_bw: fscanf: %s%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  /* Check that bandwidth is not greater than maximum bandwidth parameter */
-  if (bw > iflp->max_bw)
-    {
-      vty_out (vty,
-               "Available Bandwidth could not be greater than Maximum Bandwidth (%g)%s",
-               iflp->max_bw, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	/* Check that bandwidth is not greater than maximum bandwidth parameter
+	 */
+	if (bw > iflp->max_bw) {
+		vty_out(vty,
+			"Available Bandwidth could not be greater than Maximum Bandwidth (%g)%s",
+			iflp->max_bw, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  /* Update Residual Bandwidth if needed */
-  link_param_cmd_set_float (ifp, &iflp->ava_bw, LP_AVA_BW, bw);
+	/* Update Residual Bandwidth if needed */
+	link_param_cmd_set_float(ifp, &iflp->ava_bw, LP_AVA_BW, bw);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_link_params_ava_bw,
@@ -2314,12 +2264,12 @@ DEFUN (no_link_params_ava_bw,
        NO_STR
        "Disable Unidirectional Available Bandwidth on this interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  /* Unset Available Bandwidth */
-  link_param_cmd_unset(ifp, LP_AVA_BW);
+	/* Unset Available Bandwidth */
+	link_param_cmd_unset(ifp, LP_AVA_BW);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (link_params_use_bw,
@@ -2328,31 +2278,30 @@ DEFUN (link_params_use_bw,
        "Unidirectional Utilised Bandwidth\n"
        "Bytes/second (IEEE floating point format)\n")
 {
-  int idx_bandwidth = 1;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  struct if_link_params *iflp = if_link_params_get (ifp);
-  float bw;
+	int idx_bandwidth = 1;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct if_link_params *iflp = if_link_params_get(ifp);
+	float bw;
 
-  if (sscanf (argv[idx_bandwidth]->arg, "%g", &bw) != 1)
-    {
-      vty_out (vty, "link_params_use_bw: fscanf: %s%s", safe_strerror (errno),
-               VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (sscanf(argv[idx_bandwidth]->arg, "%g", &bw) != 1) {
+		vty_out(vty, "link_params_use_bw: fscanf: %s%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  /* Check that bandwidth is not greater than maximum bandwidth parameter */
-  if (bw > iflp->max_bw)
-    {
-      vty_out (vty,
-               "Utilised Bandwidth could not be greater than Maximum Bandwidth (%g)%s",
-               iflp->max_bw, VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	/* Check that bandwidth is not greater than maximum bandwidth parameter
+	 */
+	if (bw > iflp->max_bw) {
+		vty_out(vty,
+			"Utilised Bandwidth could not be greater than Maximum Bandwidth (%g)%s",
+			iflp->max_bw, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  /* Update Utilized Bandwidth if needed */
-  link_param_cmd_set_float (ifp, &iflp->use_bw, LP_USE_BW, bw);
+	/* Update Utilized Bandwidth if needed */
+	link_param_cmd_set_float(ifp, &iflp->use_bw, LP_USE_BW, bw);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_link_params_use_bw,
@@ -2361,153 +2310,142 @@ DEFUN (no_link_params_use_bw,
        NO_STR
        "Disable Unidirectional Utilised Bandwidth on this interface\n")
 {
-  VTY_DECLVAR_CONTEXT (interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  /* Unset Utilised Bandwidth */
-  link_param_cmd_unset(ifp, LP_USE_BW);
+	/* Unset Utilised Bandwidth */
+	link_param_cmd_unset(ifp, LP_USE_BW);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
-static int
-ip_address_install (struct vty *vty, struct interface *ifp,
-		    const char *addr_str, const char *peer_str,
-		    const char *label)
+static int ip_address_install(struct vty *vty, struct interface *ifp,
+			      const char *addr_str, const char *peer_str,
+			      const char *label)
 {
-  struct zebra_if *if_data;
-  struct prefix_ipv4 cp;
-  struct connected *ifc;
-  struct prefix_ipv4 *p;
-  int ret;
+	struct zebra_if *if_data;
+	struct prefix_ipv4 cp;
+	struct connected *ifc;
+	struct prefix_ipv4 *p;
+	int ret;
 
-  if_data = ifp->info;
+	if_data = ifp->info;
 
-  ret = str2prefix_ipv4 (addr_str, &cp);
-  if (ret <= 0)
-    {
-      vty_out (vty, "%% Malformed address %s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	ret = str2prefix_ipv4(addr_str, &cp);
+	if (ret <= 0) {
+		vty_out(vty, "%% Malformed address %s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  if (ipv4_martian(&cp.prefix))
-    {
-      vty_out (vty, "%% Invalid address%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+	if (ipv4_martian(&cp.prefix)) {
+		vty_out(vty, "%% Invalid address%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
 
-  ifc = connected_check (ifp, (struct prefix *) &cp);
-  if (! ifc)
-    {
-      ifc = connected_new ();
-      ifc->ifp = ifp;
+	ifc = connected_check(ifp, (struct prefix *)&cp);
+	if (!ifc) {
+		ifc = connected_new();
+		ifc->ifp = ifp;
+
+		/* Address. */
+		p = prefix_ipv4_new();
+		*p = cp;
+		ifc->address = (struct prefix *)p;
+
+		/* Broadcast. */
+		if (p->prefixlen <= IPV4_MAX_PREFIXLEN - 2) {
+			p = prefix_ipv4_new();
+			*p = cp;
+			p->prefix.s_addr = ipv4_broadcast_addr(p->prefix.s_addr,
+							       p->prefixlen);
+			ifc->destination = (struct prefix *)p;
+		}
 
-      /* Address. */
-      p = prefix_ipv4_new ();
-      *p = cp;
-      ifc->address = (struct prefix *) p;
+		/* Label. */
+		if (label)
+			ifc->label = XSTRDUP(MTYPE_CONNECTED_LABEL, label);
 
-      /* Broadcast. */
-      if (p->prefixlen <= IPV4_MAX_PREFIXLEN-2)
-	{
-	  p = prefix_ipv4_new ();
-	  *p = cp;
-	  p->prefix.s_addr = ipv4_broadcast_addr(p->prefix.s_addr,p->prefixlen);
-	  ifc->destination = (struct prefix *) p;
-	}
-
-      /* Label. */
-      if (label)
-	ifc->label = XSTRDUP (MTYPE_CONNECTED_LABEL, label);
-
-      /* Add to linked list. */
-      listnode_add (ifp->connected, ifc);
-    }
-
-  /* This address is configured from zebra. */
-  if (! CHECK_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED))
-    SET_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED);
-
-  /* In case of this route need to install kernel. */
-  if (! CHECK_FLAG (ifc->conf, ZEBRA_IFC_QUEUED)
-      && CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE)
-      && !(if_data && if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON))
-    {
-      /* Some system need to up the interface to set IP address. */
-      if (! if_is_up (ifp))
-	{
-	  if_set_flags (ifp, IFF_UP | IFF_RUNNING);
-	  if_refresh (ifp);
+		/* Add to linked list. */
+		listnode_add(ifp->connected, ifc);
 	}
 
-      ret = if_set_prefix (ifp, ifc);
-      if (ret < 0)
-	{
-	  vty_out (vty, "%% Can't set interface IP address: %s.%s", 
-		   safe_strerror(errno), VTY_NEWLINE);
-	  return CMD_WARNING;
-	}
-
-      SET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
-      /* The address will be advertised to zebra clients when the notification
-       * from the kernel has been received.
-       * It will also be added to the subnet chain list, then. */
-    }
-
-  return CMD_SUCCESS;
-}
-
-static int
-ip_address_uninstall (struct vty *vty, struct interface *ifp,
-		      const char *addr_str, const char *peer_str,
-		      const char *label)
-{
-  struct prefix_ipv4 cp;
-  struct connected *ifc;
-  int ret;
-
-  /* Convert to prefix structure. */
-  ret = str2prefix_ipv4 (addr_str, &cp);
-  if (ret <= 0)
-    {
-      vty_out (vty, "%% Malformed address %s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  /* Check current interface address. */
-  ifc = connected_check (ifp, (struct prefix *) &cp);
-  if (! ifc)
-    {
-      vty_out (vty, "%% Can't find address%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  /* This is not configured address. */
-  if (! CHECK_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED))
-    return CMD_WARNING;
-
-  UNSET_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED);
-  
-  /* This is not real address or interface is not active. */
-  if (! CHECK_FLAG (ifc->conf, ZEBRA_IFC_QUEUED)
-      || ! CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE))
-    {
-      listnode_delete (ifp->connected, ifc);
-      connected_free (ifc);
-      return CMD_WARNING;
-    }
-
-  /* This is real route. */
-  ret = if_unset_prefix (ifp, ifc);
-  if (ret < 0)
-    {
-      vty_out (vty, "%% Can't unset interface IP address: %s.%s", 
-	       safe_strerror(errno), VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-  UNSET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
-  /* we will receive a kernel notification about this route being removed.
-   * this will trigger its removal from the connected list. */
-  return CMD_SUCCESS;
+	/* This address is configured from zebra. */
+	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED))
+		SET_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED);
+
+	/* In case of this route need to install kernel. */
+	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_QUEUED)
+	    && CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE)
+	    && !(if_data && if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON)) {
+		/* Some system need to up the interface to set IP address. */
+		if (!if_is_up(ifp)) {
+			if_set_flags(ifp, IFF_UP | IFF_RUNNING);
+			if_refresh(ifp);
+		}
+
+		ret = if_set_prefix(ifp, ifc);
+		if (ret < 0) {
+			vty_out(vty, "%% Can't set interface IP address: %s.%s",
+				safe_strerror(errno), VTY_NEWLINE);
+			return CMD_WARNING;
+		}
+
+		SET_FLAG(ifc->conf, ZEBRA_IFC_QUEUED);
+		/* The address will be advertised to zebra clients when the
+		 * notification
+		 * from the kernel has been received.
+		 * It will also be added to the subnet chain list, then. */
+	}
+
+	return CMD_SUCCESS;
+}
+
+static int ip_address_uninstall(struct vty *vty, struct interface *ifp,
+				const char *addr_str, const char *peer_str,
+				const char *label)
+{
+	struct prefix_ipv4 cp;
+	struct connected *ifc;
+	int ret;
+
+	/* Convert to prefix structure. */
+	ret = str2prefix_ipv4(addr_str, &cp);
+	if (ret <= 0) {
+		vty_out(vty, "%% Malformed address %s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* Check current interface address. */
+	ifc = connected_check(ifp, (struct prefix *)&cp);
+	if (!ifc) {
+		vty_out(vty, "%% Can't find address%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* This is not configured address. */
+	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED))
+		return CMD_WARNING;
+
+	UNSET_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED);
+
+	/* This is not real address or interface is not active. */
+	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_QUEUED)
+	    || !CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE)) {
+		listnode_delete(ifp->connected, ifc);
+		connected_free(ifc);
+		return CMD_WARNING;
+	}
+
+	/* This is real route. */
+	ret = if_unset_prefix(ifp, ifc);
+	if (ret < 0) {
+		vty_out(vty, "%% Can't unset interface IP address: %s.%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+	UNSET_FLAG(ifc->conf, ZEBRA_IFC_QUEUED);
+	/* we will receive a kernel notification about this route being removed.
+	 * this will trigger its removal from the connected list. */
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_address,
@@ -2517,9 +2455,10 @@ DEFUN (ip_address,
        "Set the IP address of an interface\n"
        "IP address (e.g. 10.0.0.1/8)\n")
 {
-  int idx_ipv4_prefixlen = 2;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  return ip_address_install (vty, ifp, argv[idx_ipv4_prefixlen]->arg, NULL, NULL);
+	int idx_ipv4_prefixlen = 2;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	return ip_address_install(vty, ifp, argv[idx_ipv4_prefixlen]->arg, NULL,
+				  NULL);
 }
 
 DEFUN (no_ip_address,
@@ -2530,9 +2469,10 @@ DEFUN (no_ip_address,
        "Set the IP address of an interface\n"
        "IP Address (e.g. 10.0.0.1/8)")
 {
-  int idx_ipv4_prefixlen = 3;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  return ip_address_uninstall (vty, ifp, argv[idx_ipv4_prefixlen]->arg, NULL, NULL);
+	int idx_ipv4_prefixlen = 3;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	return ip_address_uninstall(vty, ifp, argv[idx_ipv4_prefixlen]->arg,
+				    NULL, NULL);
 }
 
 
@@ -2546,10 +2486,11 @@ DEFUN (ip_address_label,
        "Label of this address\n"
        "Label\n")
 {
-  int idx_ipv4_prefixlen = 2;
-  int idx_line = 4;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  return ip_address_install (vty, ifp, argv[idx_ipv4_prefixlen]->arg, NULL, argv[idx_line]->arg);
+	int idx_ipv4_prefixlen = 2;
+	int idx_line = 4;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	return ip_address_install(vty, ifp, argv[idx_ipv4_prefixlen]->arg, NULL,
+				  argv[idx_line]->arg);
 }
 
 DEFUN (no_ip_address_label,
@@ -2562,162 +2503,152 @@ DEFUN (no_ip_address_label,
        "Label of this address\n"
        "Label\n")
 {
-  int idx_ipv4_prefixlen = 3;
-  int idx_line = 5;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  return ip_address_uninstall (vty, ifp, argv[idx_ipv4_prefixlen]->arg, NULL, argv[idx_line]->arg);
+	int idx_ipv4_prefixlen = 3;
+	int idx_line = 5;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	return ip_address_uninstall(vty, ifp, argv[idx_ipv4_prefixlen]->arg,
+				    NULL, argv[idx_line]->arg);
 }
 #endif /* HAVE_NETLINK */
 
-static int
-ipv6_address_install (struct vty *vty, struct interface *ifp,
-		      const char *addr_str, const char *peer_str,
-		      const char *label, int secondary)
-{
-  struct zebra_if *if_data;
-  struct prefix_ipv6 cp;
-  struct connected *ifc;
-  struct prefix_ipv6 *p;
-  int ret;
-
-  if_data = ifp->info;
-
-  ret = str2prefix_ipv6 (addr_str, &cp);
-  if (ret <= 0)
-    {
-      vty_out (vty, "%% Malformed address %s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  if (ipv6_martian(&cp.prefix))
-    {
-      vty_out (vty, "%% Invalid address%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  ifc = connected_check (ifp, (struct prefix *) &cp);
-  if (! ifc)
-    {
-      ifc = connected_new ();
-      ifc->ifp = ifp;
-
-      /* Address. */
-      p = prefix_ipv6_new ();
-      *p = cp;
-      ifc->address = (struct prefix *) p;
-
-      /* Secondary. */
-      if (secondary)
-	SET_FLAG (ifc->flags, ZEBRA_IFA_SECONDARY);
-
-      /* Label. */
-      if (label)
-	ifc->label = XSTRDUP (MTYPE_CONNECTED_LABEL, label);
-
-      /* Add to linked list. */
-      listnode_add (ifp->connected, ifc);
-    }
-
-  /* This address is configured from zebra. */
-  if (! CHECK_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED))
-    SET_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED);
-
-  /* In case of this route need to install kernel. */
-  if (! CHECK_FLAG (ifc->conf, ZEBRA_IFC_QUEUED)
-      && CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE)
-      && !(if_data && if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON))
-    {
-      /* Some system need to up the interface to set IP address. */
-      if (! if_is_up (ifp))
-	{
-	  if_set_flags (ifp, IFF_UP | IFF_RUNNING);
-	  if_refresh (ifp);
+static int ipv6_address_install(struct vty *vty, struct interface *ifp,
+				const char *addr_str, const char *peer_str,
+				const char *label, int secondary)
+{
+	struct zebra_if *if_data;
+	struct prefix_ipv6 cp;
+	struct connected *ifc;
+	struct prefix_ipv6 *p;
+	int ret;
+
+	if_data = ifp->info;
+
+	ret = str2prefix_ipv6(addr_str, &cp);
+	if (ret <= 0) {
+		vty_out(vty, "%% Malformed address %s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	if (ipv6_martian(&cp.prefix)) {
+		vty_out(vty, "%% Invalid address%s", VTY_NEWLINE);
+		return CMD_WARNING;
 	}
 
-      ret = if_prefix_add_ipv6 (ifp, ifc);
+	ifc = connected_check(ifp, (struct prefix *)&cp);
+	if (!ifc) {
+		ifc = connected_new();
+		ifc->ifp = ifp;
 
-      if (ret < 0)
-	{
-	  vty_out (vty, "%% Can't set interface IP address: %s.%s", 
-		   safe_strerror(errno), VTY_NEWLINE);
-	  return CMD_WARNING;
+		/* Address. */
+		p = prefix_ipv6_new();
+		*p = cp;
+		ifc->address = (struct prefix *)p;
+
+		/* Secondary. */
+		if (secondary)
+			SET_FLAG(ifc->flags, ZEBRA_IFA_SECONDARY);
+
+		/* Label. */
+		if (label)
+			ifc->label = XSTRDUP(MTYPE_CONNECTED_LABEL, label);
+
+		/* Add to linked list. */
+		listnode_add(ifp->connected, ifc);
 	}
 
-      SET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
-      /* The address will be advertised to zebra clients when the notification
-       * from the kernel has been received. */
-    }
+	/* This address is configured from zebra. */
+	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED))
+		SET_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED);
+
+	/* In case of this route need to install kernel. */
+	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_QUEUED)
+	    && CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE)
+	    && !(if_data && if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON)) {
+		/* Some system need to up the interface to set IP address. */
+		if (!if_is_up(ifp)) {
+			if_set_flags(ifp, IFF_UP | IFF_RUNNING);
+			if_refresh(ifp);
+		}
 
-  return CMD_SUCCESS;
+		ret = if_prefix_add_ipv6(ifp, ifc);
+
+		if (ret < 0) {
+			vty_out(vty, "%% Can't set interface IP address: %s.%s",
+				safe_strerror(errno), VTY_NEWLINE);
+			return CMD_WARNING;
+		}
+
+		SET_FLAG(ifc->conf, ZEBRA_IFC_QUEUED);
+		/* The address will be advertised to zebra clients when the
+		 * notification
+		 * from the kernel has been received. */
+	}
+
+	return CMD_SUCCESS;
 }
 
 /* Return true if an ipv6 address is configured on ifp */
-int
-ipv6_address_configured (struct interface *ifp)
-{
-  struct connected *connected;
-  struct listnode *node;
-
-  for (ALL_LIST_ELEMENTS_RO (ifp->connected, node, connected))
-    if (CHECK_FLAG (connected->conf, ZEBRA_IFC_REAL) && (connected->address->family == AF_INET6))
-      return 1;
-
-  return 0;
-}
-
-static int
-ipv6_address_uninstall (struct vty *vty, struct interface *ifp,
-			const char *addr_str, const char *peer_str,
-			const char *label, int secondry)
-{
-  struct prefix_ipv6 cp;
-  struct connected *ifc;
-  int ret;
-
-  /* Convert to prefix structure. */
-  ret = str2prefix_ipv6 (addr_str, &cp);
-  if (ret <= 0)
-    {
-      vty_out (vty, "%% Malformed address %s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  /* Check current interface address. */
-  ifc = connected_check (ifp, (struct prefix *) &cp);
-  if (! ifc)
-    {
-      vty_out (vty, "%% Can't find address%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  /* This is not configured address. */
-  if (! CHECK_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED))
-    return CMD_WARNING;
-
-  UNSET_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED);
-
-  /* This is not real address or interface is not active. */
-  if (! CHECK_FLAG (ifc->conf, ZEBRA_IFC_QUEUED)
-      || ! CHECK_FLAG (ifp->status, ZEBRA_INTERFACE_ACTIVE))
-    {
-      listnode_delete (ifp->connected, ifc);
-      connected_free (ifc);
-      return CMD_WARNING;
-    }
-
-  /* This is real route. */
-  ret = if_prefix_delete_ipv6 (ifp, ifc);
-  if (ret < 0)
-    {
-      vty_out (vty, "%% Can't unset interface IP address: %s.%s", 
-	       safe_strerror(errno), VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  UNSET_FLAG (ifc->conf, ZEBRA_IFC_QUEUED);
-  /* This information will be propagated to the zclients when the
-   * kernel notification is received. */
-  return CMD_SUCCESS;
+int ipv6_address_configured(struct interface *ifp)
+{
+	struct connected *connected;
+	struct listnode *node;
+
+	for (ALL_LIST_ELEMENTS_RO(ifp->connected, node, connected))
+		if (CHECK_FLAG(connected->conf, ZEBRA_IFC_REAL)
+		    && (connected->address->family == AF_INET6))
+			return 1;
+
+	return 0;
+}
+
+static int ipv6_address_uninstall(struct vty *vty, struct interface *ifp,
+				  const char *addr_str, const char *peer_str,
+				  const char *label, int secondry)
+{
+	struct prefix_ipv6 cp;
+	struct connected *ifc;
+	int ret;
+
+	/* Convert to prefix structure. */
+	ret = str2prefix_ipv6(addr_str, &cp);
+	if (ret <= 0) {
+		vty_out(vty, "%% Malformed address %s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* Check current interface address. */
+	ifc = connected_check(ifp, (struct prefix *)&cp);
+	if (!ifc) {
+		vty_out(vty, "%% Can't find address%s", VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* This is not configured address. */
+	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED))
+		return CMD_WARNING;
+
+	UNSET_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED);
+
+	/* This is not real address or interface is not active. */
+	if (!CHECK_FLAG(ifc->conf, ZEBRA_IFC_QUEUED)
+	    || !CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE)) {
+		listnode_delete(ifp->connected, ifc);
+		connected_free(ifc);
+		return CMD_WARNING;
+	}
+
+	/* This is real route. */
+	ret = if_prefix_delete_ipv6(ifp, ifc);
+	if (ret < 0) {
+		vty_out(vty, "%% Can't unset interface IP address: %s.%s",
+			safe_strerror(errno), VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	UNSET_FLAG(ifc->conf, ZEBRA_IFC_QUEUED);
+	/* This information will be propagated to the zclients when the
+	 * kernel notification is received. */
+	return CMD_SUCCESS;
 }
 
 DEFUN (ipv6_address,
@@ -2727,9 +2658,10 @@ DEFUN (ipv6_address,
        "Set the IP address of an interface\n"
        "IPv6 address (e.g. 3ffe:506::1/48)\n")
 {
-  int idx_ipv6_prefixlen = 2;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  return ipv6_address_install (vty, ifp, argv[idx_ipv6_prefixlen]->arg, NULL, NULL, 0);
+	int idx_ipv6_prefixlen = 2;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	return ipv6_address_install(vty, ifp, argv[idx_ipv6_prefixlen]->arg,
+				    NULL, NULL, 0);
 }
 
 DEFUN (no_ipv6_address,
@@ -2740,212 +2672,210 @@ DEFUN (no_ipv6_address,
        "Set the IP address of an interface\n"
        "IPv6 address (e.g. 3ffe:506::1/48)\n")
 {
-  int idx_ipv6_prefixlen = 3;
-  VTY_DECLVAR_CONTEXT (interface, ifp);
-  return ipv6_address_uninstall (vty, ifp, argv[idx_ipv6_prefixlen]->arg, NULL, NULL, 0);
-}
-
-static int
-link_params_config_write (struct vty *vty, struct interface *ifp)
-{
-  int i;
-
-  if ((ifp == NULL) || !HAS_LINK_PARAMS(ifp))
-    return -1;
-
-  struct if_link_params *iflp = ifp->link_params;
-
-  vty_out (vty, " link-params%s", VTY_NEWLINE);
-  vty_out(vty, "  enable%s", VTY_NEWLINE);
-  if (IS_PARAM_SET(iflp, LP_TE_METRIC) && iflp->te_metric != ifp->metric)
-    vty_out(vty, "  metric %u%s",iflp->te_metric, VTY_NEWLINE);
-  if (IS_PARAM_SET(iflp, LP_MAX_BW) && iflp->max_bw != iflp->default_bw)
-    vty_out(vty, "  max-bw %g%s", iflp->max_bw, VTY_NEWLINE);
-  if (IS_PARAM_SET(iflp, LP_MAX_RSV_BW) && iflp->max_rsv_bw != iflp->default_bw)
-    vty_out(vty, "  max-rsv-bw %g%s", iflp->max_rsv_bw, VTY_NEWLINE);
-  if (IS_PARAM_SET(iflp, LP_UNRSV_BW))
-    {
-      for (i = 0; i < 8; i++)
-	if (iflp->unrsv_bw[i] != iflp->default_bw)
-	  vty_out(vty, "  unrsv-bw %d %g%s",
-		  i, iflp->unrsv_bw[i], VTY_NEWLINE);
-    }
-  if (IS_PARAM_SET(iflp, LP_ADM_GRP))
-    vty_out(vty, "  admin-grp 0x%x%s", iflp->admin_grp, VTY_NEWLINE);
-  if (IS_PARAM_SET(iflp, LP_DELAY))
-    {
-      vty_out(vty, "  delay %u", iflp->av_delay);
-      if (IS_PARAM_SET(iflp, LP_MM_DELAY))
-        {
-          vty_out(vty, " min %u", iflp->min_delay);
-          vty_out(vty, " max %u", iflp->max_delay);
-        }
-      vty_out(vty, "%s", VTY_NEWLINE);
-    }
-  if (IS_PARAM_SET(iflp, LP_DELAY_VAR))
-    vty_out(vty, "  delay-variation %u%s", iflp->delay_var, VTY_NEWLINE);
-  if (IS_PARAM_SET(iflp, LP_PKT_LOSS))
-    vty_out(vty, "  packet-loss %g%s", iflp->pkt_loss, VTY_NEWLINE);
-  if (IS_PARAM_SET(iflp, LP_AVA_BW))
-    vty_out(vty, "  ava-bw %g%s", iflp->ava_bw, VTY_NEWLINE);
-  if (IS_PARAM_SET(iflp, LP_RES_BW))
-    vty_out(vty, "  res-bw %g%s", iflp->res_bw, VTY_NEWLINE);
-  if (IS_PARAM_SET(iflp, LP_USE_BW))
-    vty_out(vty, "  use-bw %g%s", iflp->use_bw, VTY_NEWLINE);
-  if (IS_PARAM_SET(iflp, LP_RMT_AS))
-    vty_out(vty, "  neighbor %s as %u%s", inet_ntoa(iflp->rmt_ip),
-        iflp->rmt_as, VTY_NEWLINE);
-  vty_out(vty, "  exit-link-params%s", VTY_NEWLINE);
-  return 0;
-}
-
-static int
-if_config_write (struct vty *vty)
-{
-  struct vrf *vrf;
-  struct listnode *node;
-  struct interface *ifp;
-
-  zebra_ptm_write (vty);
-
-  RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name)
-  for (ALL_LIST_ELEMENTS_RO (vrf->iflist, node, ifp))
-    {
-      struct zebra_if *if_data;
-      struct listnode *addrnode;
-      struct connected *ifc;
-      struct prefix *p;
-      struct vrf *vrf;
-
-      if_data = ifp->info;
-      vrf = vrf_lookup_by_id (ifp->vrf_id);
-
-      if (ifp->vrf_id == VRF_DEFAULT)
-        vty_out (vty, "interface %s%s", ifp->name, VTY_NEWLINE);
-      else
-        vty_out (vty, "interface %s vrf %s%s", ifp->name, vrf->name,
-                 VTY_NEWLINE);
-
-      if (if_data)
-	{
-	  if (if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON)
-	    vty_out (vty, " shutdown%s", VTY_NEWLINE);
+	int idx_ipv6_prefixlen = 3;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	return ipv6_address_uninstall(vty, ifp, argv[idx_ipv6_prefixlen]->arg,
+				      NULL, NULL, 0);
+}
+
+static int link_params_config_write(struct vty *vty, struct interface *ifp)
+{
+	int i;
 
-          zebra_ptm_if_write(vty, if_data);
+	if ((ifp == NULL) || !HAS_LINK_PARAMS(ifp))
+		return -1;
+
+	struct if_link_params *iflp = ifp->link_params;
+
+	vty_out(vty, " link-params%s", VTY_NEWLINE);
+	vty_out(vty, "  enable%s", VTY_NEWLINE);
+	if (IS_PARAM_SET(iflp, LP_TE_METRIC) && iflp->te_metric != ifp->metric)
+		vty_out(vty, "  metric %u%s", iflp->te_metric, VTY_NEWLINE);
+	if (IS_PARAM_SET(iflp, LP_MAX_BW) && iflp->max_bw != iflp->default_bw)
+		vty_out(vty, "  max-bw %g%s", iflp->max_bw, VTY_NEWLINE);
+	if (IS_PARAM_SET(iflp, LP_MAX_RSV_BW)
+	    && iflp->max_rsv_bw != iflp->default_bw)
+		vty_out(vty, "  max-rsv-bw %g%s", iflp->max_rsv_bw,
+			VTY_NEWLINE);
+	if (IS_PARAM_SET(iflp, LP_UNRSV_BW)) {
+		for (i = 0; i < 8; i++)
+			if (iflp->unrsv_bw[i] != iflp->default_bw)
+				vty_out(vty, "  unrsv-bw %d %g%s", i,
+					iflp->unrsv_bw[i], VTY_NEWLINE);
+	}
+	if (IS_PARAM_SET(iflp, LP_ADM_GRP))
+		vty_out(vty, "  admin-grp 0x%x%s", iflp->admin_grp,
+			VTY_NEWLINE);
+	if (IS_PARAM_SET(iflp, LP_DELAY)) {
+		vty_out(vty, "  delay %u", iflp->av_delay);
+		if (IS_PARAM_SET(iflp, LP_MM_DELAY)) {
+			vty_out(vty, " min %u", iflp->min_delay);
+			vty_out(vty, " max %u", iflp->max_delay);
+		}
+		vty_out(vty, "%s", VTY_NEWLINE);
 	}
+	if (IS_PARAM_SET(iflp, LP_DELAY_VAR))
+		vty_out(vty, "  delay-variation %u%s", iflp->delay_var,
+			VTY_NEWLINE);
+	if (IS_PARAM_SET(iflp, LP_PKT_LOSS))
+		vty_out(vty, "  packet-loss %g%s", iflp->pkt_loss, VTY_NEWLINE);
+	if (IS_PARAM_SET(iflp, LP_AVA_BW))
+		vty_out(vty, "  ava-bw %g%s", iflp->ava_bw, VTY_NEWLINE);
+	if (IS_PARAM_SET(iflp, LP_RES_BW))
+		vty_out(vty, "  res-bw %g%s", iflp->res_bw, VTY_NEWLINE);
+	if (IS_PARAM_SET(iflp, LP_USE_BW))
+		vty_out(vty, "  use-bw %g%s", iflp->use_bw, VTY_NEWLINE);
+	if (IS_PARAM_SET(iflp, LP_RMT_AS))
+		vty_out(vty, "  neighbor %s as %u%s", inet_ntoa(iflp->rmt_ip),
+			iflp->rmt_as, VTY_NEWLINE);
+	vty_out(vty, "  exit-link-params%s", VTY_NEWLINE);
+	return 0;
+}
+
+static int if_config_write(struct vty *vty)
+{
+	struct vrf *vrf;
+	struct listnode *node;
+	struct interface *ifp;
+
+	zebra_ptm_write(vty);
+
+	RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
+	for (ALL_LIST_ELEMENTS_RO(vrf->iflist, node, ifp)) {
+		struct zebra_if *if_data;
+		struct listnode *addrnode;
+		struct connected *ifc;
+		struct prefix *p;
+		struct vrf *vrf;
+
+		if_data = ifp->info;
+		vrf = vrf_lookup_by_id(ifp->vrf_id);
+
+		if (ifp->vrf_id == VRF_DEFAULT)
+			vty_out(vty, "interface %s%s", ifp->name, VTY_NEWLINE);
+		else
+			vty_out(vty, "interface %s vrf %s%s", ifp->name,
+				vrf->name, VTY_NEWLINE);
+
+		if (if_data) {
+			if (if_data->shutdown == IF_ZEBRA_SHUTDOWN_ON)
+				vty_out(vty, " shutdown%s", VTY_NEWLINE);
+
+			zebra_ptm_if_write(vty, if_data);
+		}
 
-      if (ifp->desc)
-	vty_out (vty, " description %s%s", ifp->desc,
-		 VTY_NEWLINE);
+		if (ifp->desc)
+			vty_out(vty, " description %s%s", ifp->desc,
+				VTY_NEWLINE);
 
-      /* Assign bandwidth here to avoid unnecessary interface flap
-	 while processing config script */
-      if (ifp->bandwidth != 0)
-	vty_out(vty, " bandwidth %u%s", ifp->bandwidth, VTY_NEWLINE); 
+		/* Assign bandwidth here to avoid unnecessary interface flap
+		   while processing config script */
+		if (ifp->bandwidth != 0)
+			vty_out(vty, " bandwidth %u%s", ifp->bandwidth,
+				VTY_NEWLINE);
 
-      if (!CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION))
-        vty_out(vty, " no link-detect%s", VTY_NEWLINE);
+		if (!CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_LINKDETECTION))
+			vty_out(vty, " no link-detect%s", VTY_NEWLINE);
 
-      for (ALL_LIST_ELEMENTS_RO (ifp->connected, addrnode, ifc))
-	  {
-	    if (CHECK_FLAG (ifc->conf, ZEBRA_IFC_CONFIGURED))
-	      {
-		char buf[INET6_ADDRSTRLEN];
-		p = ifc->address;
-		vty_out (vty, " ip%s address %s",
-			 p->family == AF_INET ? "" : "v6",
-			 prefix2str (p, buf, sizeof(buf)));
+		for (ALL_LIST_ELEMENTS_RO(ifp->connected, addrnode, ifc)) {
+			if (CHECK_FLAG(ifc->conf, ZEBRA_IFC_CONFIGURED)) {
+				char buf[INET6_ADDRSTRLEN];
+				p = ifc->address;
+				vty_out(vty, " ip%s address %s",
+					p->family == AF_INET ? "" : "v6",
+					prefix2str(p, buf, sizeof(buf)));
 
-		if (ifc->label)
-		  vty_out (vty, " label %s", ifc->label);
+				if (ifc->label)
+					vty_out(vty, " label %s", ifc->label);
 
-		vty_out (vty, "%s", VTY_NEWLINE);
-	      }
-	  }
+				vty_out(vty, "%s", VTY_NEWLINE);
+			}
+		}
 
-      if (if_data)
-	{
-	  if (if_data->multicast != IF_ZEBRA_MULTICAST_UNSPEC)
-	    vty_out (vty, " %smulticast%s",
-		     if_data->multicast == IF_ZEBRA_MULTICAST_ON ? "" : "no ",
-		     VTY_NEWLINE);
-	}
+		if (if_data) {
+			if (if_data->multicast != IF_ZEBRA_MULTICAST_UNSPEC)
+				vty_out(vty, " %smulticast%s",
+					if_data->multicast
+							== IF_ZEBRA_MULTICAST_ON
+						? ""
+						: "no ",
+					VTY_NEWLINE);
+		}
 
-#if defined (HAVE_RTADV)
-      rtadv_config_write (vty, ifp);
+#if defined(HAVE_RTADV)
+		rtadv_config_write(vty, ifp);
 #endif /* HAVE_RTADV */
 
 #ifdef HAVE_IRDP
-      irdp_config_write (vty, ifp);
+		irdp_config_write(vty, ifp);
 #endif /* IRDP */
 
-      link_params_config_write (vty, ifp);
+		link_params_config_write(vty, ifp);
 
-      vty_out (vty, "!%s", VTY_NEWLINE);
-    }
-  return 0;
+		vty_out(vty, "!%s", VTY_NEWLINE);
+	}
+	return 0;
 }
 
 /* Allocate and initialize interface vector. */
-void
-zebra_if_init (void)
-{
-  /* Initialize interface and new hook. */
-  if_add_hook (IF_NEW_HOOK, if_zebra_new_hook);
-  if_add_hook (IF_DELETE_HOOK, if_zebra_delete_hook);
-  
-  /* Install configuration write function. */
-  install_node (&interface_node, if_config_write);
-  install_node (&link_params_node, NULL);
-  if_cmd_init ();
-
-  install_element (VIEW_NODE, &show_interface_cmd);
-  install_element (VIEW_NODE, &show_interface_vrf_all_cmd);
-  install_element (VIEW_NODE, &show_interface_name_vrf_cmd);
-  install_element (VIEW_NODE, &show_interface_name_vrf_all_cmd);
-
-  install_element (ENABLE_NODE, &show_interface_desc_cmd);
-  install_element (ENABLE_NODE, &show_interface_desc_vrf_all_cmd);
-  install_element (INTERFACE_NODE, &multicast_cmd);
-  install_element (INTERFACE_NODE, &no_multicast_cmd);
-  install_element (INTERFACE_NODE, &linkdetect_cmd);
-  install_element (INTERFACE_NODE, &no_linkdetect_cmd);
-  install_element (INTERFACE_NODE, &shutdown_if_cmd);
-  install_element (INTERFACE_NODE, &no_shutdown_if_cmd);
-  install_element (INTERFACE_NODE, &bandwidth_if_cmd);
-  install_element (INTERFACE_NODE, &no_bandwidth_if_cmd);
-  install_element (INTERFACE_NODE, &ip_address_cmd);
-  install_element (INTERFACE_NODE, &no_ip_address_cmd);
-  install_element (INTERFACE_NODE, &ipv6_address_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_address_cmd);
+void zebra_if_init(void)
+{
+	/* Initialize interface and new hook. */
+	if_add_hook(IF_NEW_HOOK, if_zebra_new_hook);
+	if_add_hook(IF_DELETE_HOOK, if_zebra_delete_hook);
+
+	/* Install configuration write function. */
+	install_node(&interface_node, if_config_write);
+	install_node(&link_params_node, NULL);
+	if_cmd_init();
+
+	install_element(VIEW_NODE, &show_interface_cmd);
+	install_element(VIEW_NODE, &show_interface_vrf_all_cmd);
+	install_element(VIEW_NODE, &show_interface_name_vrf_cmd);
+	install_element(VIEW_NODE, &show_interface_name_vrf_all_cmd);
+
+	install_element(ENABLE_NODE, &show_interface_desc_cmd);
+	install_element(ENABLE_NODE, &show_interface_desc_vrf_all_cmd);
+	install_element(INTERFACE_NODE, &multicast_cmd);
+	install_element(INTERFACE_NODE, &no_multicast_cmd);
+	install_element(INTERFACE_NODE, &linkdetect_cmd);
+	install_element(INTERFACE_NODE, &no_linkdetect_cmd);
+	install_element(INTERFACE_NODE, &shutdown_if_cmd);
+	install_element(INTERFACE_NODE, &no_shutdown_if_cmd);
+	install_element(INTERFACE_NODE, &bandwidth_if_cmd);
+	install_element(INTERFACE_NODE, &no_bandwidth_if_cmd);
+	install_element(INTERFACE_NODE, &ip_address_cmd);
+	install_element(INTERFACE_NODE, &no_ip_address_cmd);
+	install_element(INTERFACE_NODE, &ipv6_address_cmd);
+	install_element(INTERFACE_NODE, &no_ipv6_address_cmd);
 #ifdef HAVE_NETLINK
-  install_element (INTERFACE_NODE, &ip_address_label_cmd);
-  install_element (INTERFACE_NODE, &no_ip_address_label_cmd);
+	install_element(INTERFACE_NODE, &ip_address_label_cmd);
+	install_element(INTERFACE_NODE, &no_ip_address_label_cmd);
 #endif /* HAVE_NETLINK */
-  install_element(INTERFACE_NODE, &link_params_cmd);
-  install_default(LINK_PARAMS_NODE);
-  install_element(LINK_PARAMS_NODE, &link_params_enable_cmd);
-  install_element(LINK_PARAMS_NODE, &no_link_params_enable_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_metric_cmd);
-  install_element(LINK_PARAMS_NODE, &no_link_params_metric_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_maxbw_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_max_rsv_bw_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_unrsv_bw_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_admin_grp_cmd);
-  install_element(LINK_PARAMS_NODE, &no_link_params_admin_grp_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_inter_as_cmd);
-  install_element(LINK_PARAMS_NODE, &no_link_params_inter_as_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_delay_cmd);
-  install_element(LINK_PARAMS_NODE, &no_link_params_delay_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_delay_var_cmd);
-  install_element(LINK_PARAMS_NODE, &no_link_params_delay_var_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_pkt_loss_cmd);
-  install_element(LINK_PARAMS_NODE, &no_link_params_pkt_loss_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_ava_bw_cmd);
-  install_element(LINK_PARAMS_NODE, &no_link_params_ava_bw_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_res_bw_cmd);
-  install_element(LINK_PARAMS_NODE, &no_link_params_res_bw_cmd);
-  install_element(LINK_PARAMS_NODE, &link_params_use_bw_cmd);
-  install_element(LINK_PARAMS_NODE, &no_link_params_use_bw_cmd);
-  install_element(LINK_PARAMS_NODE, &exit_link_params_cmd);
+	install_element(INTERFACE_NODE, &link_params_cmd);
+	install_default(LINK_PARAMS_NODE);
+	install_element(LINK_PARAMS_NODE, &link_params_enable_cmd);
+	install_element(LINK_PARAMS_NODE, &no_link_params_enable_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_metric_cmd);
+	install_element(LINK_PARAMS_NODE, &no_link_params_metric_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_maxbw_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_max_rsv_bw_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_unrsv_bw_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_admin_grp_cmd);
+	install_element(LINK_PARAMS_NODE, &no_link_params_admin_grp_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_inter_as_cmd);
+	install_element(LINK_PARAMS_NODE, &no_link_params_inter_as_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_delay_cmd);
+	install_element(LINK_PARAMS_NODE, &no_link_params_delay_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_delay_var_cmd);
+	install_element(LINK_PARAMS_NODE, &no_link_params_delay_var_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_pkt_loss_cmd);
+	install_element(LINK_PARAMS_NODE, &no_link_params_pkt_loss_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_ava_bw_cmd);
+	install_element(LINK_PARAMS_NODE, &no_link_params_ava_bw_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_res_bw_cmd);
+	install_element(LINK_PARAMS_NODE, &no_link_params_res_bw_cmd);
+	install_element(LINK_PARAMS_NODE, &link_params_use_bw_cmd);
+	install_element(LINK_PARAMS_NODE, &no_link_params_use_bw_cmd);
+	install_element(LINK_PARAMS_NODE, &exit_link_params_cmd);
 }