]> git.proxmox.com Git - mirror_frr.git/blobdiff - ospf6d/ospf6_interface.c
*: reindent
[mirror_frr.git] / ospf6d / ospf6_interface.c
index d09f8b313689b7106c1a029367f79062e7209d3b..6b443127ca38b630c12b88194cae108b462837c0 100644 (file)
@@ -14,9 +14,9 @@
  * General Public License for more details.
  *
  * 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.  
+ * 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.
  */
 
 #include <zebra.h>
 #include "ospf6d.h"
 #include "ospf6_bfd.h"
 
+DEFINE_MTYPE_STATIC(OSPF6D, CFG_PLIST_NAME, "configured prefix list names")
+DEFINE_QOBJ_TYPE(ospf6_interface)
+DEFINE_HOOK(ospf6_interface_change,
+           (struct ospf6_interface * oi, int state, int old_state),
+           (oi, state, old_state))
+
 unsigned char conf_debug_ospf6_interface = 0;
 
-const char *ospf6_interface_state_str[] =
-{
-  "None",
-  "Down",
-  "Loopback",
-  "Waiting",
-  "PointToPoint",
-  "DROther",
-  "BDR",
-  "DR",
-  NULL
-};
+const char *ospf6_interface_state_str[] = {
+       "None",    "Down", "Loopback", "Waiting", "PointToPoint",
+       "DROther", "BDR",  "DR",       NULL};
 
-struct ospf6_interface *
-ospf6_interface_lookup_by_ifindex (int ifindex)
+struct ospf6_interface *ospf6_interface_lookup_by_ifindex(ifindex_t ifindex)
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
+       struct ospf6_interface *oi;
+       struct interface *ifp;
 
-  ifp = if_lookup_by_index (ifindex);
-  if (ifp == NULL)
-    return (struct ospf6_interface *) NULL;
+       ifp = if_lookup_by_index(ifindex, VRF_DEFAULT);
+       if (ifp == NULL)
+               return (struct ospf6_interface *)NULL;
 
-  oi = (struct ospf6_interface *) ifp->info;
-  return oi;
+       oi = (struct ospf6_interface *)ifp->info;
+       return oi;
 }
 
 /* schedule routing table recalculation */
-static void
-ospf6_interface_lsdb_hook (struct ospf6_lsa *lsa, unsigned int reason)
+static void ospf6_interface_lsdb_hook(struct ospf6_lsa *lsa,
+                                     unsigned int reason)
 {
-  struct ospf6_interface *oi;
-
-  if (lsa == NULL)
-    return;
-
-  oi = lsa->lsdb->data;
-  switch (ntohs (lsa->header->type))
-    {
-      case OSPF6_LSTYPE_LINK:
-        if (oi->state == OSPF6_INTERFACE_DR)
-          OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT (oi);
-        if (oi->area)
-          ospf6_spf_schedule (oi->area->ospf6, reason);
-        break;
-
-      default:
-        break;
-    }
+       struct ospf6_interface *oi;
+
+       if (lsa == NULL)
+               return;
+
+       oi = lsa->lsdb->data;
+       switch (ntohs(lsa->header->type)) {
+       case OSPF6_LSTYPE_LINK:
+               if (oi->state == OSPF6_INTERFACE_DR)
+                       OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT(oi);
+               if (oi->area)
+                       ospf6_spf_schedule(oi->area->ospf6, reason);
+               break;
+
+       default:
+               break;
+       }
 }
 
-static void
-ospf6_interface_lsdb_hook_add (struct ospf6_lsa *lsa)
+static void ospf6_interface_lsdb_hook_add(struct ospf6_lsa *lsa)
 {
-  ospf6_interface_lsdb_hook(lsa, ospf6_lsadd_to_spf_reason(lsa));
+       ospf6_interface_lsdb_hook(lsa, ospf6_lsadd_to_spf_reason(lsa));
 }
 
-static void
-ospf6_interface_lsdb_hook_remove (struct ospf6_lsa *lsa)
+static void ospf6_interface_lsdb_hook_remove(struct ospf6_lsa *lsa)
 {
-  ospf6_interface_lsdb_hook(lsa, ospf6_lsremove_to_spf_reason(lsa));
+       ospf6_interface_lsdb_hook(lsa, ospf6_lsremove_to_spf_reason(lsa));
 }
 
-static u_char
-ospf6_default_iftype(struct interface *ifp)
+static u_char ospf6_default_iftype(struct interface *ifp)
 {
-  if (if_is_pointopoint (ifp))
-    return OSPF_IFTYPE_POINTOPOINT;
-  else if (if_is_loopback (ifp))
-    return OSPF_IFTYPE_LOOPBACK;
-  else
-    return OSPF_IFTYPE_BROADCAST;
+       if (if_is_pointopoint(ifp))
+               return OSPF_IFTYPE_POINTOPOINT;
+       else if (if_is_loopback(ifp))
+               return OSPF_IFTYPE_LOOPBACK;
+       else
+               return OSPF_IFTYPE_BROADCAST;
 }
 
-static u_int32_t
-ospf6_interface_get_cost (struct ospf6_interface *oi)
+static u_int32_t ospf6_interface_get_cost(struct ospf6_interface *oi)
 {
-  /* If all else fails, use default OSPF cost */
-  u_int32_t cost;
-  u_int32_t bw, refbw;
-
-  bw = oi->interface->bandwidth ? oi->interface->bandwidth : OSPF6_INTERFACE_BANDWIDTH;
-  refbw = ospf6 ? ospf6->ref_bandwidth : OSPF6_REFERENCE_BANDWIDTH;
-
-  /* A specifed ip ospf cost overrides a calculated one. */
-  if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_NOAUTOCOST))
-    cost = oi->cost;
-  else
-    {
-      cost = (u_int32_t) ((double)refbw / (double)bw + (double)0.5);
-      if (cost < 1) cost = 1;
-      else if (cost > UINT32_MAX) cost = UINT32_MAX;
-    }
-
-  return cost;
+       /* If all else fails, use default OSPF cost */
+       u_int32_t cost;
+       u_int32_t bw, refbw;
+
+       bw = oi->interface->bandwidth ? oi->interface->bandwidth
+                                     : OSPF6_INTERFACE_BANDWIDTH;
+       refbw = ospf6 ? ospf6->ref_bandwidth : OSPF6_REFERENCE_BANDWIDTH;
+
+       /* A specifed ip ospf cost overrides a calculated one. */
+       if (CHECK_FLAG(oi->flag, OSPF6_INTERFACE_NOAUTOCOST))
+               cost = oi->cost;
+       else {
+               cost = (u_int32_t)((double)refbw / (double)bw + (double)0.5);
+               if (cost < 1)
+                       cost = 1;
+               else if (cost > UINT32_MAX)
+                       cost = UINT32_MAX;
+       }
+
+       return cost;
 }
 
-static void
-ospf6_interface_recalculate_cost (struct ospf6_interface *oi)
+static void ospf6_interface_recalculate_cost(struct ospf6_interface *oi)
 {
-  u_int32_t newcost;
-
-  newcost = ospf6_interface_get_cost (oi);
-  if (newcost == oi->cost) return;
-  oi->cost = newcost;
-
-  /* update cost held in route_connected list in ospf6_interface */
-  ospf6_interface_connected_route_update (oi->interface);
-
-  /* execute LSA hooks */
-  if (oi->area)
-    {
-      OSPF6_LINK_LSA_SCHEDULE (oi);
-      OSPF6_ROUTER_LSA_SCHEDULE (oi->area);
-      OSPF6_NETWORK_LSA_SCHEDULE (oi);
-      OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT (oi);
-      OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area);
-    }
+       u_int32_t newcost;
+
+       newcost = ospf6_interface_get_cost(oi);
+       if (newcost == oi->cost)
+               return;
+       oi->cost = newcost;
+
+       /* update cost held in route_connected list in ospf6_interface */
+       ospf6_interface_connected_route_update(oi->interface);
+
+       /* execute LSA hooks */
+       if (oi->area) {
+               OSPF6_LINK_LSA_SCHEDULE(oi);
+               OSPF6_ROUTER_LSA_SCHEDULE(oi->area);
+               OSPF6_NETWORK_LSA_SCHEDULE(oi);
+               OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT(oi);
+               OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(oi->area);
+       }
 }
 
 /* Create new ospf6 interface structure */
-struct ospf6_interface *
-ospf6_interface_create (struct interface *ifp)
+struct ospf6_interface *ospf6_interface_create(struct interface *ifp)
 {
-  struct ospf6_interface *oi;
-  unsigned int iobuflen;
-
-  oi = (struct ospf6_interface *)
-    XCALLOC (MTYPE_OSPF6_IF, sizeof (struct ospf6_interface));
-
-  if (!oi)
-    {
-      zlog_err ("Can't malloc ospf6_interface for ifindex %d", ifp->ifindex);
-      return (struct ospf6_interface *) NULL;
-    }
-
-  oi->area = (struct ospf6_area *) NULL;
-  oi->neighbor_list = list_new ();
-  oi->neighbor_list->cmp = ospf6_neighbor_cmp;
-  oi->linklocal_addr = (struct in6_addr *) NULL;
-  oi->instance_id = OSPF6_INTERFACE_INSTANCE_ID;
-  oi->transdelay = OSPF6_INTERFACE_TRANSDELAY;
-  oi->priority = OSPF6_INTERFACE_PRIORITY;
-
-  oi->hello_interval = OSPF_HELLO_INTERVAL_DEFAULT;
-  oi->dead_interval = OSPF_ROUTER_DEAD_INTERVAL_DEFAULT;
-  oi->rxmt_interval = OSPF_RETRANSMIT_INTERVAL_DEFAULT;
-  oi->type = ospf6_default_iftype (ifp);
-  oi->state = OSPF6_INTERFACE_DOWN;
-  oi->flag = 0;
-  oi->mtu_ignore = 0;
-
-  /* Try to adjust I/O buffer size with IfMtu */
-  oi->ifmtu = ifp->mtu6;
-  iobuflen = ospf6_iobuf_size (ifp->mtu6);
-  if (oi->ifmtu > iobuflen)
-    {
-      if (IS_OSPF6_DEBUG_INTERFACE)
-        zlog_debug ("Interface %s: IfMtu is adjusted to I/O buffer size: %d.",
-                   ifp->name, iobuflen);
-      oi->ifmtu = iobuflen;
-    }
-
-  oi->lsupdate_list = ospf6_lsdb_create (oi);
-  oi->lsack_list = ospf6_lsdb_create (oi);
-  oi->lsdb = ospf6_lsdb_create (oi);
-  oi->lsdb->hook_add = ospf6_interface_lsdb_hook_add;
-  oi->lsdb->hook_remove = ospf6_interface_lsdb_hook_remove;
-  oi->lsdb_self = ospf6_lsdb_create (oi);
-
-  oi->route_connected = OSPF6_ROUTE_TABLE_CREATE (INTERFACE, CONNECTED_ROUTES);
-  oi->route_connected->scope = oi;
-
-  /* link both */
-  oi->interface = ifp;
-  ifp->info = oi;
-
-  /* Compute cost. */
-  oi->cost = ospf6_interface_get_cost(oi);
-
-  return oi;
+       struct ospf6_interface *oi;
+       unsigned int iobuflen;
+
+       oi = (struct ospf6_interface *)XCALLOC(MTYPE_OSPF6_IF,
+                                              sizeof(struct ospf6_interface));
+
+       if (!oi) {
+               zlog_err("Can't malloc ospf6_interface for ifindex %d",
+                        ifp->ifindex);
+               return (struct ospf6_interface *)NULL;
+       }
+
+       oi->area = (struct ospf6_area *)NULL;
+       oi->neighbor_list = list_new();
+       oi->neighbor_list->cmp = ospf6_neighbor_cmp;
+       oi->linklocal_addr = (struct in6_addr *)NULL;
+       oi->instance_id = OSPF6_INTERFACE_INSTANCE_ID;
+       oi->transdelay = OSPF6_INTERFACE_TRANSDELAY;
+       oi->priority = OSPF6_INTERFACE_PRIORITY;
+
+       oi->hello_interval = OSPF_HELLO_INTERVAL_DEFAULT;
+       oi->dead_interval = OSPF_ROUTER_DEAD_INTERVAL_DEFAULT;
+       oi->rxmt_interval = OSPF_RETRANSMIT_INTERVAL_DEFAULT;
+       oi->type = ospf6_default_iftype(ifp);
+       oi->state = OSPF6_INTERFACE_DOWN;
+       oi->flag = 0;
+       oi->mtu_ignore = 0;
+
+       /* Try to adjust I/O buffer size with IfMtu */
+       oi->ifmtu = ifp->mtu6;
+       iobuflen = ospf6_iobuf_size(ifp->mtu6);
+       if (oi->ifmtu > iobuflen) {
+               if (IS_OSPF6_DEBUG_INTERFACE)
+                       zlog_debug(
+                               "Interface %s: IfMtu is adjusted to I/O buffer size: %d.",
+                               ifp->name, iobuflen);
+               oi->ifmtu = iobuflen;
+       }
+
+       QOBJ_REG(oi, ospf6_interface);
+
+       oi->lsupdate_list = ospf6_lsdb_create(oi);
+       oi->lsack_list = ospf6_lsdb_create(oi);
+       oi->lsdb = ospf6_lsdb_create(oi);
+       oi->lsdb->hook_add = ospf6_interface_lsdb_hook_add;
+       oi->lsdb->hook_remove = ospf6_interface_lsdb_hook_remove;
+       oi->lsdb_self = ospf6_lsdb_create(oi);
+
+       oi->route_connected =
+               OSPF6_ROUTE_TABLE_CREATE(INTERFACE, CONNECTED_ROUTES);
+       oi->route_connected->scope = oi;
+
+       /* link both */
+       oi->interface = ifp;
+       ifp->info = oi;
+
+       /* Compute cost. */
+       oi->cost = ospf6_interface_get_cost(oi);
+
+       return oi;
 }
 
-void
-ospf6_interface_delete (struct ospf6_interface *oi)
+void ospf6_interface_delete(struct ospf6_interface *oi)
 {
-  struct listnode *node, *nnode;
-  struct ospf6_neighbor *on;
+       struct listnode *node, *nnode;
+       struct ospf6_neighbor *on;
 
-  for (ALL_LIST_ELEMENTS (oi->neighbor_list, node, nnode, on))
-      ospf6_neighbor_delete (on);
-  
-  list_delete (oi->neighbor_list);
+       QOBJ_UNREG(oi);
 
-  THREAD_OFF (oi->thread_send_hello);
-  THREAD_OFF (oi->thread_send_lsupdate);
-  THREAD_OFF (oi->thread_send_lsack);
+       for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on))
+               ospf6_neighbor_delete(on);
 
-  ospf6_lsdb_remove_all (oi->lsdb);
-  ospf6_lsdb_remove_all (oi->lsupdate_list);
-  ospf6_lsdb_remove_all (oi->lsack_list);
+       list_delete(oi->neighbor_list);
 
-  ospf6_lsdb_delete (oi->lsdb);
-  ospf6_lsdb_delete (oi->lsdb_self);
+       THREAD_OFF(oi->thread_send_hello);
+       THREAD_OFF(oi->thread_send_lsupdate);
+       THREAD_OFF(oi->thread_send_lsack);
 
-  ospf6_lsdb_delete (oi->lsupdate_list);
-  ospf6_lsdb_delete (oi->lsack_list);
+       ospf6_lsdb_remove_all(oi->lsdb);
+       ospf6_lsdb_remove_all(oi->lsupdate_list);
+       ospf6_lsdb_remove_all(oi->lsack_list);
 
-  ospf6_route_table_delete (oi->route_connected);
+       ospf6_lsdb_delete(oi->lsdb);
+       ospf6_lsdb_delete(oi->lsdb_self);
 
-  /* cut link */
-  oi->interface->info = NULL;
+       ospf6_lsdb_delete(oi->lsupdate_list);
+       ospf6_lsdb_delete(oi->lsack_list);
 
-  /* plist_name */
-  if (oi->plist_name)
-    XFREE (MTYPE_PREFIX_LIST_STR, oi->plist_name);
+       ospf6_route_table_delete(oi->route_connected);
 
-  ospf6_bfd_info_free(&(oi->bfd_info));
+       /* cut link */
+       oi->interface->info = NULL;
 
-  XFREE (MTYPE_OSPF6_IF, oi);
+       /* plist_name */
+       if (oi->plist_name)
+               XFREE(MTYPE_CFG_PLIST_NAME, oi->plist_name);
+
+       ospf6_bfd_info_free(&(oi->bfd_info));
+
+       XFREE(MTYPE_OSPF6_IF, oi);
 }
 
-void
-ospf6_interface_enable (struct ospf6_interface *oi)
+void ospf6_interface_enable(struct ospf6_interface *oi)
 {
-  UNSET_FLAG (oi->flag, OSPF6_INTERFACE_DISABLE);
-  ospf6_interface_state_update (oi->interface);
+       UNSET_FLAG(oi->flag, OSPF6_INTERFACE_DISABLE);
+       ospf6_interface_state_update(oi->interface);
 }
 
-void
-ospf6_interface_disable (struct ospf6_interface *oi)
+void ospf6_interface_disable(struct ospf6_interface *oi)
 {
-  SET_FLAG (oi->flag, OSPF6_INTERFACE_DISABLE);
+       SET_FLAG(oi->flag, OSPF6_INTERFACE_DISABLE);
 
-  thread_execute (master, interface_down, oi, 0);
+       thread_execute(master, interface_down, oi, 0);
 
-  ospf6_lsdb_remove_all (oi->lsdb);
-  ospf6_lsdb_remove_all (oi->lsdb_self);
-  ospf6_lsdb_remove_all (oi->lsupdate_list);
-  ospf6_lsdb_remove_all (oi->lsack_list);
+       ospf6_lsdb_remove_all(oi->lsdb);
+       ospf6_lsdb_remove_all(oi->lsdb_self);
+       ospf6_lsdb_remove_all(oi->lsupdate_list);
+       ospf6_lsdb_remove_all(oi->lsack_list);
 
-  THREAD_OFF (oi->thread_send_hello);
-  THREAD_OFF (oi->thread_send_lsupdate);
-  THREAD_OFF (oi->thread_send_lsack);
+       THREAD_OFF(oi->thread_send_hello);
+       THREAD_OFF(oi->thread_send_lsupdate);
+       THREAD_OFF(oi->thread_send_lsack);
 
-  THREAD_OFF (oi->thread_network_lsa);
-  THREAD_OFF (oi->thread_link_lsa);
-  THREAD_OFF (oi->thread_intra_prefix_lsa);
+       THREAD_OFF(oi->thread_network_lsa);
+       THREAD_OFF(oi->thread_link_lsa);
+       THREAD_OFF(oi->thread_intra_prefix_lsa);
 }
 
 static struct in6_addr *
-ospf6_interface_get_linklocal_address (struct interface *ifp)
+ospf6_interface_get_linklocal_address(struct interface *ifp)
 {
-  struct listnode *n;
-  struct connected *c;
-  struct in6_addr *l = (struct in6_addr *) NULL;
-
-  /* for each connected address */
-  for (ALL_LIST_ELEMENTS_RO (ifp->connected, n, c))
-    {
-      /* if family not AF_INET6, ignore */
-      if (c->address->family != AF_INET6)
-        continue;
-
-      /* linklocal scope check */
-      if (IN6_IS_ADDR_LINKLOCAL (&c->address->u.prefix6))
-        l = &c->address->u.prefix6;
-    }
-  return l;
+       struct listnode *n;
+       struct connected *c;
+       struct in6_addr *l = (struct in6_addr *)NULL;
+
+       /* for each connected address */
+       for (ALL_LIST_ELEMENTS_RO(ifp->connected, n, c)) {
+               /* if family not AF_INET6, ignore */
+               if (c->address->family != AF_INET6)
+                       continue;
+
+               /* linklocal scope check */
+               if (IN6_IS_ADDR_LINKLOCAL(&c->address->u.prefix6))
+                       l = &c->address->u.prefix6;
+       }
+       return l;
 }
 
-void
-ospf6_interface_if_add (struct interface *ifp)
+void ospf6_interface_if_add(struct interface *ifp)
 {
-  struct ospf6_interface *oi;
-  unsigned int iobuflen;
-
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    return;
-
-  /* Try to adjust I/O buffer size with IfMtu */
-  if (oi->ifmtu == 0)
-    oi->ifmtu = ifp->mtu6;
-  iobuflen = ospf6_iobuf_size (ifp->mtu6);
-  if (oi->ifmtu > iobuflen)
-    {
-      if (IS_OSPF6_DEBUG_INTERFACE)
-        zlog_debug ("Interface %s: IfMtu is adjusted to I/O buffer size: %d.",
-                   ifp->name, iobuflen);
-      oi->ifmtu = iobuflen;
-    }
-
-  /* interface start */
-  ospf6_interface_state_update(oi->interface);
+       struct ospf6_interface *oi;
+       unsigned int iobuflen;
+
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               return;
+
+       /* Try to adjust I/O buffer size with IfMtu */
+       if (oi->ifmtu == 0)
+               oi->ifmtu = ifp->mtu6;
+       iobuflen = ospf6_iobuf_size(ifp->mtu6);
+       if (oi->ifmtu > iobuflen) {
+               if (IS_OSPF6_DEBUG_INTERFACE)
+                       zlog_debug(
+                               "Interface %s: IfMtu is adjusted to I/O buffer size: %d.",
+                               ifp->name, iobuflen);
+               oi->ifmtu = iobuflen;
+       }
+
+       /* interface start */
+       ospf6_interface_state_update(oi->interface);
 }
 
-void
-ospf6_interface_if_del (struct interface *ifp)
+void ospf6_interface_if_del(struct interface *ifp)
 {
-  struct ospf6_interface *oi;
+       struct ospf6_interface *oi;
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    return;
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               return;
 
-  /* interface stop */
-  if (oi->area)
-    thread_execute (master, interface_down, oi, 0);
+       /* interface stop */
+       if (oi->area)
+               thread_execute(master, interface_down, oi, 0);
 
-  listnode_delete (oi->area->if_list, oi);
-  oi->area = (struct ospf6_area *) NULL;
+       listnode_delete(oi->area->if_list, oi);
+       oi->area = (struct ospf6_area *)NULL;
 
-  /* cut link */
-  oi->interface = NULL;
-  ifp->info = NULL;
+       /* cut link */
+       oi->interface = NULL;
+       ifp->info = NULL;
 
-  ospf6_interface_delete (oi);
+       ospf6_interface_delete(oi);
 }
 
-void
-ospf6_interface_state_update (struct interface *ifp)
+void ospf6_interface_state_update(struct interface *ifp)
 {
-  struct ospf6_interface *oi;
-
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    return;
-  if (oi->area == NULL)
-    return;
-  if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_DISABLE))
-    return;
-
-  if (if_is_operative (ifp)
-      && (ospf6_interface_get_linklocal_address(oi->interface)
-          || if_is_loopback(oi->interface)))
-    thread_add_event (master, interface_up, oi, 0);
-  else
-    thread_add_event (master, interface_down, oi, 0);
-
-  return;
+       struct ospf6_interface *oi;
+
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               return;
+       if (oi->area == NULL)
+               return;
+       if (CHECK_FLAG(oi->flag, OSPF6_INTERFACE_DISABLE))
+               return;
+
+       if (if_is_operative(ifp)
+           && (ospf6_interface_get_linklocal_address(oi->interface)
+               || if_is_loopback(oi->interface)))
+               thread_add_event(master, interface_up, oi, 0);
+       else
+               thread_add_event(master, interface_down, oi, 0);
+
+       return;
 }
 
-void
-ospf6_interface_connected_route_update (struct interface *ifp)
+void ospf6_interface_connected_route_update(struct interface *ifp)
 {
-  struct ospf6_interface *oi;
-  struct ospf6_route *route;
-  struct connected *c;
-  struct listnode *node, *nnode;
-  struct in6_addr nh_addr;
-
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    return;
-
-  /* reset linklocal pointer */
-  oi->linklocal_addr = ospf6_interface_get_linklocal_address (ifp);
-
-  /* if area is null, do not make connected-route list */
-  if (oi->area == NULL)
-    return;
-
-  if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_DISABLE))
-    return;
-
-  /* update "route to advertise" interface route table */
-  ospf6_route_remove_all (oi->route_connected);
-
-  for (ALL_LIST_ELEMENTS (oi->interface->connected, node, nnode, c))
-    {
-      if (c->address->family != AF_INET6)
-        continue;
-
-      CONTINUE_IF_ADDRESS_LINKLOCAL (IS_OSPF6_DEBUG_INTERFACE, c->address);
-      CONTINUE_IF_ADDRESS_UNSPECIFIED (IS_OSPF6_DEBUG_INTERFACE, c->address);
-      CONTINUE_IF_ADDRESS_LOOPBACK (IS_OSPF6_DEBUG_INTERFACE, c->address);
-      CONTINUE_IF_ADDRESS_V4COMPAT (IS_OSPF6_DEBUG_INTERFACE, c->address);
-      CONTINUE_IF_ADDRESS_V4MAPPED (IS_OSPF6_DEBUG_INTERFACE, c->address);
-
-      /* apply filter */
-      if (oi->plist_name)
-        {
-          struct prefix_list *plist;
-          enum prefix_list_type ret;
-          char buf[PREFIX2STR_BUFFER];
-
-          prefix2str (c->address, buf, sizeof (buf));
-          plist = prefix_list_lookup (AFI_IP6, oi->plist_name);
-          ret = prefix_list_apply (plist, (void *) c->address);
-          if (ret == PREFIX_DENY)
-            {
-              if (IS_OSPF6_DEBUG_INTERFACE)
-                zlog_debug ("%s on %s filtered by prefix-list %s ",
-                           buf, oi->interface->name, oi->plist_name);
-              continue;
-            }
-        }
-
-      route = ospf6_route_create ();
-      memcpy (&route->prefix, c->address, sizeof (struct prefix));
-      apply_mask (&route->prefix);
-      route->type = OSPF6_DEST_TYPE_NETWORK;
-      route->path.area_id = oi->area->area_id;
-      route->path.type = OSPF6_PATH_TYPE_INTRA;
-      route->path.cost = oi->cost;
-      inet_pton (AF_INET6, "::1", &nh_addr);
-      ospf6_route_add_nexthop (route, oi->interface->ifindex, &nh_addr);
-      ospf6_route_add (route, oi->route_connected);
-    }
-
-  /* create new Link-LSA */
-  OSPF6_LINK_LSA_SCHEDULE (oi);
-  OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT (oi);
-  OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area);
+       struct ospf6_interface *oi;
+       struct ospf6_route *route;
+       struct connected *c;
+       struct listnode *node, *nnode;
+       struct in6_addr nh_addr;
+
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               return;
+
+       /* reset linklocal pointer */
+       oi->linklocal_addr = ospf6_interface_get_linklocal_address(ifp);
+
+       /* if area is null, do not make connected-route list */
+       if (oi->area == NULL)
+               return;
+
+       if (CHECK_FLAG(oi->flag, OSPF6_INTERFACE_DISABLE))
+               return;
+
+       /* update "route to advertise" interface route table */
+       ospf6_route_remove_all(oi->route_connected);
+
+       for (ALL_LIST_ELEMENTS(oi->interface->connected, node, nnode, c)) {
+               if (c->address->family != AF_INET6)
+                       continue;
+
+               CONTINUE_IF_ADDRESS_LINKLOCAL(IS_OSPF6_DEBUG_INTERFACE,
+                                             c->address);
+               CONTINUE_IF_ADDRESS_UNSPECIFIED(IS_OSPF6_DEBUG_INTERFACE,
+                                               c->address);
+               CONTINUE_IF_ADDRESS_LOOPBACK(IS_OSPF6_DEBUG_INTERFACE,
+                                            c->address);
+               CONTINUE_IF_ADDRESS_V4COMPAT(IS_OSPF6_DEBUG_INTERFACE,
+                                            c->address);
+               CONTINUE_IF_ADDRESS_V4MAPPED(IS_OSPF6_DEBUG_INTERFACE,
+                                            c->address);
+
+               /* apply filter */
+               if (oi->plist_name) {
+                       struct prefix_list *plist;
+                       enum prefix_list_type ret;
+                       char buf[PREFIX2STR_BUFFER];
+
+                       prefix2str(c->address, buf, sizeof(buf));
+                       plist = prefix_list_lookup(AFI_IP6, oi->plist_name);
+                       ret = prefix_list_apply(plist, (void *)c->address);
+                       if (ret == PREFIX_DENY) {
+                               if (IS_OSPF6_DEBUG_INTERFACE)
+                                       zlog_debug(
+                                               "%s on %s filtered by prefix-list %s ",
+                                               buf, oi->interface->name,
+                                               oi->plist_name);
+                               continue;
+                       }
+               }
+
+               route = ospf6_route_create();
+               memcpy(&route->prefix, c->address, sizeof(struct prefix));
+               apply_mask(&route->prefix);
+               route->type = OSPF6_DEST_TYPE_NETWORK;
+               route->path.area_id = oi->area->area_id;
+               route->path.type = OSPF6_PATH_TYPE_INTRA;
+               route->path.cost = oi->cost;
+               inet_pton(AF_INET6, "::1", &nh_addr);
+               ospf6_route_add_nexthop(route, oi->interface->ifindex,
+                                       &nh_addr);
+               ospf6_route_add(route, oi->route_connected);
+       }
+
+       /* create new Link-LSA */
+       OSPF6_LINK_LSA_SCHEDULE(oi);
+       OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT(oi);
+       OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(oi->area);
 }
 
-static void
-ospf6_interface_state_change (u_char next_state, struct ospf6_interface *oi)
+static void ospf6_interface_state_change(u_char next_state,
+                                        struct ospf6_interface *oi)
 {
-  u_char prev_state;
-
-  prev_state = oi->state;
-  oi->state = next_state;
-
-  if (prev_state == next_state)
-    return;
-
-  /* log */
-  if (IS_OSPF6_DEBUG_INTERFACE)
-    {
-      zlog_debug ("Interface state change %s: %s -> %s", oi->interface->name,
-                 ospf6_interface_state_str[prev_state],
-                 ospf6_interface_state_str[next_state]);
-    }
-  oi->state_change++;
-
-  if ((prev_state == OSPF6_INTERFACE_DR ||
-       prev_state == OSPF6_INTERFACE_BDR) &&
-      (next_state != OSPF6_INTERFACE_DR &&
-       next_state != OSPF6_INTERFACE_BDR))
-    ospf6_sso (oi->interface->ifindex, &alldrouters6, IPV6_LEAVE_GROUP);
-
-  if ((prev_state != OSPF6_INTERFACE_DR &&
-       prev_state != OSPF6_INTERFACE_BDR) &&
-      (next_state == OSPF6_INTERFACE_DR ||
-       next_state == OSPF6_INTERFACE_BDR))
-    ospf6_sso (oi->interface->ifindex, &alldrouters6, IPV6_JOIN_GROUP);
-
-  OSPF6_ROUTER_LSA_SCHEDULE (oi->area);
-  if (next_state == OSPF6_INTERFACE_DOWN)
-    {
-      OSPF6_NETWORK_LSA_EXECUTE (oi);
-      OSPF6_INTRA_PREFIX_LSA_EXECUTE_TRANSIT (oi);
-      OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area);
-    }
-  else if (prev_state == OSPF6_INTERFACE_DR ||
-           next_state == OSPF6_INTERFACE_DR)
-    {
-      OSPF6_NETWORK_LSA_SCHEDULE (oi);
-      OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT (oi);
-      OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area);
-    }
-
-#ifdef HAVE_SNMP
-  /* Terminal state or regression */ 
-  if ((next_state == OSPF6_INTERFACE_POINTTOPOINT) ||
-      (next_state == OSPF6_INTERFACE_DROTHER) ||
-      (next_state == OSPF6_INTERFACE_BDR) ||
-      (next_state == OSPF6_INTERFACE_DR) ||
-      (next_state < prev_state))
-    ospf6TrapIfStateChange (oi);
-#endif
+       u_char prev_state;
 
+       prev_state = oi->state;
+       oi->state = next_state;
+
+       if (prev_state == next_state)
+               return;
+
+       /* log */
+       if (IS_OSPF6_DEBUG_INTERFACE) {
+               zlog_debug("Interface state change %s: %s -> %s",
+                          oi->interface->name,
+                          ospf6_interface_state_str[prev_state],
+                          ospf6_interface_state_str[next_state]);
+       }
+       oi->state_change++;
+
+       if ((prev_state == OSPF6_INTERFACE_DR
+            || prev_state == OSPF6_INTERFACE_BDR)
+           && (next_state != OSPF6_INTERFACE_DR
+               && next_state != OSPF6_INTERFACE_BDR))
+               ospf6_sso(oi->interface->ifindex, &alldrouters6,
+                         IPV6_LEAVE_GROUP);
+
+       if ((prev_state != OSPF6_INTERFACE_DR
+            && prev_state != OSPF6_INTERFACE_BDR)
+           && (next_state == OSPF6_INTERFACE_DR
+               || next_state == OSPF6_INTERFACE_BDR))
+               ospf6_sso(oi->interface->ifindex, &alldrouters6,
+                         IPV6_JOIN_GROUP);
+
+       OSPF6_ROUTER_LSA_SCHEDULE(oi->area);
+       if (next_state == OSPF6_INTERFACE_DOWN) {
+               OSPF6_NETWORK_LSA_EXECUTE(oi);
+               OSPF6_INTRA_PREFIX_LSA_EXECUTE_TRANSIT(oi);
+               OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(oi->area);
+       } else if (prev_state == OSPF6_INTERFACE_DR
+                  || next_state == OSPF6_INTERFACE_DR) {
+               OSPF6_NETWORK_LSA_SCHEDULE(oi);
+               OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT(oi);
+               OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(oi->area);
+       }
+
+       hook_call(ospf6_interface_change, oi, next_state, prev_state);
 }
 
 
 /* DR Election, RFC2328 section 9.4 */
 
-#define IS_ELIGIBLE(n) \
-  ((n)->state >= OSPF6_NEIGHBOR_TWOWAY && (n)->priority != 0)
+#define IS_ELIGIBLE(n)                                                         \
+       ((n)->state >= OSPF6_NEIGHBOR_TWOWAY && (n)->priority != 0)
 
-static struct ospf6_neighbor *
-better_bdrouter (struct ospf6_neighbor *a, struct ospf6_neighbor *b)
+static struct ospf6_neighbor *better_bdrouter(struct ospf6_neighbor *a,
+                                             struct ospf6_neighbor *b)
 {
-  if ((a == NULL || ! IS_ELIGIBLE (a) || a->drouter == a->router_id) &&
-      (b == NULL || ! IS_ELIGIBLE (b) || b->drouter == b->router_id))
-    return NULL;
-  else if (a == NULL || ! IS_ELIGIBLE (a) || a->drouter == a->router_id)
-    return b;
-  else if (b == NULL || ! IS_ELIGIBLE (b) || b->drouter == b->router_id)
-    return a;
-
-  if (a->bdrouter == a->router_id && b->bdrouter != b->router_id)
-    return a;
-  if (a->bdrouter != a->router_id && b->bdrouter == b->router_id)
-    return b;
-
-  if (a->priority > b->priority)
-    return a;
-  if (a->priority < b->priority)
-    return b;
-
-  if (ntohl (a->router_id) > ntohl (b->router_id))
-    return a;
-  if (ntohl (a->router_id) < ntohl (b->router_id))
-    return b;
-
-  zlog_warn ("Router-ID duplicate ?");
-  return a;
+       if ((a == NULL || !IS_ELIGIBLE(a) || a->drouter == a->router_id)
+           && (b == NULL || !IS_ELIGIBLE(b) || b->drouter == b->router_id))
+               return NULL;
+       else if (a == NULL || !IS_ELIGIBLE(a) || a->drouter == a->router_id)
+               return b;
+       else if (b == NULL || !IS_ELIGIBLE(b) || b->drouter == b->router_id)
+               return a;
+
+       if (a->bdrouter == a->router_id && b->bdrouter != b->router_id)
+               return a;
+       if (a->bdrouter != a->router_id && b->bdrouter == b->router_id)
+               return b;
+
+       if (a->priority > b->priority)
+               return a;
+       if (a->priority < b->priority)
+               return b;
+
+       if (ntohl(a->router_id) > ntohl(b->router_id))
+               return a;
+       if (ntohl(a->router_id) < ntohl(b->router_id))
+               return b;
+
+       zlog_warn("Router-ID duplicate ?");
+       return a;
 }
 
-static struct ospf6_neighbor *
-better_drouter (struct ospf6_neighbor *a, struct ospf6_neighbor *b)
+static struct ospf6_neighbor *better_drouter(struct ospf6_neighbor *a,
+                                            struct ospf6_neighbor *b)
 {
-  if ((a == NULL || ! IS_ELIGIBLE (a) || a->drouter != a->router_id) &&
-      (b == NULL || ! IS_ELIGIBLE (b) || b->drouter != b->router_id))
-    return NULL;
-  else if (a == NULL || ! IS_ELIGIBLE (a) || a->drouter != a->router_id)
-    return b;
-  else if (b == NULL || ! IS_ELIGIBLE (b) || b->drouter != b->router_id)
-    return a;
-
-  if (a->drouter == a->router_id && b->drouter != b->router_id)
-    return a;
-  if (a->drouter != a->router_id && b->drouter == b->router_id)
-    return b;
-
-  if (a->priority > b->priority)
-    return a;
-  if (a->priority < b->priority)
-    return b;
-
-  if (ntohl (a->router_id) > ntohl (b->router_id))
-    return a;
-  if (ntohl (a->router_id) < ntohl (b->router_id))
-    return b;
-
-  zlog_warn ("Router-ID duplicate ?");
-  return a;
+       if ((a == NULL || !IS_ELIGIBLE(a) || a->drouter != a->router_id)
+           && (b == NULL || !IS_ELIGIBLE(b) || b->drouter != b->router_id))
+               return NULL;
+       else if (a == NULL || !IS_ELIGIBLE(a) || a->drouter != a->router_id)
+               return b;
+       else if (b == NULL || !IS_ELIGIBLE(b) || b->drouter != b->router_id)
+               return a;
+
+       if (a->drouter == a->router_id && b->drouter != b->router_id)
+               return a;
+       if (a->drouter != a->router_id && b->drouter == b->router_id)
+               return b;
+
+       if (a->priority > b->priority)
+               return a;
+       if (a->priority < b->priority)
+               return b;
+
+       if (ntohl(a->router_id) > ntohl(b->router_id))
+               return a;
+       if (ntohl(a->router_id) < ntohl(b->router_id))
+               return b;
+
+       zlog_warn("Router-ID duplicate ?");
+       return a;
 }
 
-static u_char
-dr_election (struct ospf6_interface *oi)
+static u_char dr_election(struct ospf6_interface *oi)
 {
-  struct listnode *node, *nnode;
-  struct ospf6_neighbor *on, *drouter, *bdrouter, myself;
-  struct ospf6_neighbor *best_drouter, *best_bdrouter;
-  u_char next_state = 0;
-
-  drouter = bdrouter = NULL;
-  best_drouter = best_bdrouter = NULL;
-
-  /* pseudo neighbor myself, including noting current DR/BDR (1) */
-  memset (&myself, 0, sizeof (myself));
-  inet_ntop (AF_INET, &oi->area->ospf6->router_id, myself.name,
-             sizeof (myself.name));
-  myself.state = OSPF6_NEIGHBOR_TWOWAY;
-  myself.drouter = oi->drouter;
-  myself.bdrouter = oi->bdrouter;
-  myself.priority = oi->priority;
-  myself.router_id = oi->area->ospf6->router_id;
-
-  /* Electing BDR (2) */
-  for (ALL_LIST_ELEMENTS (oi->neighbor_list, node, nnode, on))
-    bdrouter = better_bdrouter (bdrouter, on);
-  
-  best_bdrouter = bdrouter;
-  bdrouter = better_bdrouter (best_bdrouter, &myself);
-
-  /* Electing DR (3) */
-  for (ALL_LIST_ELEMENTS (oi->neighbor_list, node, nnode, on))
-    drouter = better_drouter (drouter, on);
-
-  best_drouter = drouter;
-  drouter = better_drouter (best_drouter, &myself);
-  if (drouter == NULL)
-    drouter = bdrouter;
-
-  /* the router itself is newly/no longer DR/BDR (4) */
-  if ((drouter == &myself && myself.drouter != myself.router_id) ||
-      (drouter != &myself && myself.drouter == myself.router_id) ||
-      (bdrouter == &myself && myself.bdrouter != myself.router_id) ||
-      (bdrouter != &myself && myself.bdrouter == myself.router_id))
-    {
-      myself.drouter = (drouter ? drouter->router_id : htonl (0));
-      myself.bdrouter = (bdrouter ? bdrouter->router_id : htonl (0));
-
-      /* compatible to Electing BDR (2) */
-      bdrouter = better_bdrouter (best_bdrouter, &myself);
-
-      /* compatible to Electing DR (3) */
-      drouter = better_drouter (best_drouter, &myself);
-      if (drouter == NULL)
-        drouter = bdrouter;
-    }
-
-  /* Set interface state accordingly (5) */
-  if (drouter && drouter == &myself)
-    next_state = OSPF6_INTERFACE_DR;
-  else if (bdrouter && bdrouter == &myself)
-    next_state = OSPF6_INTERFACE_BDR;
-  else
-    next_state = OSPF6_INTERFACE_DROTHER;
-
-  /* If NBMA, schedule Start for each neighbor having priority of 0 (6) */
-  /* XXX */
-
-  /* If DR or BDR change, invoke AdjOK? for each neighbor (7) */
-  /* RFC 2328 section 12.4. Originating LSAs (3) will be handled
-     accordingly after AdjOK */
-  if (oi->drouter != (drouter ? drouter->router_id : htonl (0)) ||
-      oi->bdrouter != (bdrouter ? bdrouter->router_id : htonl (0)))
-    {
-      if (IS_OSPF6_DEBUG_INTERFACE)
-        zlog_debug ("DR Election on %s: DR: %s BDR: %s", oi->interface->name,
-                   (drouter ? drouter->name : "0.0.0.0"),
-                   (bdrouter ? bdrouter->name : "0.0.0.0"));
-
-      for (ALL_LIST_ELEMENTS_RO (oi->neighbor_list, node, on))
-        {
-          if (on->state < OSPF6_NEIGHBOR_TWOWAY)
-            continue;
-          /* Schedule AdjOK. */
-          thread_add_event (master, adj_ok, on, 0);
-        }
-    }
-
-  oi->drouter = (drouter ? drouter->router_id : htonl (0));
-  oi->bdrouter = (bdrouter ? bdrouter->router_id : htonl (0));
-  return next_state;
+       struct listnode *node, *nnode;
+       struct ospf6_neighbor *on, *drouter, *bdrouter, myself;
+       struct ospf6_neighbor *best_drouter, *best_bdrouter;
+       u_char next_state = 0;
+
+       drouter = bdrouter = NULL;
+       best_drouter = best_bdrouter = NULL;
+
+       /* pseudo neighbor myself, including noting current DR/BDR (1) */
+       memset(&myself, 0, sizeof(myself));
+       inet_ntop(AF_INET, &oi->area->ospf6->router_id, myself.name,
+                 sizeof(myself.name));
+       myself.state = OSPF6_NEIGHBOR_TWOWAY;
+       myself.drouter = oi->drouter;
+       myself.bdrouter = oi->bdrouter;
+       myself.priority = oi->priority;
+       myself.router_id = oi->area->ospf6->router_id;
+
+       /* Electing BDR (2) */
+       for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on))
+               bdrouter = better_bdrouter(bdrouter, on);
+
+       best_bdrouter = bdrouter;
+       bdrouter = better_bdrouter(best_bdrouter, &myself);
+
+       /* Electing DR (3) */
+       for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on))
+               drouter = better_drouter(drouter, on);
+
+       best_drouter = drouter;
+       drouter = better_drouter(best_drouter, &myself);
+       if (drouter == NULL)
+               drouter = bdrouter;
+
+       /* the router itself is newly/no longer DR/BDR (4) */
+       if ((drouter == &myself && myself.drouter != myself.router_id)
+           || (drouter != &myself && myself.drouter == myself.router_id)
+           || (bdrouter == &myself && myself.bdrouter != myself.router_id)
+           || (bdrouter != &myself && myself.bdrouter == myself.router_id)) {
+               myself.drouter = (drouter ? drouter->router_id : htonl(0));
+               myself.bdrouter = (bdrouter ? bdrouter->router_id : htonl(0));
+
+               /* compatible to Electing BDR (2) */
+               bdrouter = better_bdrouter(best_bdrouter, &myself);
+
+               /* compatible to Electing DR (3) */
+               drouter = better_drouter(best_drouter, &myself);
+               if (drouter == NULL)
+                       drouter = bdrouter;
+       }
+
+       /* Set interface state accordingly (5) */
+       if (drouter && drouter == &myself)
+               next_state = OSPF6_INTERFACE_DR;
+       else if (bdrouter && bdrouter == &myself)
+               next_state = OSPF6_INTERFACE_BDR;
+       else
+               next_state = OSPF6_INTERFACE_DROTHER;
+
+       /* If NBMA, schedule Start for each neighbor having priority of 0 (6) */
+       /* XXX */
+
+       /* If DR or BDR change, invoke AdjOK? for each neighbor (7) */
+       /* RFC 2328 section 12.4. Originating LSAs (3) will be handled
+          accordingly after AdjOK */
+       if (oi->drouter != (drouter ? drouter->router_id : htonl(0))
+           || oi->bdrouter != (bdrouter ? bdrouter->router_id : htonl(0))) {
+               if (IS_OSPF6_DEBUG_INTERFACE)
+                       zlog_debug("DR Election on %s: DR: %s BDR: %s",
+                                  oi->interface->name,
+                                  (drouter ? drouter->name : "0.0.0.0"),
+                                  (bdrouter ? bdrouter->name : "0.0.0.0"));
+
+               for (ALL_LIST_ELEMENTS_RO(oi->neighbor_list, node, on)) {
+                       if (on->state < OSPF6_NEIGHBOR_TWOWAY)
+                               continue;
+                       /* Schedule AdjOK. */
+                       thread_add_event(master, adj_ok, on, 0);
+               }
+       }
+
+       oi->drouter = (drouter ? drouter->router_id : htonl(0));
+       oi->bdrouter = (bdrouter ? bdrouter->router_id : htonl(0));
+       return next_state;
 }
 
 
 /* Interface State Machine */
-int
-interface_up (struct thread *thread)
+int interface_up(struct thread *thread)
 {
-  struct ospf6_interface *oi;
-
-  oi = (struct ospf6_interface *) THREAD_ARG (thread);
-  assert (oi && oi->interface);
-
-  if (IS_OSPF6_DEBUG_INTERFACE)
-    zlog_debug ("Interface Event %s: [InterfaceUp]",
-               oi->interface->name);
-
-  /* check physical interface is up */
-  if (! if_is_operative (oi->interface))
-    {
-      if (IS_OSPF6_DEBUG_INTERFACE)
-        zlog_debug ("Interface %s is down, can't execute [InterfaceUp]",
-                   oi->interface->name);
-      return 0;
-    }
-
-  /* check interface has a link-local address */
-  if (! (ospf6_interface_get_linklocal_address(oi->interface)
-         || if_is_loopback(oi->interface)))
-    {
-      if (IS_OSPF6_DEBUG_INTERFACE)
-       zlog_debug ("Interface %s has no link local address, can't execute [InterfaceUp]",
-                   oi->interface->name);
+       struct ospf6_interface *oi;
+
+       oi = (struct ospf6_interface *)THREAD_ARG(thread);
+       assert(oi && oi->interface);
+
+       if (IS_OSPF6_DEBUG_INTERFACE)
+               zlog_debug("Interface Event %s: [InterfaceUp]",
+                          oi->interface->name);
+
+       /* check physical interface is up */
+       if (!if_is_operative(oi->interface)) {
+               if (IS_OSPF6_DEBUG_INTERFACE)
+                       zlog_debug(
+                               "Interface %s is down, can't execute [InterfaceUp]",
+                               oi->interface->name);
+               return 0;
+       }
+
+       /* check interface has a link-local address */
+       if (!(ospf6_interface_get_linklocal_address(oi->interface)
+             || if_is_loopback(oi->interface))) {
+               if (IS_OSPF6_DEBUG_INTERFACE)
+                       zlog_debug(
+                               "Interface %s has no link local address, can't execute [InterfaceUp]",
+                               oi->interface->name);
+               return 0;
+       }
+
+       /* Recompute cost */
+       ospf6_interface_recalculate_cost(oi);
+
+       /* if already enabled, do nothing */
+       if (oi->state > OSPF6_INTERFACE_DOWN) {
+               if (IS_OSPF6_DEBUG_INTERFACE)
+                       zlog_debug("Interface %s already enabled",
+                                  oi->interface->name);
+               return 0;
+       }
+
+       /* If no area assigned, return */
+       if (oi->area == NULL) {
+               zlog_debug(
+                       "%s: Not scheduleing Hello for %s as there is no area assigned yet",
+                       __func__, oi->interface->name);
+               return 0;
+       }
+
+       /* Join AllSPFRouters */
+       if (ospf6_sso(oi->interface->ifindex, &allspfrouters6, IPV6_JOIN_GROUP)
+           < 0) {
+               if (oi->sso_try_cnt++ < OSPF6_INTERFACE_SSO_RETRY_MAX) {
+                       zlog_info(
+                               "Scheduling %s for sso retry, trial count: %d",
+                               oi->interface->name, oi->sso_try_cnt);
+                       thread_add_timer(master, interface_up, oi,
+                                        OSPF6_INTERFACE_SSO_RETRY_INT);
+               }
+               return 0;
+       }
+       oi->sso_try_cnt = 0; /* Reset on success */
+
+       /* Update interface route */
+       ospf6_interface_connected_route_update(oi->interface);
+
+       /* Schedule Hello */
+       if (!CHECK_FLAG(oi->flag, OSPF6_INTERFACE_PASSIVE)
+           && !if_is_loopback(oi->interface))
+               oi->thread_send_hello =
+                       thread_add_event(master, ospf6_hello_send, oi, 0);
+
+       /* decide next interface state */
+       if ((if_is_pointopoint(oi->interface))
+           || (oi->type == OSPF_IFTYPE_POINTOPOINT)) {
+               ospf6_interface_state_change(OSPF6_INTERFACE_POINTTOPOINT, oi);
+       } else if (oi->priority == 0)
+               ospf6_interface_state_change(OSPF6_INTERFACE_DROTHER, oi);
+       else {
+               ospf6_interface_state_change(OSPF6_INTERFACE_WAITING, oi);
+               thread_add_timer(master, wait_timer, oi, oi->dead_interval);
+       }
+
        return 0;
-    }
-
-  /* Recompute cost */
-  ospf6_interface_recalculate_cost (oi);
-
-  /* if already enabled, do nothing */
-  if (oi->state > OSPF6_INTERFACE_DOWN)
-    {
-      if (IS_OSPF6_DEBUG_INTERFACE)
-        zlog_debug ("Interface %s already enabled",
-                   oi->interface->name);
-      return 0;
-    }
-
-  /* If no area assigned, return */
-  if (oi->area == NULL)
-    {
-      zlog_debug ("%s: Not scheduleing Hello for %s as there is no area assigned yet", __func__,
-                 oi->interface->name);
-      return 0;
-    }
-
-  /* Join AllSPFRouters */
-  if (ospf6_sso (oi->interface->ifindex, &allspfrouters6, IPV6_JOIN_GROUP) < 0)
-    {
-      if (oi->sso_try_cnt++ < OSPF6_INTERFACE_SSO_RETRY_MAX)
-        {
-          zlog_info("Scheduling %s for sso retry, trial count: %d",
-                    oi->interface->name, oi->sso_try_cnt);
-          thread_add_timer (master, interface_up, oi,
-                            OSPF6_INTERFACE_SSO_RETRY_INT);
-        }
-      return 0;
-    }
-  oi->sso_try_cnt = 0; /* Reset on success */
-
-  /* Update interface route */
-  ospf6_interface_connected_route_update (oi->interface);
-
-  /* Schedule Hello */
-  if (! CHECK_FLAG (oi->flag, OSPF6_INTERFACE_PASSIVE) &&
-      !if_is_loopback (oi->interface))
-    oi->thread_send_hello = thread_add_event (master, ospf6_hello_send, oi, 0);
-
-  /* decide next interface state */
-  if ((if_is_pointopoint (oi->interface)) ||
-      (oi->type == OSPF_IFTYPE_POINTOPOINT)) {
-    ospf6_interface_state_change (OSPF6_INTERFACE_POINTTOPOINT, oi);
-  }
-  else if (oi->priority == 0)
-    ospf6_interface_state_change (OSPF6_INTERFACE_DROTHER, oi);
-  else
-    {
-      ospf6_interface_state_change (OSPF6_INTERFACE_WAITING, oi);
-      thread_add_timer (master, wait_timer, oi, oi->dead_interval);
-    }
-
-  return 0;
 }
 
-int
-wait_timer (struct thread *thread)
+int wait_timer(struct thread *thread)
 {
-  struct ospf6_interface *oi;
+       struct ospf6_interface *oi;
 
-  oi = (struct ospf6_interface *) THREAD_ARG (thread);
-  assert (oi && oi->interface);
+       oi = (struct ospf6_interface *)THREAD_ARG(thread);
+       assert(oi && oi->interface);
 
-  if (IS_OSPF6_DEBUG_INTERFACE)
-    zlog_debug ("Interface Event %s: [WaitTimer]",
-               oi->interface->name);
+       if (IS_OSPF6_DEBUG_INTERFACE)
+               zlog_debug("Interface Event %s: [WaitTimer]",
+                          oi->interface->name);
 
-  if (oi->state == OSPF6_INTERFACE_WAITING)
-    ospf6_interface_state_change (dr_election (oi), oi);
+       if (oi->state == OSPF6_INTERFACE_WAITING)
+               ospf6_interface_state_change(dr_election(oi), oi);
 
-  return 0;
+       return 0;
 }
 
-int
-backup_seen (struct thread *thread)
+int backup_seen(struct thread *thread)
 {
-  struct ospf6_interface *oi;
+       struct ospf6_interface *oi;
 
-  oi = (struct ospf6_interface *) THREAD_ARG (thread);
-  assert (oi && oi->interface);
+       oi = (struct ospf6_interface *)THREAD_ARG(thread);
+       assert(oi && oi->interface);
 
-  if (IS_OSPF6_DEBUG_INTERFACE)
-    zlog_debug ("Interface Event %s: [BackupSeen]",
-               oi->interface->name);
+       if (IS_OSPF6_DEBUG_INTERFACE)
+               zlog_debug("Interface Event %s: [BackupSeen]",
+                          oi->interface->name);
 
-  if (oi->state == OSPF6_INTERFACE_WAITING)
-    ospf6_interface_state_change (dr_election (oi), oi);
+       if (oi->state == OSPF6_INTERFACE_WAITING)
+               ospf6_interface_state_change(dr_election(oi), oi);
 
-  return 0;
+       return 0;
 }
 
-int
-neighbor_change (struct thread *thread)
+int neighbor_change(struct thread *thread)
 {
-  struct ospf6_interface *oi;
+       struct ospf6_interface *oi;
 
-  oi = (struct ospf6_interface *) THREAD_ARG (thread);
-  assert (oi && oi->interface);
+       oi = (struct ospf6_interface *)THREAD_ARG(thread);
+       assert(oi && oi->interface);
 
-  if (IS_OSPF6_DEBUG_INTERFACE)
-    zlog_debug ("Interface Event %s: [NeighborChange]",
-               oi->interface->name);
+       if (IS_OSPF6_DEBUG_INTERFACE)
+               zlog_debug("Interface Event %s: [NeighborChange]",
+                          oi->interface->name);
 
-  if (oi->state == OSPF6_INTERFACE_DROTHER ||
-      oi->state == OSPF6_INTERFACE_BDR ||
-      oi->state == OSPF6_INTERFACE_DR)
-    ospf6_interface_state_change (dr_election (oi), oi);
+       if (oi->state == OSPF6_INTERFACE_DROTHER
+           || oi->state == OSPF6_INTERFACE_BDR
+           || oi->state == OSPF6_INTERFACE_DR)
+               ospf6_interface_state_change(dr_election(oi), oi);
 
-  return 0;
+       return 0;
 }
 
-int
-interface_down (struct thread *thread)
+int interface_down(struct thread *thread)
 {
-  struct ospf6_interface *oi;
-  struct listnode *node, *nnode;
-  struct ospf6_neighbor *on;
+       struct ospf6_interface *oi;
+       struct listnode *node, *nnode;
+       struct ospf6_neighbor *on;
 
-  oi = (struct ospf6_interface *) THREAD_ARG (thread);
-  assert (oi && oi->interface);
+       oi = (struct ospf6_interface *)THREAD_ARG(thread);
+       assert(oi && oi->interface);
 
-  if (IS_OSPF6_DEBUG_INTERFACE)
-    zlog_debug ("Interface Event %s: [InterfaceDown]",
-               oi->interface->name);
+       if (IS_OSPF6_DEBUG_INTERFACE)
+               zlog_debug("Interface Event %s: [InterfaceDown]",
+                          oi->interface->name);
 
-  /* Stop Hellos */
-  THREAD_OFF (oi->thread_send_hello);
+       /* Stop Hellos */
+       THREAD_OFF(oi->thread_send_hello);
 
-  /* Leave AllSPFRouters */
-  if (oi->state > OSPF6_INTERFACE_DOWN)
-    ospf6_sso (oi->interface->ifindex, &allspfrouters6, IPV6_LEAVE_GROUP);
+       /* Leave AllSPFRouters */
+       if (oi->state > OSPF6_INTERFACE_DOWN)
+               ospf6_sso(oi->interface->ifindex, &allspfrouters6,
+                         IPV6_LEAVE_GROUP);
 
-  ospf6_interface_state_change (OSPF6_INTERFACE_DOWN, oi);
+       ospf6_interface_state_change(OSPF6_INTERFACE_DOWN, oi);
 
-  for (ALL_LIST_ELEMENTS (oi->neighbor_list, node, nnode, on))
-    ospf6_neighbor_delete (on);
-  
-  list_delete_all_node (oi->neighbor_list);
+       for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on))
+               ospf6_neighbor_delete(on);
 
-  /* When interface state is reset, also reset information about
-   * DR election, as it is no longer valid. */
-  oi->drouter = oi->prev_drouter = htonl(0);
-  oi->bdrouter = oi->prev_bdrouter = htonl(0);
-  return 0;
+       list_delete_all_node(oi->neighbor_list);
+
+       /* When interface state is reset, also reset information about
+        * DR election, as it is no longer valid. */
+       oi->drouter = oi->prev_drouter = htonl(0);
+       oi->bdrouter = oi->prev_bdrouter = htonl(0);
+       return 0;
 }
 
 
 /* show specified interface structure */
-static int
-ospf6_interface_show (struct vty *vty, struct interface *ifp)
+static int ospf6_interface_show(struct vty *vty, struct interface *ifp)
 {
-  struct ospf6_interface *oi;
-  struct connected *c;
-  struct prefix *p;
-  struct listnode *i;
-  char strbuf[PREFIX2STR_BUFFER], drouter[32], bdrouter[32];
-  const char *updown[3] = {"down", "up", NULL};
-  const char *type;
-  struct timeval res, now;
-  char duration[32];
-  struct ospf6_lsa *lsa;
-
-  /* check physical interface type */
-  if (if_is_loopback (ifp))
-    type = "LOOPBACK";
-  else if (if_is_broadcast (ifp))
-    type = "BROADCAST";
-  else if (if_is_pointopoint (ifp))
-    type = "POINTOPOINT";
-  else
-    type = "UNKNOWN";
-
-  vty_out (vty, "%s is %s, type %s%s",
-           ifp->name, updown[if_is_operative (ifp)], type,
-          VNL);
-  vty_out (vty, "  Interface ID: %d%s", ifp->ifindex, VNL);
-
-  if (ifp->info == NULL)
-    {
-      vty_out (vty, "   OSPF not enabled on this interface%s", VNL);
-      return 0;
-    }
-  else
-    oi = (struct ospf6_interface *) ifp->info;
-
-  vty_out (vty, "  Internet Address:%s", VNL);
-
-  for (ALL_LIST_ELEMENTS_RO (ifp->connected, i, c))
-    {
-      p = c->address;
-      prefix2str (p, strbuf, sizeof (strbuf));
-      switch (p->family)
-        {
-        case AF_INET:
-          vty_out (vty, "    inet : %s%s", strbuf,
-                  VNL);
-          break;
-        case AF_INET6:
-          vty_out (vty, "    inet6: %s%s", strbuf,
-                  VNL);
-          break;
-        default:
-          vty_out (vty, "    ???  : %s%s", strbuf,
-                  VNL);
-          break;
-        }
-    }
-
-  if (oi->area)
-    {
-      vty_out (vty, "  Instance ID %d, Interface MTU %d (autodetect: %d)%s",
-              oi->instance_id, oi->ifmtu, ifp->mtu6, VNL);
-      vty_out (vty, "  MTU mismatch detection: %s%s", oi->mtu_ignore ?
-              "disabled" : "enabled", VNL);
-      inet_ntop (AF_INET, &oi->area->area_id,
-                 strbuf, sizeof (strbuf));
-      vty_out (vty, "  Area ID %s, Cost %hu%s", strbuf, oi->cost,
-              VNL);
-    }
-  else
-    vty_out (vty, "  Not Attached to Area%s", VNL);
-
-  vty_out (vty, "  State %s, Transmit Delay %d sec, Priority %d%s",
-           ospf6_interface_state_str[oi->state],
-           oi->transdelay, oi->priority,
-          VNL);
-  vty_out (vty, "  Timer intervals configured:%s", VNL);
-  vty_out (vty, "   Hello %d, Dead %d, Retransmit %d%s",
-           oi->hello_interval, oi->dead_interval, oi->rxmt_interval,
-          VNL);
-
-  inet_ntop (AF_INET, &oi->drouter, drouter, sizeof (drouter));
-  inet_ntop (AF_INET, &oi->bdrouter, bdrouter, sizeof (bdrouter));
-  vty_out (vty, "  DR: %s BDR: %s%s", drouter, bdrouter, VNL);
-
-  vty_out (vty, "  Number of I/F scoped LSAs is %u%s",
-           oi->lsdb->count, VNL);
-
-  quagga_gettime (QUAGGA_CLK_MONOTONIC, &now);
-
-  timerclear (&res);
-  if (oi->thread_send_lsupdate)
-    timersub (&oi->thread_send_lsupdate->u.sands, &now, &res);
-  timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "    %d Pending LSAs for LSUpdate in Time %s [thread %s]%s",
-           oi->lsupdate_list->count, duration,
-           (oi->thread_send_lsupdate ? "on" : "off"),
-           VNL);
-  for (lsa = ospf6_lsdb_head (oi->lsupdate_list); lsa;
-       lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
-
-  timerclear (&res);
-  if (oi->thread_send_lsack)
-    timersub (&oi->thread_send_lsack->u.sands, &now, &res);
-  timerstring (&res, duration, sizeof (duration));
-  vty_out (vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]%s",
-           oi->lsack_list->count, duration,
-           (oi->thread_send_lsack ? "on" : "off"),
-           VNL);
-  for (lsa = ospf6_lsdb_head (oi->lsack_list); lsa;
-       lsa = ospf6_lsdb_next (lsa))
-    vty_out (vty, "      %s%s", lsa->name, VNL);
-  ospf6_bfd_show_info(vty, oi->bfd_info, 1);
-  return 0;
+       struct ospf6_interface *oi;
+       struct connected *c;
+       struct prefix *p;
+       struct listnode *i;
+       char strbuf[PREFIX2STR_BUFFER], drouter[32], bdrouter[32];
+       const char *updown[3] = {"down", "up", NULL};
+       const char *type;
+       struct timeval res, now;
+       char duration[32];
+       struct ospf6_lsa *lsa;
+
+       /* check physical interface type */
+       if (if_is_loopback(ifp))
+               type = "LOOPBACK";
+       else if (if_is_broadcast(ifp))
+               type = "BROADCAST";
+       else if (if_is_pointopoint(ifp))
+               type = "POINTOPOINT";
+       else
+               type = "UNKNOWN";
+
+       vty_out(vty, "%s is %s, type %s%s", ifp->name,
+               updown[if_is_operative(ifp)], type, VNL);
+       vty_out(vty, "  Interface ID: %d%s", ifp->ifindex, VNL);
+
+       if (ifp->info == NULL) {
+               vty_out(vty, "   OSPF not enabled on this interface%s", VNL);
+               return 0;
+       } else
+               oi = (struct ospf6_interface *)ifp->info;
+
+       vty_out(vty, "  Internet Address:%s", VNL);
+
+       for (ALL_LIST_ELEMENTS_RO(ifp->connected, i, c)) {
+               p = c->address;
+               prefix2str(p, strbuf, sizeof(strbuf));
+               switch (p->family) {
+               case AF_INET:
+                       vty_out(vty, "    inet : %s%s", strbuf, VNL);
+                       break;
+               case AF_INET6:
+                       vty_out(vty, "    inet6: %s%s", strbuf, VNL);
+                       break;
+               default:
+                       vty_out(vty, "    ???  : %s%s", strbuf, VNL);
+                       break;
+               }
+       }
+
+       if (oi->area) {
+               vty_out(vty,
+                       "  Instance ID %d, Interface MTU %d (autodetect: %d)%s",
+                       oi->instance_id, oi->ifmtu, ifp->mtu6, VNL);
+               vty_out(vty, "  MTU mismatch detection: %s%s",
+                       oi->mtu_ignore ? "disabled" : "enabled", VNL);
+               inet_ntop(AF_INET, &oi->area->area_id, strbuf, sizeof(strbuf));
+               vty_out(vty, "  Area ID %s, Cost %u%s", strbuf, oi->cost, VNL);
+       } else
+               vty_out(vty, "  Not Attached to Area%s", VNL);
+
+       vty_out(vty, "  State %s, Transmit Delay %d sec, Priority %d%s",
+               ospf6_interface_state_str[oi->state], oi->transdelay,
+               oi->priority, VNL);
+       vty_out(vty, "  Timer intervals configured:%s", VNL);
+       vty_out(vty, "   Hello %d, Dead %d, Retransmit %d%s",
+               oi->hello_interval, oi->dead_interval, oi->rxmt_interval, VNL);
+
+       inet_ntop(AF_INET, &oi->drouter, drouter, sizeof(drouter));
+       inet_ntop(AF_INET, &oi->bdrouter, bdrouter, sizeof(bdrouter));
+       vty_out(vty, "  DR: %s BDR: %s%s", drouter, bdrouter, VNL);
+
+       vty_out(vty, "  Number of I/F scoped LSAs is %u%s", oi->lsdb->count,
+               VNL);
+
+       monotime(&now);
+
+       timerclear(&res);
+       if (oi->thread_send_lsupdate)
+               timersub(&oi->thread_send_lsupdate->u.sands, &now, &res);
+       timerstring(&res, duration, sizeof(duration));
+       vty_out(vty,
+               "    %d Pending LSAs for LSUpdate in Time %s [thread %s]%s",
+               oi->lsupdate_list->count, duration,
+               (oi->thread_send_lsupdate ? "on" : "off"), VNL);
+       for (lsa = ospf6_lsdb_head(oi->lsupdate_list); lsa;
+            lsa = ospf6_lsdb_next(lsa))
+               vty_out(vty, "      %s%s", lsa->name, VNL);
+
+       timerclear(&res);
+       if (oi->thread_send_lsack)
+               timersub(&oi->thread_send_lsack->u.sands, &now, &res);
+       timerstring(&res, duration, sizeof(duration));
+       vty_out(vty, "    %d Pending LSAs for LSAck in Time %s [thread %s]%s",
+               oi->lsack_list->count, duration,
+               (oi->thread_send_lsack ? "on" : "off"), VNL);
+       for (lsa = ospf6_lsdb_head(oi->lsack_list); lsa;
+            lsa = ospf6_lsdb_next(lsa))
+               vty_out(vty, "      %s%s", lsa->name, VNL);
+       ospf6_bfd_show_info(vty, oi->bfd_info, 1);
+       return 0;
 }
 
 /* show interface */
 DEFUN (show_ipv6_ospf6_interface,
        show_ipv6_ospf6_interface_ifname_cmd,
-       "show ipv6 ospf6 interface IFNAME",
+       "show ipv6 ospf6 interface [IFNAME]",
        SHOW_STR
        IP6_STR
        OSPF6_STR
        INTERFACE_STR
-       IFNAME_STR
-       )
+       IFNAME_STR)
 {
-  struct interface *ifp;
-  struct listnode *i;
-
-  if (argc)
-    {
-      ifp = if_lookup_by_name (argv[0]);
-      if (ifp == NULL)
-        {
-          vty_out (vty, "No such Interface: %s%s", argv[0],
-                   VNL);
-          return CMD_WARNING;
-        }
-      ospf6_interface_show (vty, ifp);
-    }
-  else
-    {
-      for (ALL_LIST_ELEMENTS_RO (iflist, i, ifp))
-        ospf6_interface_show (vty, ifp);
-    }
-
-  return CMD_SUCCESS;
-}
+       int idx_ifname = 4;
+       struct interface *ifp;
+       struct listnode *i;
+
+       if (argc == 5) {
+               ifp = if_lookup_by_name(argv[idx_ifname]->arg, VRF_DEFAULT);
+               if (ifp == NULL) {
+                       vty_out(vty, "No such Interface: %s%s",
+                               argv[idx_ifname]->arg, VNL);
+                       return CMD_WARNING;
+               }
+               ospf6_interface_show(vty, ifp);
+       } else {
+               for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), i, ifp))
+                       ospf6_interface_show(vty, ifp);
+       }
 
-ALIAS (show_ipv6_ospf6_interface,
-       show_ipv6_ospf6_interface_cmd,
-       "show ipv6 ospf6 interface",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       INTERFACE_STR
-       )
+       return CMD_SUCCESS;
+}
 
 DEFUN (show_ipv6_ospf6_interface_ifname_prefix,
        show_ipv6_ospf6_interface_ifname_prefix_cmd,
-       "show ipv6 ospf6 interface IFNAME prefix",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       INTERFACE_STR
-       IFNAME_STR
-       "Display connected prefixes to advertise\n"
-       )
-{
-  struct interface *ifp;
-  struct ospf6_interface *oi;
-
-  ifp = if_lookup_by_name (argv[0]);
-  if (ifp == NULL)
-    {
-      vty_out (vty, "No such Interface: %s%s", argv[0], VNL);
-      return CMD_WARNING;
-    }
-
-  oi = ifp->info;
-  if (oi == NULL)
-    {
-      vty_out (vty, "OSPFv3 is not enabled on %s%s", argv[0], VNL);
-      return CMD_WARNING;
-    }
-
-  argc--;
-  argv++;
-  ospf6_route_table_show (vty, argc, argv, oi->route_connected);
-
-  return CMD_SUCCESS;
-}
-
-ALIAS (show_ipv6_ospf6_interface_ifname_prefix,
-       show_ipv6_ospf6_interface_ifname_prefix_detail_cmd,
-       "show ipv6 ospf6 interface IFNAME prefix (X:X::X:X|X:X::X:X/M|detail)",
+       "show ipv6 ospf6 interface IFNAME prefix [<X:X::X:X|X:X::X:X/M>] [<match|detail>]",
        SHOW_STR
        IP6_STR
        OSPF6_STR
@@ -1071,52 +982,37 @@ ALIAS (show_ipv6_ospf6_interface_ifname_prefix,
        "Display connected prefixes to advertise\n"
        OSPF6_ROUTE_ADDRESS_STR
        OSPF6_ROUTE_PREFIX_STR
-       "Display details of the prefixes\n"
-       )
-
-ALIAS (show_ipv6_ospf6_interface_ifname_prefix,
-       show_ipv6_ospf6_interface_ifname_prefix_match_cmd,
-       "show ipv6 ospf6 interface IFNAME prefix X:X::X:X/M (match|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       INTERFACE_STR
-       IFNAME_STR
-       "Display connected prefixes to advertise\n"
-       OSPF6_ROUTE_PREFIX_STR
        OSPF6_ROUTE_MATCH_STR
-       "Display details of the prefixes\n"
-       )
-
-DEFUN (show_ipv6_ospf6_interface_prefix,
-       show_ipv6_ospf6_interface_prefix_cmd,
-       "show ipv6 ospf6 interface prefix",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       INTERFACE_STR
-       "Display connected prefixes to advertise\n"
-       )
+       "Display details of the prefixes\n")
 {
-  struct listnode *i;
-  struct ospf6_interface *oi;
-  struct interface *ifp;
+       int idx_ifname = 4;
+       int idx_prefix = 6;
+       struct interface *ifp;
+       struct ospf6_interface *oi;
+
+       ifp = if_lookup_by_name(argv[idx_ifname]->arg, VRF_DEFAULT);
+       if (ifp == NULL) {
+               vty_out(vty, "No such Interface: %s%s", argv[idx_ifname]->arg,
+                       VNL);
+               return CMD_WARNING;
+       }
 
-  for (ALL_LIST_ELEMENTS_RO (iflist, i, ifp))
-    {
-      oi = (struct ospf6_interface *) ifp->info;
-      if (oi == NULL)
-        continue;
+       oi = ifp->info;
+       if (oi == NULL) {
+               vty_out(vty, "OSPFv3 is not enabled on %s%s",
+                       argv[idx_ifname]->arg, VNL);
+               return CMD_WARNING;
+       }
 
-      ospf6_route_table_show (vty, argc, argv, oi->route_connected);
-    }
+       ospf6_route_table_show(vty, idx_prefix, argc, argv,
+                              oi->route_connected);
 
-  return CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
 
-ALIAS (show_ipv6_ospf6_interface_prefix,
-       show_ipv6_ospf6_interface_prefix_detail_cmd,
-       "show ipv6 ospf6 interface prefix (X:X::X:X|X:X::X:X/M|detail)",
+DEFUN (show_ipv6_ospf6_interface_prefix,
+       show_ipv6_ospf6_interface_prefix_cmd,
+       "show ipv6 ospf6 interface prefix [<X:X::X:X|X:X::X:X/M>] [<match|detail>]",
        SHOW_STR
        IP6_STR
        OSPF6_STR
@@ -1124,82 +1020,81 @@ ALIAS (show_ipv6_ospf6_interface_prefix,
        "Display connected prefixes to advertise\n"
        OSPF6_ROUTE_ADDRESS_STR
        OSPF6_ROUTE_PREFIX_STR
-       "Display details of the prefixes\n"
-       )
-
-ALIAS (show_ipv6_ospf6_interface_prefix,
-       show_ipv6_ospf6_interface_prefix_match_cmd,
-       "show ipv6 ospf6 interface prefix X:X::X:X/M (match|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       INTERFACE_STR
-       "Display connected prefixes to advertise\n"
-       OSPF6_ROUTE_PREFIX_STR
        OSPF6_ROUTE_MATCH_STR
-       "Display details of the prefixes\n"
-       )
+       "Display details of the prefixes\n")
+{
+       int idx_prefix = 5;
+       struct listnode *i;
+       struct ospf6_interface *oi;
+       struct interface *ifp;
+
+       for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), i, ifp)) {
+               oi = (struct ospf6_interface *)ifp->info;
+               if (oi == NULL)
+                       continue;
+
+               ospf6_route_table_show(vty, idx_prefix, argc, argv,
+                                      oi->route_connected);
+       }
 
+       return CMD_SUCCESS;
+}
 
 /* interface variable set command */
 DEFUN (ipv6_ospf6_ifmtu,
        ipv6_ospf6_ifmtu_cmd,
-       "ipv6 ospf6 ifmtu <1-65535>",
+       "ipv6 ospf6 ifmtu (1-65535)",
        IP6_STR
        OSPF6_STR
        "Interface MTU\n"
        "OSPFv3 Interface MTU\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-  unsigned int ifmtu, iobuflen;
-  struct listnode *node, *nnode;
-  struct ospf6_neighbor *on;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
-
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
-
-  ifmtu = strtol (argv[0], NULL, 10);
-
-  if (oi->ifmtu == ifmtu)
-    return CMD_SUCCESS;
-
-  if (ifp->mtu6 != 0 && ifp->mtu6 < ifmtu)
-    {
-      vty_out (vty, "%s's ospf6 ifmtu cannot go beyond physical mtu (%d)%s",
-               ifp->name, ifp->mtu6, VNL);
-      return CMD_WARNING;
-    }
-
-  if (oi->ifmtu < ifmtu)
-    {
-      iobuflen = ospf6_iobuf_size (ifmtu);
-      if (iobuflen < ifmtu)
-        {
-          vty_out (vty, "%s's ifmtu is adjusted to I/O buffer size (%d).%s",
-                   ifp->name, iobuflen, VNL);
-          oi->ifmtu = iobuflen;
-        }
-      else
-        oi->ifmtu = ifmtu;
-    }
-  else
-    oi->ifmtu = ifmtu;
-
-  /* re-establish adjacencies */
-  for (ALL_LIST_ELEMENTS (oi->neighbor_list, node, nnode, on))
-    {
-      THREAD_OFF (on->inactivity_timer);
-      thread_add_event (master, inactivity_timer, on, 0);
-    }
-
-  return CMD_SUCCESS;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       int idx_number = 3;
+       struct ospf6_interface *oi;
+       unsigned int ifmtu, iobuflen;
+       struct listnode *node, *nnode;
+       struct ospf6_neighbor *on;
+
+       assert(ifp);
+
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
+
+       ifmtu = strtol(argv[idx_number]->arg, NULL, 10);
+
+       if (oi->ifmtu == ifmtu)
+               return CMD_SUCCESS;
+
+       if (ifp->mtu6 != 0 && ifp->mtu6 < ifmtu) {
+               vty_out(vty,
+                       "%s's ospf6 ifmtu cannot go beyond physical mtu (%d)%s",
+                       ifp->name, ifp->mtu6, VNL);
+               return CMD_WARNING;
+       }
+
+       if (oi->ifmtu < ifmtu) {
+               iobuflen = ospf6_iobuf_size(ifmtu);
+               if (iobuflen < ifmtu) {
+                       vty_out(vty,
+                               "%s's ifmtu is adjusted to I/O buffer size (%d).%s",
+                               ifp->name, iobuflen, VNL);
+                       oi->ifmtu = iobuflen;
+               } else
+                       oi->ifmtu = ifmtu;
+       } else
+               oi->ifmtu = ifmtu;
+
+       /* re-establish adjacencies */
+       for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) {
+               THREAD_OFF(on->inactivity_timer);
+               thread_add_event(master, inactivity_timer, on, 0);
+       }
+
+       return CMD_SUCCESS;
 }
 
 DEFUN (no_ipv6_ospf6_ifmtu,
@@ -1211,83 +1106,77 @@ DEFUN (no_ipv6_ospf6_ifmtu,
        "Interface MTU\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-  unsigned int iobuflen;
-  struct listnode *node, *nnode;
-  struct ospf6_neighbor *on;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
-
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
-
-  if (oi->ifmtu < ifp->mtu)
-    {
-      iobuflen = ospf6_iobuf_size (ifp->mtu);
-      if (iobuflen < ifp->mtu)
-        {
-          vty_out (vty, "%s's ifmtu is adjusted to I/O buffer size (%d).%s",
-                   ifp->name, iobuflen, VNL);
-          oi->ifmtu = iobuflen;
-        }
-      else
-        oi->ifmtu = ifp->mtu;
-    }
-  else
-    oi->ifmtu = ifp->mtu;
-
-  /* re-establish adjacencies */
-  for (ALL_LIST_ELEMENTS (oi->neighbor_list, node, nnode, on))
-    {
-      THREAD_OFF (on->inactivity_timer);
-      thread_add_event (master, inactivity_timer, on, 0);
-    }
-
-  return CMD_SUCCESS;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       struct ospf6_interface *oi;
+       unsigned int iobuflen;
+       struct listnode *node, *nnode;
+       struct ospf6_neighbor *on;
+
+       assert(ifp);
+
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
+
+       if (oi->ifmtu < ifp->mtu) {
+               iobuflen = ospf6_iobuf_size(ifp->mtu);
+               if (iobuflen < ifp->mtu) {
+                       vty_out(vty,
+                               "%s's ifmtu is adjusted to I/O buffer size (%d).%s",
+                               ifp->name, iobuflen, VNL);
+                       oi->ifmtu = iobuflen;
+               } else
+                       oi->ifmtu = ifp->mtu;
+       } else
+               oi->ifmtu = ifp->mtu;
+
+       /* re-establish adjacencies */
+       for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) {
+               THREAD_OFF(on->inactivity_timer);
+               thread_add_event(master, inactivity_timer, on, 0);
+       }
+
+       return CMD_SUCCESS;
 }
 
 DEFUN (ipv6_ospf6_cost,
        ipv6_ospf6_cost_cmd,
-       "ipv6 ospf6 cost <1-65535>",
+       "ipv6 ospf6 cost (1-65535)",
        IP6_STR
        OSPF6_STR
        "Interface cost\n"
        "Outgoing metric of this interface\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-  unsigned long int lcost;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
-
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
-
-  lcost = strtol (argv[0], NULL, 10);
-
-  if (lcost > UINT32_MAX)
-    {
-      vty_out (vty, "Cost %ld is out of range%s", lcost, VNL);
-      return CMD_WARNING;
-    }
-  
-  if (oi->cost == lcost)
-    return CMD_SUCCESS;
-  
-  oi->cost = lcost;
-  SET_FLAG (oi->flag, OSPF6_INTERFACE_NOAUTOCOST);
-
-  ospf6_interface_recalculate_cost(oi);
-
-  return CMD_SUCCESS;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       int idx_number = 3;
+       struct ospf6_interface *oi;
+       unsigned long int lcost;
+
+       assert(ifp);
+
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
+
+       lcost = strtol(argv[idx_number]->arg, NULL, 10);
+
+       if (lcost > UINT32_MAX) {
+               vty_out(vty, "Cost %ld is out of range%s", lcost, VNL);
+               return CMD_WARNING;
+       }
+
+       if (oi->cost == lcost)
+               return CMD_SUCCESS;
+
+       oi->cost = lcost;
+       SET_FLAG(oi->flag, OSPF6_INTERFACE_NOAUTOCOST);
+
+       ospf6_interface_recalculate_cost(oi);
+
+       return CMD_SUCCESS;
 }
 
 DEFUN (no_ipv6_ospf6_cost,
@@ -1299,240 +1188,225 @@ DEFUN (no_ipv6_ospf6_cost,
        "Calculate interface cost from bandwidth\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       struct ospf6_interface *oi;
+       assert(ifp);
 
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
+       UNSET_FLAG(oi->flag, OSPF6_INTERFACE_NOAUTOCOST);
 
-  UNSET_FLAG (oi->flag, OSPF6_INTERFACE_NOAUTOCOST);
+       ospf6_interface_recalculate_cost(oi);
 
-  ospf6_interface_recalculate_cost(oi);
-
-  return CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
 
 DEFUN (auto_cost_reference_bandwidth,
        auto_cost_reference_bandwidth_cmd,
-       "auto-cost reference-bandwidth <1-4294967>",
+       "auto-cost reference-bandwidth (1-4294967)",
        "Calculate OSPF interface cost according to bandwidth\n"
        "Use reference bandwidth method to assign OSPF cost\n"
        "The reference bandwidth in terms of Mbits per second\n")
 {
-  struct ospf6 *o = vty->index;
-  struct ospf6_area *oa;
-  struct ospf6_interface *oi;
-  struct listnode *i, *j;
-  u_int32_t refbw;
-
-  refbw = strtol (argv[0], NULL, 10);
-  if (refbw < 1 || refbw > 4294967)
-    {
-      vty_out (vty, "reference-bandwidth value is invalid%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
-
-  /* If reference bandwidth is changed. */
-  if ((refbw * 1000) == o->ref_bandwidth)
-    return CMD_SUCCESS;
-
-  o->ref_bandwidth = refbw * 1000;
-  for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
-      for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
-          ospf6_interface_recalculate_cost (oi);
-
-  return CMD_SUCCESS;
+       VTY_DECLVAR_CONTEXT(ospf6, o);
+       int idx_number = 2;
+       struct ospf6_area *oa;
+       struct ospf6_interface *oi;
+       struct listnode *i, *j;
+       u_int32_t refbw;
+
+       refbw = strtol(argv[idx_number]->arg, NULL, 10);
+       if (refbw < 1 || refbw > 4294967) {
+               vty_out(vty, "reference-bandwidth value is invalid%s",
+                       VTY_NEWLINE);
+               return CMD_WARNING;
+       }
+
+       /* If reference bandwidth is changed. */
+       if ((refbw) == o->ref_bandwidth)
+               return CMD_SUCCESS;
+
+       o->ref_bandwidth = refbw;
+       for (ALL_LIST_ELEMENTS_RO(o->area_list, i, oa))
+               for (ALL_LIST_ELEMENTS_RO(oa->if_list, j, oi))
+                       ospf6_interface_recalculate_cost(oi);
+
+       return CMD_SUCCESS;
 }
 
 DEFUN (no_auto_cost_reference_bandwidth,
        no_auto_cost_reference_bandwidth_cmd,
-       "no auto-cost reference-bandwidth",
+       "no auto-cost reference-bandwidth [(1-4294967)]",
        NO_STR
        "Calculate OSPF interface cost according to bandwidth\n"
-       "Use reference bandwidth method to assign OSPF cost\n")
+       "Use reference bandwidth method to assign OSPF cost\n"
+       "The reference bandwidth in terms of Mbits per second\n")
 {
-  struct ospf6 *o = vty->index;
-  struct ospf6_area *oa;
-  struct ospf6_interface *oi;
-  struct listnode *i, *j;
+       VTY_DECLVAR_CONTEXT(ospf6, o);
+       struct ospf6_area *oa;
+       struct ospf6_interface *oi;
+       struct listnode *i, *j;
 
-  if (o->ref_bandwidth == OSPF6_REFERENCE_BANDWIDTH)
-    return CMD_SUCCESS;
+       if (o->ref_bandwidth == OSPF6_REFERENCE_BANDWIDTH)
+               return CMD_SUCCESS;
 
-  o->ref_bandwidth = OSPF6_REFERENCE_BANDWIDTH;
-  for (ALL_LIST_ELEMENTS_RO (o->area_list, i, oa))
-      for (ALL_LIST_ELEMENTS_RO (oa->if_list, j, oi))
-          ospf6_interface_recalculate_cost (oi);
+       o->ref_bandwidth = OSPF6_REFERENCE_BANDWIDTH;
+       for (ALL_LIST_ELEMENTS_RO(o->area_list, i, oa))
+               for (ALL_LIST_ELEMENTS_RO(oa->if_list, j, oi))
+                       ospf6_interface_recalculate_cost(oi);
 
-  return CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
 
-ALIAS (no_auto_cost_reference_bandwidth,
-       no_auto_cost_reference_bandwidth_val_cmd,
-       "no auto-cost reference-bandwidth <1-4294967>",
-       NO_STR
-       "Calculate OSPF interface cost according to bandwidth\n"
-       "Use reference bandwidth method to assign OSPF cost\n"
-       "The reference bandwidth in terms of Mbits per second\n")
 
 DEFUN (ipv6_ospf6_hellointerval,
        ipv6_ospf6_hellointerval_cmd,
-       "ipv6 ospf6 hello-interval <1-65535>",
+       "ipv6 ospf6 hello-interval (1-65535)",
        IP6_STR
        OSPF6_STR
-       "Interval time of Hello packets\n"
+       "Time between HELLO packets\n"
        SECONDS_STR
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       int idx_number = 3;
+       struct ospf6_interface *oi;
+       assert(ifp);
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  oi->hello_interval = strtol (argv[0], NULL, 10);
-  return CMD_SUCCESS;
+       oi->hello_interval = strtol(argv[idx_number]->arg, NULL, 10);
+       return CMD_SUCCESS;
 }
 
 /* interface variable set command */
 DEFUN (ipv6_ospf6_deadinterval,
        ipv6_ospf6_deadinterval_cmd,
-       "ipv6 ospf6 dead-interval <1-65535>",
+       "ipv6 ospf6 dead-interval (1-65535)",
        IP6_STR
        OSPF6_STR
        "Interval time after which a neighbor is declared down\n"
        SECONDS_STR
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       int idx_number = 3;
+       struct ospf6_interface *oi;
+       assert(ifp);
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  oi->dead_interval = strtol (argv[0], NULL, 10);
-  return CMD_SUCCESS;
+       oi->dead_interval = strtol(argv[idx_number]->arg, NULL, 10);
+       return CMD_SUCCESS;
 }
 
 /* interface variable set command */
 DEFUN (ipv6_ospf6_transmitdelay,
        ipv6_ospf6_transmitdelay_cmd,
-       "ipv6 ospf6 transmit-delay <1-3600>",
+       "ipv6 ospf6 transmit-delay (1-3600)",
        IP6_STR
        OSPF6_STR
-       "Transmit delay of this interface\n"
-       SECONDS_STR
-       )
+       "Link state transmit delay\n"
+       SECONDS_STR)
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       int idx_number = 3;
+       struct ospf6_interface *oi;
+       assert(ifp);
 
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
-
-  oi->transdelay = strtol (argv[0], NULL, 10);
-  return CMD_SUCCESS;
+       oi->transdelay = strtol(argv[idx_number]->arg, NULL, 10);
+       return CMD_SUCCESS;
 }
 
 /* interface variable set command */
 DEFUN (ipv6_ospf6_retransmitinterval,
        ipv6_ospf6_retransmitinterval_cmd,
-       "ipv6 ospf6 retransmit-interval <1-65535>",
+       "ipv6 ospf6 retransmit-interval (1-65535)",
        IP6_STR
        OSPF6_STR
        "Time between retransmitting lost link state advertisements\n"
        SECONDS_STR
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       int idx_number = 3;
+       struct ospf6_interface *oi;
+       assert(ifp);
 
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
-
-  oi->rxmt_interval = strtol (argv[0], NULL, 10);
-  return CMD_SUCCESS;
+       oi->rxmt_interval = strtol(argv[idx_number]->arg, NULL, 10);
+       return CMD_SUCCESS;
 }
 
 /* interface variable set command */
 DEFUN (ipv6_ospf6_priority,
        ipv6_ospf6_priority_cmd,
-       "ipv6 ospf6 priority <0-255>",
+       "ipv6 ospf6 priority (0-255)",
        IP6_STR
        OSPF6_STR
        "Router priority\n"
        "Priority value\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       int idx_number = 3;
+       struct ospf6_interface *oi;
+       assert(ifp);
 
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
+       oi->priority = strtol(argv[idx_number]->arg, NULL, 10);
 
-  oi->priority = strtol (argv[0], NULL, 10);
+       if (oi->area && (oi->state == OSPF6_INTERFACE_DROTHER
+                        || oi->state == OSPF6_INTERFACE_BDR
+                        || oi->state == OSPF6_INTERFACE_DR))
+               ospf6_interface_state_change(dr_election(oi), oi);
 
-  if (oi->area &&
-      (oi->state == OSPF6_INTERFACE_DROTHER ||
-       oi->state == OSPF6_INTERFACE_BDR ||
-       oi->state == OSPF6_INTERFACE_DR))
-    ospf6_interface_state_change (dr_election (oi), oi);
-
-  return CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
 
 DEFUN (ipv6_ospf6_instance,
        ipv6_ospf6_instance_cmd,
-       "ipv6 ospf6 instance-id <0-255>",
+       "ipv6 ospf6 instance-id (0-255)",
        IP6_STR
        OSPF6_STR
        "Instance ID for this interface\n"
        "Instance ID value\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-
-  ifp = (struct interface *)vty->index;
-  assert (ifp);
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       int idx_number = 3;
+       struct ospf6_interface *oi;
+       assert(ifp);
 
-  oi = (struct ospf6_interface *)ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  oi->instance_id = strtol (argv[0], NULL, 10);
-  return CMD_SUCCESS;
+       oi->instance_id = strtol(argv[idx_number]->arg, NULL, 10);
+       return CMD_SUCCESS;
 }
 
 DEFUN (ipv6_ospf6_passive,
@@ -1540,32 +1414,30 @@ DEFUN (ipv6_ospf6_passive,
        "ipv6 ospf6 passive",
        IP6_STR
        OSPF6_STR
-       "passive interface, No adjacency will be formed on this interface\n"
+       "Passive interface; no adjacency will be formed on this interface\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-  struct listnode *node, *nnode;
-  struct ospf6_neighbor *on;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       struct ospf6_interface *oi;
+       struct listnode *node, *nnode;
+       struct ospf6_neighbor *on;
 
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
+       assert(ifp);
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  SET_FLAG (oi->flag, OSPF6_INTERFACE_PASSIVE);
-  THREAD_OFF (oi->thread_send_hello);
+       SET_FLAG(oi->flag, OSPF6_INTERFACE_PASSIVE);
+       THREAD_OFF(oi->thread_send_hello);
 
-  for (ALL_LIST_ELEMENTS (oi->neighbor_list, node, nnode, on))
-    {
-      THREAD_OFF (on->inactivity_timer);
-      thread_add_event (master, inactivity_timer, on, 0);
-    }
+       for (ALL_LIST_ELEMENTS(oi->neighbor_list, node, nnode, on)) {
+               THREAD_OFF(on->inactivity_timer);
+               thread_add_event(master, inactivity_timer, on, 0);
+       }
 
-  return CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
 
 DEFUN (no_ipv6_ospf6_passive,
@@ -1577,23 +1449,21 @@ DEFUN (no_ipv6_ospf6_passive,
        "passive interface: No Adjacency will be formed on this I/F\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       struct ospf6_interface *oi;
+       assert(ifp);
 
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
+       UNSET_FLAG(oi->flag, OSPF6_INTERFACE_PASSIVE);
+       THREAD_OFF(oi->thread_send_hello);
+       oi->thread_send_hello =
+               thread_add_event(master, ospf6_hello_send, oi, 0);
 
-  UNSET_FLAG (oi->flag, OSPF6_INTERFACE_PASSIVE);
-  THREAD_OFF (oi->thread_send_hello);
-  oi->thread_send_hello =
-    thread_add_event (master, ospf6_hello_send, oi, 0);
-
-  return CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
 
 DEFUN (ipv6_ospf6_mtu_ignore,
@@ -1601,23 +1471,21 @@ DEFUN (ipv6_ospf6_mtu_ignore,
        "ipv6 ospf6 mtu-ignore",
        IP6_STR
        OSPF6_STR
-       "Ignore MTU mismatch on this interface\n"
+       "Disable MTU mismatch detection on this interface\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       struct ospf6_interface *oi;
+       assert(ifp);
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  oi->mtu_ignore = 1;
+       oi->mtu_ignore = 1;
 
-  return CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
 
 DEFUN (no_ipv6_ospf6_mtu_ignore,
@@ -1626,23 +1494,21 @@ DEFUN (no_ipv6_ospf6_mtu_ignore,
        NO_STR
        IP6_STR
        OSPF6_STR
-       "Ignore MTU mismatch on this interface\n"
+       "Disable MTU mismatch detection on this interface\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       struct ospf6_interface *oi;
+       assert(ifp);
 
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
 
-  oi->mtu_ignore = 0;
+       oi->mtu_ignore = 0;
 
-  return CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
 
 DEFUN (ipv6_ospf6_advertise_prefix_list,
@@ -1655,35 +1521,32 @@ DEFUN (ipv6_ospf6_advertise_prefix_list,
        "Prefix list name\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
-
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
-
-  if (oi->plist_name)
-    XFREE (MTYPE_PREFIX_LIST_STR, oi->plist_name);
-  oi->plist_name = XSTRDUP (MTYPE_PREFIX_LIST_STR, argv[0]);
-
-  ospf6_interface_connected_route_update (oi->interface);
-
-  if (oi->area)
-    {
-      OSPF6_LINK_LSA_SCHEDULE (oi);
-      if (oi->state == OSPF6_INTERFACE_DR)
-        {
-          OSPF6_NETWORK_LSA_SCHEDULE (oi);
-          OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT (oi);
-        }
-      OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area);
-    }
-
-  return CMD_SUCCESS;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       int idx_word = 4;
+       struct ospf6_interface *oi;
+       assert(ifp);
+
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
+
+       if (oi->plist_name)
+               XFREE(MTYPE_CFG_PLIST_NAME, oi->plist_name);
+       oi->plist_name = XSTRDUP(MTYPE_CFG_PLIST_NAME, argv[idx_word]->arg);
+
+       ospf6_interface_connected_route_update(oi->interface);
+
+       if (oi->area) {
+               OSPF6_LINK_LSA_SCHEDULE(oi);
+               if (oi->state == OSPF6_INTERFACE_DR) {
+                       OSPF6_NETWORK_LSA_SCHEDULE(oi);
+                       OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT(oi);
+               }
+               OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(oi->area);
+       }
+
+       return CMD_SUCCESS;
 }
 
 DEFUN (no_ipv6_ospf6_advertise_prefix_list,
@@ -1696,81 +1559,72 @@ DEFUN (no_ipv6_ospf6_advertise_prefix_list,
        "Filter prefix using prefix-list\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
-
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL)
-    oi = ospf6_interface_create (ifp);
-  assert (oi);
-
-  if (oi->plist_name)
-    {
-      XFREE (MTYPE_PREFIX_LIST_STR, oi->plist_name);
-      oi->plist_name = NULL;
-    }
-
-  ospf6_interface_connected_route_update (oi->interface);
-
-  if (oi->area)
-    {
-      OSPF6_LINK_LSA_SCHEDULE (oi);
-      if (oi->state == OSPF6_INTERFACE_DR)
-        {
-          OSPF6_NETWORK_LSA_SCHEDULE (oi);
-          OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT (oi);
-        }
-      OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area);
-    }
-
-  return CMD_SUCCESS;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       struct ospf6_interface *oi;
+       assert(ifp);
+
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL)
+               oi = ospf6_interface_create(ifp);
+       assert(oi);
+
+       if (oi->plist_name) {
+               XFREE(MTYPE_CFG_PLIST_NAME, oi->plist_name);
+               oi->plist_name = NULL;
+       }
+
+       ospf6_interface_connected_route_update(oi->interface);
+
+       if (oi->area) {
+               OSPF6_LINK_LSA_SCHEDULE(oi);
+               if (oi->state == OSPF6_INTERFACE_DR) {
+                       OSPF6_NETWORK_LSA_SCHEDULE(oi);
+                       OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT(oi);
+               }
+               OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB(oi->area);
+       }
+
+       return CMD_SUCCESS;
 }
 
 DEFUN (ipv6_ospf6_network,
        ipv6_ospf6_network_cmd,
-       "ipv6 ospf6 network (broadcast|point-to-point)",
+       "ipv6 ospf6 network <broadcast|point-to-point>",
        IP6_STR
        OSPF6_STR
-       "Network Type\n"
-       "Specify OSPFv6 broadcast network\n"
+       "Network type\n"
+       "Specify OSPF6 broadcast network\n"
        "Specify OSPF6 point-to-point network\n"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
-
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL) {
-    oi = ospf6_interface_create (ifp);
-  }
-  assert (oi);
-
-  if (strncmp (argv[0], "b", 1) == 0)
-    {
-      if (oi->type == OSPF_IFTYPE_BROADCAST)
-       return CMD_SUCCESS;
-
-      oi->type = OSPF_IFTYPE_BROADCAST;
-    }
-    else if (strncmp (argv[0], "point-to-p", 10) == 0)
-      {
-       if (oi->type == OSPF_IFTYPE_POINTOPOINT) {
-         return CMD_SUCCESS;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       int idx_network = 3;
+       struct ospf6_interface *oi;
+       assert(ifp);
+
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL) {
+               oi = ospf6_interface_create(ifp);
+       }
+       assert(oi);
+
+       if (strncmp(argv[idx_network]->arg, "b", 1) == 0) {
+               if (oi->type == OSPF_IFTYPE_BROADCAST)
+                       return CMD_SUCCESS;
+
+               oi->type = OSPF_IFTYPE_BROADCAST;
+       } else if (strncmp(argv[idx_network]->arg, "point-to-p", 10) == 0) {
+               if (oi->type == OSPF_IFTYPE_POINTOPOINT) {
+                       return CMD_SUCCESS;
+               }
+               oi->type = OSPF_IFTYPE_POINTOPOINT;
        }
-       oi->type = OSPF_IFTYPE_POINTOPOINT;
-      }
 
-  /* Reset the interface */
-  thread_add_event (master, interface_down, oi, 0);
-  thread_add_event (master, interface_up, oi, 0);
+       /* Reset the interface */
+       thread_add_event(master, interface_down, oi, 0);
+       thread_add_event(master, interface_up, oi, 0);
 
-  return CMD_SUCCESS;
+       return CMD_SUCCESS;
 }
 
 DEFUN (no_ipv6_ospf6_network,
@@ -1779,193 +1633,169 @@ DEFUN (no_ipv6_ospf6_network,
        NO_STR
        IP6_STR
        OSPF6_STR
-       "Network Type\n"
+       "Network type\n"
        "Default to whatever interface type system specifies"
        )
 {
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-  int type;
-
-  ifp = (struct interface *) vty->index;
-  assert (ifp);
-
-  oi = (struct ospf6_interface *) ifp->info;
-  if (oi == NULL) {
-    return CMD_SUCCESS;
-  }
-
-  type = ospf6_default_iftype (ifp);
-  if (oi->type == type)
-    {
-      return CMD_SUCCESS;
-    }
-  oi->type = type;
-
-  /* Reset the interface */
-  thread_add_event (master, interface_down, oi, 0);
-  thread_add_event (master, interface_up, oi, 0);
-
-  return CMD_SUCCESS;
+       VTY_DECLVAR_CONTEXT(interface, ifp);
+       struct ospf6_interface *oi;
+       int type;
+
+       assert(ifp);
+
+       oi = (struct ospf6_interface *)ifp->info;
+       if (oi == NULL) {
+               return CMD_SUCCESS;
+       }
+
+       type = ospf6_default_iftype(ifp);
+       if (oi->type == type) {
+               return CMD_SUCCESS;
+       }
+       oi->type = type;
+
+       /* Reset the interface */
+       thread_add_event(master, interface_down, oi, 0);
+       thread_add_event(master, interface_up, oi, 0);
+
+       return CMD_SUCCESS;
 }
 
-static int
-config_write_ospf6_interface (struct vty *vty)
+static int config_write_ospf6_interface(struct vty *vty)
 {
-  struct listnode *i;
-  struct ospf6_interface *oi;
-  struct interface *ifp;
-
-  for (ALL_LIST_ELEMENTS_RO (iflist, i, ifp))
-    {
-      oi = (struct ospf6_interface *) ifp->info;
-      if (oi == NULL)
-        continue;
-
-      vty_out (vty, "interface %s%s",
-               oi->interface->name, VNL);
-
-      if (ifp->desc)
-        vty_out (vty, " description %s%s", ifp->desc, VNL);
-      if (ifp->mtu6 != oi->ifmtu)
-        vty_out (vty, " ipv6 ospf6 ifmtu %d%s", oi->ifmtu, VNL);
-
-      if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_NOAUTOCOST))
-        vty_out (vty, " ipv6 ospf6 cost %d%s",
-                 oi->cost, VNL);
-
-      if (oi->hello_interval != OSPF6_INTERFACE_HELLO_INTERVAL)
-        vty_out (vty, " ipv6 ospf6 hello-interval %d%s",
-                 oi->hello_interval, VNL);
-
-      if (oi->dead_interval != OSPF6_INTERFACE_DEAD_INTERVAL)
-        vty_out (vty, " ipv6 ospf6 dead-interval %d%s",
-                 oi->dead_interval, VNL);
-
-      if (oi->rxmt_interval != OSPF6_INTERFACE_RXMT_INTERVAL)
-        vty_out (vty, " ipv6 ospf6 retransmit-interval %d%s",
-                 oi->rxmt_interval, VNL);
-
-      if (oi->priority != OSPF6_INTERFACE_PRIORITY)
-        vty_out (vty, " ipv6 ospf6 priority %d%s",
-                 oi->priority, VNL);
-
-      if (oi->transdelay != OSPF6_INTERFACE_TRANSDELAY)
-        vty_out (vty, " ipv6 ospf6 transmit-delay %d%s",
-                 oi->transdelay, VNL);
-
-      if (oi->instance_id != OSPF6_INTERFACE_INSTANCE_ID)
-        vty_out (vty, " ipv6 ospf6 instance-id %d%s",
-                 oi->instance_id, VNL);
-
-      if (oi->plist_name)
-        vty_out (vty, " ipv6 ospf6 advertise prefix-list %s%s",
-                 oi->plist_name, VNL);
-
-      if (CHECK_FLAG (oi->flag, OSPF6_INTERFACE_PASSIVE))
-        vty_out (vty, " ipv6 ospf6 passive%s", VNL);
-
-      if (oi->mtu_ignore)
-        vty_out (vty, " ipv6 ospf6 mtu-ignore%s", VNL);
-
-      if (oi->type != ospf6_default_iftype(ifp))
-        {
-          if (oi->type == OSPF_IFTYPE_POINTOPOINT)
-            vty_out (vty, " ipv6 ospf6 network point-to-point%s", VNL);
-          else if (oi->type == OSPF_IFTYPE_BROADCAST)
-            vty_out (vty, " ipv6 ospf6 network broadcast%s", VNL);
-        }
-
-      ospf6_bfd_write_config(vty, oi);
-
-      vty_out (vty, "!%s", VNL);
-    }
-  return 0;
+       struct listnode *i;
+       struct ospf6_interface *oi;
+       struct interface *ifp;
+
+       for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), i, ifp)) {
+               oi = (struct ospf6_interface *)ifp->info;
+               if (oi == NULL)
+                       continue;
+
+               vty_out(vty, "interface %s%s", oi->interface->name, VNL);
+
+               if (ifp->desc)
+                       vty_out(vty, " description %s%s", ifp->desc, VNL);
+               if (ifp->mtu6 != oi->ifmtu)
+                       vty_out(vty, " ipv6 ospf6 ifmtu %d%s", oi->ifmtu, VNL);
+
+               if (CHECK_FLAG(oi->flag, OSPF6_INTERFACE_NOAUTOCOST))
+                       vty_out(vty, " ipv6 ospf6 cost %d%s", oi->cost, VNL);
+
+               if (oi->hello_interval != OSPF6_INTERFACE_HELLO_INTERVAL)
+                       vty_out(vty, " ipv6 ospf6 hello-interval %d%s",
+                               oi->hello_interval, VNL);
+
+               if (oi->dead_interval != OSPF6_INTERFACE_DEAD_INTERVAL)
+                       vty_out(vty, " ipv6 ospf6 dead-interval %d%s",
+                               oi->dead_interval, VNL);
+
+               if (oi->rxmt_interval != OSPF6_INTERFACE_RXMT_INTERVAL)
+                       vty_out(vty, " ipv6 ospf6 retransmit-interval %d%s",
+                               oi->rxmt_interval, VNL);
+
+               if (oi->priority != OSPF6_INTERFACE_PRIORITY)
+                       vty_out(vty, " ipv6 ospf6 priority %d%s", oi->priority,
+                               VNL);
+
+               if (oi->transdelay != OSPF6_INTERFACE_TRANSDELAY)
+                       vty_out(vty, " ipv6 ospf6 transmit-delay %d%s",
+                               oi->transdelay, VNL);
+
+               if (oi->instance_id != OSPF6_INTERFACE_INSTANCE_ID)
+                       vty_out(vty, " ipv6 ospf6 instance-id %d%s",
+                               oi->instance_id, VNL);
+
+               if (oi->plist_name)
+                       vty_out(vty, " ipv6 ospf6 advertise prefix-list %s%s",
+                               oi->plist_name, VNL);
+
+               if (CHECK_FLAG(oi->flag, OSPF6_INTERFACE_PASSIVE))
+                       vty_out(vty, " ipv6 ospf6 passive%s", VNL);
+
+               if (oi->mtu_ignore)
+                       vty_out(vty, " ipv6 ospf6 mtu-ignore%s", VNL);
+
+               if (oi->type != ospf6_default_iftype(ifp)) {
+                       if (oi->type == OSPF_IFTYPE_POINTOPOINT)
+                               vty_out(vty,
+                                       " ipv6 ospf6 network point-to-point%s",
+                                       VNL);
+                       else if (oi->type == OSPF_IFTYPE_BROADCAST)
+                               vty_out(vty, " ipv6 ospf6 network broadcast%s",
+                                       VNL);
+               }
+
+               ospf6_bfd_write_config(vty, oi);
+
+               vty_out(vty, "!%s", VNL);
+       }
+       return 0;
 }
 
-static struct cmd_node interface_node =
-{
-  INTERFACE_NODE,
-  "%s(config-if)# ",
-  1 /* VTYSH */
+static struct cmd_node interface_node = {
+       INTERFACE_NODE, "%s(config-if)# ", 1 /* VTYSH */
 };
 
-void
-ospf6_interface_init (void)
+void ospf6_interface_init(void)
 {
-  /* Install interface node. */
-  install_node (&interface_node, config_write_ospf6_interface);
-
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_prefix_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_prefix_detail_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_prefix_match_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_prefix_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_prefix_detail_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_prefix_match_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_prefix_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_prefix_detail_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_prefix_match_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_prefix_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_prefix_detail_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_interface_ifname_prefix_match_cmd);
-
-  install_element (CONFIG_NODE, &interface_cmd);
-  install_default (INTERFACE_NODE);
-  install_element (INTERFACE_NODE, &interface_desc_cmd);
-  install_element (INTERFACE_NODE, &no_interface_desc_cmd);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_cost_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_ospf6_cost_cmd);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_ifmtu_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_ospf6_ifmtu_cmd);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_deadinterval_cmd);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_hellointerval_cmd);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_priority_cmd);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_retransmitinterval_cmd);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_transmitdelay_cmd);
-  install_element (INTERFACE_NODE, &ipv6_ospf6_instance_cmd);
-
-  install_element (INTERFACE_NODE, &ipv6_ospf6_passive_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_ospf6_passive_cmd);
-
-  install_element (INTERFACE_NODE, &ipv6_ospf6_mtu_ignore_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_ospf6_mtu_ignore_cmd);
-
-  install_element (INTERFACE_NODE, &ipv6_ospf6_advertise_prefix_list_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_ospf6_advertise_prefix_list_cmd);
-
-  install_element (INTERFACE_NODE, &ipv6_ospf6_network_cmd);
-  install_element (INTERFACE_NODE, &no_ipv6_ospf6_network_cmd);
-
-  /* reference bandwidth commands */
-  install_element (OSPF6_NODE, &auto_cost_reference_bandwidth_cmd);
-  install_element (OSPF6_NODE, &no_auto_cost_reference_bandwidth_cmd);
-  install_element (OSPF6_NODE, &no_auto_cost_reference_bandwidth_val_cmd);
+       /* Install interface node. */
+       install_node(&interface_node, config_write_ospf6_interface);
+       if_cmd_init();
+
+       install_element(VIEW_NODE, &show_ipv6_ospf6_interface_prefix_cmd);
+       install_element(VIEW_NODE, &show_ipv6_ospf6_interface_ifname_cmd);
+       install_element(VIEW_NODE,
+                       &show_ipv6_ospf6_interface_ifname_prefix_cmd);
+
+       install_element(INTERFACE_NODE, &ipv6_ospf6_cost_cmd);
+       install_element(INTERFACE_NODE, &no_ipv6_ospf6_cost_cmd);
+       install_element(INTERFACE_NODE, &ipv6_ospf6_ifmtu_cmd);
+       install_element(INTERFACE_NODE, &no_ipv6_ospf6_ifmtu_cmd);
+       install_element(INTERFACE_NODE, &ipv6_ospf6_deadinterval_cmd);
+       install_element(INTERFACE_NODE, &ipv6_ospf6_hellointerval_cmd);
+       install_element(INTERFACE_NODE, &ipv6_ospf6_priority_cmd);
+       install_element(INTERFACE_NODE, &ipv6_ospf6_retransmitinterval_cmd);
+       install_element(INTERFACE_NODE, &ipv6_ospf6_transmitdelay_cmd);
+       install_element(INTERFACE_NODE, &ipv6_ospf6_instance_cmd);
+
+       install_element(INTERFACE_NODE, &ipv6_ospf6_passive_cmd);
+       install_element(INTERFACE_NODE, &no_ipv6_ospf6_passive_cmd);
+
+       install_element(INTERFACE_NODE, &ipv6_ospf6_mtu_ignore_cmd);
+       install_element(INTERFACE_NODE, &no_ipv6_ospf6_mtu_ignore_cmd);
+
+       install_element(INTERFACE_NODE, &ipv6_ospf6_advertise_prefix_list_cmd);
+       install_element(INTERFACE_NODE,
+                       &no_ipv6_ospf6_advertise_prefix_list_cmd);
+
+       install_element(INTERFACE_NODE, &ipv6_ospf6_network_cmd);
+       install_element(INTERFACE_NODE, &no_ipv6_ospf6_network_cmd);
+
+       /* reference bandwidth commands */
+       install_element(OSPF6_NODE, &auto_cost_reference_bandwidth_cmd);
+       install_element(OSPF6_NODE, &no_auto_cost_reference_bandwidth_cmd);
 }
 
 /* Clear the specified interface structure */
-static void
-ospf6_interface_clear (struct vty *vty, struct interface *ifp)
+static void ospf6_interface_clear(struct vty *vty, struct interface *ifp)
 {
-  struct ospf6_interface *oi;
+       struct ospf6_interface *oi;
 
-  if (!if_is_operative (ifp))
-    return;
+       if (!if_is_operative(ifp))
+               return;
 
-  if (ifp->info == NULL)
-    return;
+       if (ifp->info == NULL)
+               return;
 
-  oi = (struct ospf6_interface *) ifp->info;
+       oi = (struct ospf6_interface *)ifp->info;
 
-  if (IS_OSPF6_DEBUG_INTERFACE)
-    zlog_debug ("Interface %s: clear by reset", ifp->name);
+       if (IS_OSPF6_DEBUG_INTERFACE)
+               zlog_debug("Interface %s: clear by reset", ifp->name);
 
-  /* Reset the interface */
-  thread_add_event (master, interface_down, oi, 0);
-  thread_add_event (master, interface_up, oi, 0);
+       /* Reset the interface */
+       thread_add_event(master, interface_down, oi, 0);
+       thread_add_event(master, interface_up, oi, 0);
 }
 
 /* Clear interface */
@@ -1979,31 +1809,32 @@ DEFUN (clear_ipv6_ospf6_interface,
        IFNAME_STR
        )
 {
-  struct interface *ifp;
-  struct listnode *node;
-
-  if (argc == 0) /* Clear all the ospfv3 interfaces. */
-    {
-      for (ALL_LIST_ELEMENTS_RO (iflist, node, ifp))
-        ospf6_interface_clear (vty, ifp);
-    }
-  else /* Interface name is specified. */
-    {
-      if ((ifp = if_lookup_by_name (argv[0])) == NULL)
-        {
-          vty_out (vty, "No such Interface: %s%s", argv[0], VNL);
-          return CMD_WARNING;
-        }
-      ospf6_interface_clear (vty, ifp);
-    }
-
-  return CMD_SUCCESS;
+       int idx_ifname = 4;
+       struct interface *ifp;
+       struct listnode *node;
+
+       if (argc == 4) /* Clear all the ospfv3 interfaces. */
+       {
+               for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp))
+                       ospf6_interface_clear(vty, ifp);
+       } else /* Interface name is specified. */
+       {
+               if ((ifp = if_lookup_by_name(argv[idx_ifname]->arg,
+                                            VRF_DEFAULT))
+                   == NULL) {
+                       vty_out(vty, "No such Interface: %s%s",
+                               argv[idx_ifname]->arg, VNL);
+                       return CMD_WARNING;
+               }
+               ospf6_interface_clear(vty, ifp);
+       }
+
+       return CMD_SUCCESS;
 }
 
-void
-install_element_ospf6_clear_interface (void)
+void install_element_ospf6_clear_interface(void)
 {
-  install_element (ENABLE_NODE, &clear_ipv6_ospf6_interface_cmd);
+       install_element(ENABLE_NODE, &clear_ipv6_ospf6_interface_cmd);
 }
 
 DEFUN (debug_ospf6_interface,
@@ -2014,8 +1845,8 @@ DEFUN (debug_ospf6_interface,
        "Debug OSPFv3 Interface\n"
       )
 {
-  OSPF6_DEBUG_INTERFACE_ON ();
-  return CMD_SUCCESS;
+       OSPF6_DEBUG_INTERFACE_ON();
+       return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_ospf6_interface,
@@ -2027,25 +1858,21 @@ DEFUN (no_debug_ospf6_interface,
        "Debug OSPFv3 Interface\n"
       )
 {
-  OSPF6_DEBUG_INTERFACE_OFF ();
-  return CMD_SUCCESS;
+       OSPF6_DEBUG_INTERFACE_OFF();
+       return CMD_SUCCESS;
 }
 
-int
-config_write_ospf6_debug_interface (struct vty *vty)
+int config_write_ospf6_debug_interface(struct vty *vty)
 {
-  if (IS_OSPF6_DEBUG_INTERFACE)
-    vty_out (vty, "debug ospf6 interface%s", VNL);
-  return 0;
+       if (IS_OSPF6_DEBUG_INTERFACE)
+               vty_out(vty, "debug ospf6 interface%s", VNL);
+       return 0;
 }
 
-void
-install_element_ospf6_debug_interface (void)
+void install_element_ospf6_debug_interface(void)
 {
-  install_element (ENABLE_NODE, &debug_ospf6_interface_cmd);
-  install_element (ENABLE_NODE, &no_debug_ospf6_interface_cmd);
-  install_element (CONFIG_NODE, &debug_ospf6_interface_cmd);
-  install_element (CONFIG_NODE, &no_debug_ospf6_interface_cmd);
+       install_element(ENABLE_NODE, &debug_ospf6_interface_cmd);
+       install_element(ENABLE_NODE, &no_debug_ospf6_interface_cmd);
+       install_element(CONFIG_NODE, &debug_ospf6_interface_cmd);
+       install_element(CONFIG_NODE, &no_debug_ospf6_interface_cmd);
 }
-
-