*: reindentreindent-master-after

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

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

1 files changed, 5379 insertions, 4921 deletions

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 88c43104c..1c9fe40c2 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -61,37 +61,28 @@
 #include "bfd.h"
 
 static struct cmd_node pim_global_node = {
-  PIM_NODE,
-  "",
-  1 /* vtysh ? yes */
+	PIM_NODE, "", 1 /* vtysh ? yes */
 };
 
 static struct cmd_node interface_node = {
-  INTERFACE_NODE,
-  "%s(config-if)# ",
-  1 /* vtysh ? yes */
+	INTERFACE_NODE, "%s(config-if)# ", 1 /* vtysh ? yes */
 };
 
-static struct cmd_node debug_node =
-{
-  DEBUG_NODE,
-  "",
-  1
-};
+static struct cmd_node debug_node = {DEBUG_NODE, "", 1};
 
 static void pim_if_membership_clear(struct interface *ifp)
 {
-  struct pim_interface *pim_ifp;
+	struct pim_interface *pim_ifp;
 
-  pim_ifp = ifp->info;
-  zassert(pim_ifp);
+	pim_ifp = ifp->info;
+	zassert(pim_ifp);
 
-  if (PIM_IF_TEST_PIM(pim_ifp->options) &&
-      PIM_IF_TEST_IGMP(pim_ifp->options)) {
-    return;
-  }
+	if (PIM_IF_TEST_PIM(pim_ifp->options)
+	    && PIM_IF_TEST_IGMP(pim_ifp->options)) {
+		return;
+	}
 
-  pim_ifchannel_membership_clear(ifp);
+	pim_ifchannel_membership_clear(ifp);
 }
 
 /*
@@ -105,2492 +96,2953 @@ static void pim_if_membership_clear(struct interface *ifp)
  */
 static void pim_if_membership_refresh(struct interface *ifp)
 {
-  struct pim_interface *pim_ifp;
-  struct listnode      *sock_node;
-  struct igmp_sock     *igmp;
+	struct pim_interface *pim_ifp;
+	struct listnode *sock_node;
+	struct igmp_sock *igmp;
 
-  pim_ifp = ifp->info;
-  zassert(pim_ifp);
+	pim_ifp = ifp->info;
+	zassert(pim_ifp);
 
-  if (!PIM_IF_TEST_PIM(pim_ifp->options))
-    return;
-  if (!PIM_IF_TEST_IGMP(pim_ifp->options))
-    return;
+	if (!PIM_IF_TEST_PIM(pim_ifp->options))
+		return;
+	if (!PIM_IF_TEST_IGMP(pim_ifp->options))
+		return;
 
-  /*
-    First clear off membership from all PIM (S,G) entries on the
-    interface
-  */
+	/*
+	  First clear off membership from all PIM (S,G) entries on the
+	  interface
+	*/
 
-  pim_ifchannel_membership_clear(ifp);
+	pim_ifchannel_membership_clear(ifp);
 
-  /*
-    Then restore PIM (S,G) membership from all IGMPv3 (S,G) entries on
-    the interface
-  */
+	/*
+	  Then restore PIM (S,G) membership from all IGMPv3 (S,G) entries on
+	  the interface
+	*/
 
-  /* scan igmp sockets */
-  for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
-    struct listnode   *grpnode;
-    struct igmp_group *grp;
-    
-    /* scan igmp groups */
-    for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list, grpnode, grp)) {
-      struct listnode    *srcnode;
-      struct igmp_source *src;
-      
-      /* scan group sources */
-      for (ALL_LIST_ELEMENTS_RO(grp->group_source_list, srcnode, src)) {
+	/* scan igmp sockets */
+	for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
+		struct listnode *grpnode;
+		struct igmp_group *grp;
 
-	if (IGMP_SOURCE_TEST_FORWARDING(src->source_flags)) {
-	  struct prefix_sg sg;
+		/* scan igmp groups */
+		for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list, grpnode,
+					  grp)) {
+			struct listnode *srcnode;
+			struct igmp_source *src;
 
-	  memset (&sg, 0, sizeof (struct prefix_sg));
-	  sg.src = src->source_addr;
-	  sg.grp = grp->group_addr;
-	  pim_ifchannel_local_membership_add(ifp, &sg);
-	}
-	
-      } /* scan group sources */
-    } /* scan igmp groups */
-  } /* scan igmp sockets */
+			/* scan group sources */
+			for (ALL_LIST_ELEMENTS_RO(grp->group_source_list,
+						  srcnode, src)) {
+
+				if (IGMP_SOURCE_TEST_FORWARDING(
+					    src->source_flags)) {
+					struct prefix_sg sg;
+
+					memset(&sg, 0,
+					       sizeof(struct prefix_sg));
+					sg.src = src->source_addr;
+					sg.grp = grp->group_addr;
+					pim_ifchannel_local_membership_add(ifp,
+									   &sg);
+				}
 
-  /*
-    Finally delete every PIM (S,G) entry lacking all state info
-   */
+			} /* scan group sources */
+		}	 /* scan igmp groups */
+	}		  /* scan igmp sockets */
 
-  pim_ifchannel_delete_on_noinfo(ifp);
+	/*
+	  Finally delete every PIM (S,G) entry lacking all state info
+	 */
 
+	pim_ifchannel_delete_on_noinfo(ifp);
 }
 
 static void pim_show_assert(struct vty *vty)
 {
-  struct pim_interface *pim_ifp;
-  struct pim_ifchannel *ch;
-  struct listnode *ch_node;
-  struct in_addr ifaddr;
-  time_t now;
-  
-  now = pim_time_monotonic_sec();
-
-  vty_out (vty,
-	  "Interface Address         Source          Group           State  Winner          Uptime   Timer\n");
-
-  for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
-    char ch_src_str[INET_ADDRSTRLEN];
-    char ch_grp_str[INET_ADDRSTRLEN];
-    char winner_str[INET_ADDRSTRLEN];
-    char uptime[10];
-    char timer[10];
-
-    pim_ifp = ch->interface->info;
-    
-    if (!pim_ifp)
-      continue;
-
-    ifaddr = pim_ifp->primary_address;
-
-    pim_inet4_dump("<ch_src?>", ch->sg.src,
-		   ch_src_str, sizeof(ch_src_str));
-    pim_inet4_dump("<ch_grp?>", ch->sg.grp,
-		   ch_grp_str, sizeof(ch_grp_str));
-    pim_inet4_dump("<assrt_win?>", ch->ifassert_winner,
-		   winner_str, sizeof(winner_str));
-
-    pim_time_uptime(uptime, sizeof(uptime), now - ch->ifassert_creation);
-    pim_time_timer_to_mmss(timer, sizeof(timer),
-			   ch->t_ifassert_timer);
-
-    vty_out (vty, "%-9s %-15s %-15s %-15s %-6s %-15s %-8s %-5s\n",
-	    ch->interface->name,
-	    inet_ntoa(ifaddr),
-	    ch_src_str,
-	    ch_grp_str,
-	    pim_ifchannel_ifassert_name(ch->ifassert_state),
-	    winner_str,
-	    uptime,
-	    timer);
-  } /* scan interface channels */
+	struct pim_interface *pim_ifp;
+	struct pim_ifchannel *ch;
+	struct listnode *ch_node;
+	struct in_addr ifaddr;
+	time_t now;
+
+	now = pim_time_monotonic_sec();
+
+	vty_out(vty,
+		"Interface Address         Source          Group           State  Winner          Uptime   Timer\n");
+
+	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+		char ch_src_str[INET_ADDRSTRLEN];
+		char ch_grp_str[INET_ADDRSTRLEN];
+		char winner_str[INET_ADDRSTRLEN];
+		char uptime[10];
+		char timer[10];
+
+		pim_ifp = ch->interface->info;
+
+		if (!pim_ifp)
+			continue;
+
+		ifaddr = pim_ifp->primary_address;
+
+		pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
+			       sizeof(ch_src_str));
+		pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
+			       sizeof(ch_grp_str));
+		pim_inet4_dump("<assrt_win?>", ch->ifassert_winner, winner_str,
+			       sizeof(winner_str));
+
+		pim_time_uptime(uptime, sizeof(uptime),
+				now - ch->ifassert_creation);
+		pim_time_timer_to_mmss(timer, sizeof(timer),
+				       ch->t_ifassert_timer);
+
+		vty_out(vty, "%-9s %-15s %-15s %-15s %-6s %-15s %-8s %-5s\n",
+			ch->interface->name, inet_ntoa(ifaddr), ch_src_str,
+			ch_grp_str,
+			pim_ifchannel_ifassert_name(ch->ifassert_state),
+			winner_str, uptime, timer);
+	} /* scan interface channels */
 }
 
 static void pim_show_assert_internal(struct vty *vty)
 {
-  struct pim_interface *pim_ifp;
-  struct listnode *ch_node;
-  struct pim_ifchannel *ch;
-  struct in_addr ifaddr;
-
-  vty_out (vty,
-	  "CA:   CouldAssert\n"
-	  "ECA:  Evaluate CouldAssert\n"
-	  "ATD:  AssertTrackingDesired\n"
-	  "eATD: Evaluate AssertTrackingDesired\n\n");
-
-  vty_out (vty,
-	  "Interface Address         Source          Group           CA  eCA ATD eATD\n");
-
-  for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
-    pim_ifp = ch->interface->info;
-    
-    if (!pim_ifp)
-      continue;
-
-    ifaddr = pim_ifp->primary_address;
-
-    char ch_src_str[INET_ADDRSTRLEN];
-    char ch_grp_str[INET_ADDRSTRLEN];
-
-    pim_inet4_dump("<ch_src?>", ch->sg.src,
-		   ch_src_str, sizeof(ch_src_str));
-    pim_inet4_dump("<ch_grp?>", ch->sg.grp,
-		   ch_grp_str, sizeof(ch_grp_str));
-    vty_out (vty, "%-9s %-15s %-15s %-15s %-3s %-3s %-3s %-4s\n",
-	    ch->interface->name,
-	    inet_ntoa(ifaddr),
-	    ch_src_str,
-	    ch_grp_str,
-	    PIM_IF_FLAG_TEST_COULD_ASSERT(ch->flags) ? "yes" : "no",
-	    pim_macro_ch_could_assert_eval(ch) ? "yes" : "no",
-	    PIM_IF_FLAG_TEST_ASSERT_TRACKING_DESIRED(ch->flags) ? "yes" : "no",
-	    pim_macro_assert_tracking_desired_eval(ch) ? "yes" : "no");
-  } /* scan interface channels */
+	struct pim_interface *pim_ifp;
+	struct listnode *ch_node;
+	struct pim_ifchannel *ch;
+	struct in_addr ifaddr;
+
+	vty_out(vty,
+		"CA:   CouldAssert\n"
+		"ECA:  Evaluate CouldAssert\n"
+		"ATD:  AssertTrackingDesired\n"
+		"eATD: Evaluate AssertTrackingDesired\n\n");
+
+	vty_out(vty,
+		"Interface Address         Source          Group           CA  eCA ATD eATD\n");
+
+	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+		pim_ifp = ch->interface->info;
+
+		if (!pim_ifp)
+			continue;
+
+		ifaddr = pim_ifp->primary_address;
+
+		char ch_src_str[INET_ADDRSTRLEN];
+		char ch_grp_str[INET_ADDRSTRLEN];
+
+		pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
+			       sizeof(ch_src_str));
+		pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
+			       sizeof(ch_grp_str));
+		vty_out(vty, "%-9s %-15s %-15s %-15s %-3s %-3s %-3s %-4s\n",
+			ch->interface->name, inet_ntoa(ifaddr), ch_src_str,
+			ch_grp_str,
+			PIM_IF_FLAG_TEST_COULD_ASSERT(ch->flags) ? "yes" : "no",
+			pim_macro_ch_could_assert_eval(ch) ? "yes" : "no",
+			PIM_IF_FLAG_TEST_ASSERT_TRACKING_DESIRED(ch->flags)
+				? "yes"
+				: "no",
+			pim_macro_assert_tracking_desired_eval(ch) ? "yes"
+								   : "no");
+	} /* scan interface channels */
 }
 
 static void pim_show_assert_metric(struct vty *vty)
 {
-  struct pim_interface *pim_ifp;
-  struct listnode *ch_node;
-  struct pim_ifchannel *ch;
-  struct in_addr ifaddr;
+	struct pim_interface *pim_ifp;
+	struct listnode *ch_node;
+	struct pim_ifchannel *ch;
+	struct in_addr ifaddr;
 
-  vty_out (vty,
-	  "Interface Address         Source          Group           RPT Pref Metric Address        \n");
+	vty_out(vty,
+		"Interface Address         Source          Group           RPT Pref Metric Address        \n");
 
-  for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
-    pim_ifp = ch->interface->info;
+	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+		pim_ifp = ch->interface->info;
 
-    if (!pim_ifp)
-      continue;
+		if (!pim_ifp)
+			continue;
 
-    ifaddr = pim_ifp->primary_address;
+		ifaddr = pim_ifp->primary_address;
 
-    char ch_src_str[INET_ADDRSTRLEN];
-    char ch_grp_str[INET_ADDRSTRLEN];
-    char addr_str[INET_ADDRSTRLEN];
-    struct pim_assert_metric am;
+		char ch_src_str[INET_ADDRSTRLEN];
+		char ch_grp_str[INET_ADDRSTRLEN];
+		char addr_str[INET_ADDRSTRLEN];
+		struct pim_assert_metric am;
 
-    am = pim_macro_spt_assert_metric(&ch->upstream->rpf, pim_ifp->primary_address);
+		am = pim_macro_spt_assert_metric(&ch->upstream->rpf,
+						 pim_ifp->primary_address);
 
-    pim_inet4_dump("<ch_src?>", ch->sg.src,
-		   ch_src_str, sizeof(ch_src_str));
-    pim_inet4_dump("<ch_grp?>", ch->sg.grp,
-		   ch_grp_str, sizeof(ch_grp_str));
-    pim_inet4_dump("<addr?>", am.ip_address,
-		   addr_str, sizeof(addr_str));
+		pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
+			       sizeof(ch_src_str));
+		pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
+			       sizeof(ch_grp_str));
+		pim_inet4_dump("<addr?>", am.ip_address, addr_str,
+			       sizeof(addr_str));
 
-    vty_out (vty, "%-9s %-15s %-15s %-15s %-3s %4u %6u %-15s\n",
-	    ch->interface->name,
-	    inet_ntoa(ifaddr),
-	    ch_src_str,
-	    ch_grp_str,
-	    am.rpt_bit_flag ? "yes" : "no",
-	    am.metric_preference,
-	    am.route_metric,
-	    addr_str);
-    } /* scan interface channels */
+		vty_out(vty, "%-9s %-15s %-15s %-15s %-3s %4u %6u %-15s\n",
+			ch->interface->name, inet_ntoa(ifaddr), ch_src_str,
+			ch_grp_str, am.rpt_bit_flag ? "yes" : "no",
+			am.metric_preference, am.route_metric, addr_str);
+	} /* scan interface channels */
 }
 
 static void pim_show_assert_winner_metric(struct vty *vty)
 {
-  struct pim_interface *pim_ifp;
-  struct listnode *ch_node;
-  struct pim_ifchannel *ch;
-  struct in_addr ifaddr;
-  
-  vty_out (vty,
-	  "Interface Address         Source          Group           RPT Pref Metric Address        \n");
+	struct pim_interface *pim_ifp;
+	struct listnode *ch_node;
+	struct pim_ifchannel *ch;
+	struct in_addr ifaddr;
+
+	vty_out(vty,
+		"Interface Address         Source          Group           RPT Pref Metric Address        \n");
+
+	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+		pim_ifp = ch->interface->info;
 
-  for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
-    pim_ifp = ch->interface->info;
-    
-    if (!pim_ifp)
-      continue;
+		if (!pim_ifp)
+			continue;
 
-    ifaddr = pim_ifp->primary_address;
+		ifaddr = pim_ifp->primary_address;
 
-    char ch_src_str[INET_ADDRSTRLEN];
-    char ch_grp_str[INET_ADDRSTRLEN];
-    char addr_str[INET_ADDRSTRLEN];
-    struct pim_assert_metric *am;
-    char pref_str[5];
-    char metr_str[7];
+		char ch_src_str[INET_ADDRSTRLEN];
+		char ch_grp_str[INET_ADDRSTRLEN];
+		char addr_str[INET_ADDRSTRLEN];
+		struct pim_assert_metric *am;
+		char pref_str[5];
+		char metr_str[7];
 
-    am = &ch->ifassert_winner_metric;
+		am = &ch->ifassert_winner_metric;
 
-    pim_inet4_dump("<ch_src?>", ch->sg.src,
-		   ch_src_str, sizeof(ch_src_str));
-    pim_inet4_dump("<ch_grp?>", ch->sg.grp,
-		   ch_grp_str, sizeof(ch_grp_str));
-    pim_inet4_dump("<addr?>", am->ip_address,
-		   addr_str, sizeof(addr_str));
+		pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
+			       sizeof(ch_src_str));
+		pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
+			       sizeof(ch_grp_str));
+		pim_inet4_dump("<addr?>", am->ip_address, addr_str,
+			       sizeof(addr_str));
 
-    if (am->metric_preference == PIM_ASSERT_METRIC_PREFERENCE_MAX)
-      snprintf(pref_str, sizeof(pref_str), "INFI");
-    else
-      snprintf(pref_str, sizeof(pref_str), "%4u", am->metric_preference);
+		if (am->metric_preference == PIM_ASSERT_METRIC_PREFERENCE_MAX)
+			snprintf(pref_str, sizeof(pref_str), "INFI");
+		else
+			snprintf(pref_str, sizeof(pref_str), "%4u",
+				 am->metric_preference);
 
-    if (am->route_metric == PIM_ASSERT_ROUTE_METRIC_MAX)
-      snprintf(metr_str, sizeof(metr_str), "INFI");
-    else
-      snprintf(metr_str, sizeof(metr_str), "%6u", am->route_metric);
+		if (am->route_metric == PIM_ASSERT_ROUTE_METRIC_MAX)
+			snprintf(metr_str, sizeof(metr_str), "INFI");
+		else
+			snprintf(metr_str, sizeof(metr_str), "%6u",
+				 am->route_metric);
 
-    vty_out (vty, "%-9s %-15s %-15s %-15s %-3s %-4s %-6s %-15s\n",
-	    ch->interface->name,
-	    inet_ntoa(ifaddr),
-	    ch_src_str,
-	    ch_grp_str,
-	    am->rpt_bit_flag ? "yes" : "no",
-	    pref_str,
-	    metr_str,
-	    addr_str);
-  } /* scan interface channels */
+		vty_out(vty, "%-9s %-15s %-15s %-15s %-3s %-4s %-6s %-15s\n",
+			ch->interface->name, inet_ntoa(ifaddr), ch_src_str,
+			ch_grp_str, am->rpt_bit_flag ? "yes" : "no", pref_str,
+			metr_str, addr_str);
+	} /* scan interface channels */
 }
 
-static void json_object_pim_ifp_add(struct json_object *json, struct interface *ifp)
+static void json_object_pim_ifp_add(struct json_object *json,
+				    struct interface *ifp)
 {
-  struct pim_interface *pim_ifp;
+	struct pim_interface *pim_ifp;
 
-  pim_ifp = ifp->info;
-  json_object_string_add(json, "name", ifp->name);
-  json_object_string_add(json, "state", if_is_up(ifp) ? "up" : "down");
-  json_object_string_add(json, "address", inet_ntoa(pim_ifp->primary_address));
-  json_object_int_add(json, "index", ifp->ifindex);
+	pim_ifp = ifp->info;
+	json_object_string_add(json, "name", ifp->name);
+	json_object_string_add(json, "state", if_is_up(ifp) ? "up" : "down");
+	json_object_string_add(json, "address",
+			       inet_ntoa(pim_ifp->primary_address));
+	json_object_int_add(json, "index", ifp->ifindex);
 
-  if (if_is_multicast(ifp))
-    json_object_boolean_true_add(json, "flagMulticast");
+	if (if_is_multicast(ifp))
+		json_object_boolean_true_add(json, "flagMulticast");
 
-  if (if_is_broadcast(ifp))
-    json_object_boolean_true_add(json, "flagBroadcast");
+	if (if_is_broadcast(ifp))
+		json_object_boolean_true_add(json, "flagBroadcast");
 
-  if (ifp->flags & IFF_ALLMULTI)
-    json_object_boolean_true_add(json, "flagAllMulticast");
+	if (ifp->flags & IFF_ALLMULTI)
+		json_object_boolean_true_add(json, "flagAllMulticast");
 
-  if (ifp->flags & IFF_PROMISC)
-    json_object_boolean_true_add(json, "flagPromiscuous");
+	if (ifp->flags & IFF_PROMISC)
+		json_object_boolean_true_add(json, "flagPromiscuous");
 
-  if (PIM_IF_IS_DELETED(ifp))
-    json_object_boolean_true_add(json, "flagDeleted");
+	if (PIM_IF_IS_DELETED(ifp))
+		json_object_boolean_true_add(json, "flagDeleted");
 
-  if (pim_if_lan_delay_enabled(ifp))
-    json_object_boolean_true_add(json, "lanDelayEnabled");
+	if (pim_if_lan_delay_enabled(ifp))
+		json_object_boolean_true_add(json, "lanDelayEnabled");
 }
 
 static void pim_show_membership(struct vty *vty, u_char uj)
 {
-  struct pim_interface *pim_ifp;
-  struct listnode *ch_node;
-  struct pim_ifchannel *ch;
-  enum json_type type;
-  json_object *json = NULL;
-  json_object *json_iface = NULL;
-  json_object *json_row = NULL;
-  json_object *json_tmp = NULL;
-
-  json = json_object_new_object();
-
-  for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
-
-    pim_ifp = ch->interface->info;
-
-    if (!pim_ifp)
-      continue;
-
-    char ch_src_str[INET_ADDRSTRLEN];
-    char ch_grp_str[INET_ADDRSTRLEN];
-
-    pim_inet4_dump("<ch_src?>", ch->sg.src,
-		   ch_src_str, sizeof(ch_src_str));
-    pim_inet4_dump("<ch_grp?>", ch->sg.grp,
-		   ch_grp_str, sizeof(ch_grp_str));
-
-    json_object_object_get_ex(json, ch->interface->name, &json_iface);
-
-    if (!json_iface) {
-      json_iface = json_object_new_object();
-      json_object_pim_ifp_add(json_iface, ch->interface);
-      json_object_object_add(json, ch->interface->name, json_iface);
-    }
-
-    json_row = json_object_new_object();
-    json_object_string_add(json_row, "source", ch_src_str);
-    json_object_string_add(json_row, "group", ch_grp_str);
-    json_object_string_add(json_row, "localMembership",
-			   ch->local_ifmembership == PIM_IFMEMBERSHIP_NOINFO ?  "NOINFO" : "INCLUDE");
-    json_object_object_add(json_iface, ch_grp_str, json_row);
-  } /* scan interface channels */
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-  } else {
-    vty_out (vty,
-            "Interface  Address          Source           Group            Membership\n");
-
-    /*
-     * Example of the json data we are traversing
-     *
-     * {
-     *   "swp3":{
-     *     "name":"swp3",
-     *     "state":"up",
-     *     "address":"10.1.20.1",
-     *     "index":5,
-     *     "flagMulticast":true,
-     *     "flagBroadcast":true,
-     *     "lanDelayEnabled":true,
-     *     "226.10.10.10":{
-     *       "source":"*",
-     *       "group":"226.10.10.10",
-     *       "localMembership":"INCLUDE"
-     *     }
-     *   }
-     * }
-     */
-
-    /* foreach interface */
-    json_object_object_foreach(json, key, val) {
-
-      /* Find all of the keys where the val is an object. In the example
-       * above the only one is 226.10.10.10
-       */
-      json_object_object_foreach(val, if_field_key, if_field_val) {
-        type = json_object_get_type(if_field_val);
-
-        if (type == json_type_object) {
-          vty_out(vty, "%-9s  ", key);
-
-          json_object_object_get_ex(val, "address", &json_tmp);
-          vty_out(vty, "%-15s  ", json_object_get_string(json_tmp));
-
-          json_object_object_get_ex(if_field_val, "source", &json_tmp);
-          vty_out(vty, "%-15s  ", json_object_get_string(json_tmp));
-
-          /* Group */
-          vty_out(vty, "%-15s  ", if_field_key);
-
-          json_object_object_get_ex(if_field_val, "localMembership", &json_tmp);
-          vty_out (vty, "%-10s\n", json_object_get_string(json_tmp));
-        }
-      }
-    }
-  }
-
-  json_object_free(json);
-}
-
-static void pim_print_ifp_flags(struct vty *vty, struct interface *ifp, int mloop)
-{
-  vty_out (vty, "Flags\n");
-  vty_out (vty, "-----\n");
-  vty_out (vty, "All Multicast   : %s\n",
-            (ifp->flags & IFF_ALLMULTI) ? "yes" : "no");
-  vty_out (vty, "Broadcast       : %s\n",
-            if_is_broadcast(ifp) ? "yes" : "no");
-  vty_out (vty, "Deleted         : %s\n",
-            PIM_IF_IS_DELETED(ifp) ? "yes" : "no");
-  vty_out (vty, "Interface Index : %d\n", ifp->ifindex);
-  vty_out (vty, "Multicast       : %s\n",
-            if_is_multicast(ifp) ? "yes" : "no");
-  vty_out (vty, "Multicast Loop  : %d\n", mloop);
-  vty_out (vty, "Promiscuous     : %s\n",
-            (ifp->flags & IFF_PROMISC) ? "yes" : "no");
-  vty_out (vty, "\n");
-  vty_out (vty, "\n");
+	struct pim_interface *pim_ifp;
+	struct listnode *ch_node;
+	struct pim_ifchannel *ch;
+	enum json_type type;
+	json_object *json = NULL;
+	json_object *json_iface = NULL;
+	json_object *json_row = NULL;
+	json_object *json_tmp = NULL;
+
+	json = json_object_new_object();
+
+	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+
+		pim_ifp = ch->interface->info;
+
+		if (!pim_ifp)
+			continue;
+
+		char ch_src_str[INET_ADDRSTRLEN];
+		char ch_grp_str[INET_ADDRSTRLEN];
+
+		pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
+			       sizeof(ch_src_str));
+		pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
+			       sizeof(ch_grp_str));
+
+		json_object_object_get_ex(json, ch->interface->name,
+					  &json_iface);
+
+		if (!json_iface) {
+			json_iface = json_object_new_object();
+			json_object_pim_ifp_add(json_iface, ch->interface);
+			json_object_object_add(json, ch->interface->name,
+					       json_iface);
+		}
+
+		json_row = json_object_new_object();
+		json_object_string_add(json_row, "source", ch_src_str);
+		json_object_string_add(json_row, "group", ch_grp_str);
+		json_object_string_add(
+			json_row, "localMembership",
+			ch->local_ifmembership == PIM_IFMEMBERSHIP_NOINFO
+				? "NOINFO"
+				: "INCLUDE");
+		json_object_object_add(json_iface, ch_grp_str, json_row);
+	} /* scan interface channels */
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+	} else {
+		vty_out(vty,
+			"Interface  Address          Source           Group            Membership\n");
+
+		/*
+		 * Example of the json data we are traversing
+		 *
+		 * {
+		 *   "swp3":{
+		 *     "name":"swp3",
+		 *     "state":"up",
+		 *     "address":"10.1.20.1",
+		 *     "index":5,
+		 *     "flagMulticast":true,
+		 *     "flagBroadcast":true,
+		 *     "lanDelayEnabled":true,
+		 *     "226.10.10.10":{
+		 *       "source":"*",
+		 *       "group":"226.10.10.10",
+		 *       "localMembership":"INCLUDE"
+		 *     }
+		 *   }
+		 * }
+		 */
+
+		/* foreach interface */
+		json_object_object_foreach(json, key, val)
+		{
+
+			/* Find all of the keys where the val is an object. In
+			 * the example
+			 * above the only one is 226.10.10.10
+			 */
+			json_object_object_foreach(val, if_field_key,
+						   if_field_val)
+			{
+				type = json_object_get_type(if_field_val);
+
+				if (type == json_type_object) {
+					vty_out(vty, "%-9s  ", key);
+
+					json_object_object_get_ex(
+						val, "address", &json_tmp);
+					vty_out(vty, "%-15s  ",
+						json_object_get_string(
+							json_tmp));
+
+					json_object_object_get_ex(if_field_val,
+								  "source",
+								  &json_tmp);
+					vty_out(vty, "%-15s  ",
+						json_object_get_string(
+							json_tmp));
+
+					/* Group */
+					vty_out(vty, "%-15s  ", if_field_key);
+
+					json_object_object_get_ex(
+						if_field_val, "localMembership",
+						&json_tmp);
+					vty_out(vty, "%-10s\n",
+						json_object_get_string(
+							json_tmp));
+				}
+			}
+		}
+	}
+
+	json_object_free(json);
+}
+
+static void pim_print_ifp_flags(struct vty *vty, struct interface *ifp,
+				int mloop)
+{
+	vty_out(vty, "Flags\n");
+	vty_out(vty, "-----\n");
+	vty_out(vty, "All Multicast   : %s\n",
+		(ifp->flags & IFF_ALLMULTI) ? "yes" : "no");
+	vty_out(vty, "Broadcast       : %s\n",
+		if_is_broadcast(ifp) ? "yes" : "no");
+	vty_out(vty, "Deleted         : %s\n",
+		PIM_IF_IS_DELETED(ifp) ? "yes" : "no");
+	vty_out(vty, "Interface Index : %d\n", ifp->ifindex);
+	vty_out(vty, "Multicast       : %s\n",
+		if_is_multicast(ifp) ? "yes" : "no");
+	vty_out(vty, "Multicast Loop  : %d\n", mloop);
+	vty_out(vty, "Promiscuous     : %s\n",
+		(ifp->flags & IFF_PROMISC) ? "yes" : "no");
+	vty_out(vty, "\n");
+	vty_out(vty, "\n");
 }
 
 static void igmp_show_interfaces(struct vty *vty, u_char uj)
 {
-  struct listnode  *node;
-  struct interface *ifp;
-  time_t            now;
-  json_object *json = NULL;
-  json_object *json_row = NULL;
-
-  now = pim_time_monotonic_sec();
-
-  if (uj)
-    json = json_object_new_object();
-  else
-    vty_out (vty,
-            "Interface  State          Address  V  Querier  Query Timer    Uptime\n");
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
-    struct pim_interface *pim_ifp;
-    struct listnode *sock_node;
-    struct igmp_sock *igmp;
-
-    pim_ifp = ifp->info;
-
-    if (!pim_ifp)
-      continue;
-
-    for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
-      char uptime[10];
-      char query_hhmmss[10];
-
-      pim_time_uptime(uptime, sizeof(uptime), now - igmp->sock_creation);
-      pim_time_timer_to_hhmmss(query_hhmmss, sizeof(query_hhmmss), igmp->t_igmp_query_timer);
-
-      if (uj) {
-        json_row = json_object_new_object();
-        json_object_pim_ifp_add(json_row, ifp);
-        json_object_string_add(json_row, "upTime", uptime);
-        json_object_int_add(json_row, "version", pim_ifp->igmp_version);
-
-        if (igmp->t_igmp_query_timer) {
-          json_object_boolean_true_add(json_row, "querier");
-          json_object_string_add(json_row, "queryTimer", query_hhmmss);
-        }
-
-        json_object_object_add(json, ifp->name, json_row);
-
-      } else {
-        vty_out (vty, "%-9s  %5s  %15s  %d  %7s  %11s  %8s\n",
-                ifp->name,
-                if_is_up(ifp) ? "up" : "down",
-                inet_ntoa(igmp->ifaddr),
-                pim_ifp->igmp_version,
-	        igmp->t_igmp_query_timer ? "local" : "other",
-	        query_hhmmss,
-                uptime);
-      }
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
-}
-
-static void igmp_show_interfaces_single(struct vty *vty, const char *ifname, u_char uj)
-{
-  struct igmp_sock *igmp;
-  struct interface *ifp;
-  struct listnode  *node;
-  struct listnode *sock_node;
-  struct pim_interface *pim_ifp;
-  char uptime[10];
-  char query_hhmmss[10];
-  char other_hhmmss[10];
-  int found_ifname = 0;
-  int sqi;
-  int mloop;
-  long gmi_msec;  /* Group Membership Interval */
-  long lmqt_msec;
-  long ohpi_msec;
-  long oqpi_msec; /* Other Querier Present Interval */
-  long qri_msec;
-  time_t now;
-
-  json_object *json = NULL;
-  json_object *json_row = NULL;
-
-  if (uj)
-    json = json_object_new_object();
-
-  now = pim_time_monotonic_sec();
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
-    pim_ifp = ifp->info;
-
-    if (!pim_ifp)
-      continue;
-
-    if (strcmp(ifname, "detail") && strcmp(ifname, ifp->name))
-      continue;
-
-    for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
-      found_ifname = 1;
-      pim_time_uptime(uptime, sizeof(uptime), now - igmp->sock_creation);
-      pim_time_timer_to_hhmmss(query_hhmmss, sizeof(query_hhmmss), igmp->t_igmp_query_timer);
-      pim_time_timer_to_hhmmss(other_hhmmss, sizeof(other_hhmmss), igmp->t_other_querier_timer);
-
-      gmi_msec = PIM_IGMP_GMI_MSEC(igmp->querier_robustness_variable,
-                                   igmp->querier_query_interval,
-                                   pim_ifp->igmp_query_max_response_time_dsec);
-
-      sqi = PIM_IGMP_SQI(pim_ifp->igmp_default_query_interval);
-
-      oqpi_msec = PIM_IGMP_OQPI_MSEC(igmp->querier_robustness_variable,
-                                     igmp->querier_query_interval,
-                                     pim_ifp->igmp_query_max_response_time_dsec);
-
-      lmqt_msec = PIM_IGMP_LMQT_MSEC(pim_ifp->igmp_query_max_response_time_dsec,
-                                     igmp->querier_robustness_variable);
-
-      ohpi_msec = PIM_IGMP_OHPI_DSEC(igmp->querier_robustness_variable,
-                                     igmp->querier_query_interval,
-                                     pim_ifp->igmp_query_max_response_time_dsec) * 100;
-
-      qri_msec = pim_ifp->igmp_query_max_response_time_dsec * 100;
-      mloop = pim_socket_mcastloop_get(pim_ifp->pim_sock_fd);
-
-      if (uj) {
-        json_row = json_object_new_object();
-        json_object_pim_ifp_add(json_row, ifp);
-        json_object_string_add(json_row, "upTime", uptime);
-        json_object_string_add(json_row, "querier", igmp->t_igmp_query_timer ? "local" : "other");
-        json_object_int_add(json_row, "queryStartCount", igmp->startup_query_count);
-        json_object_string_add(json_row, "queryQueryTimer", query_hhmmss);
-        json_object_string_add(json_row, "queryOtherTimer", other_hhmmss);
-        json_object_int_add(json_row, "version", pim_ifp->igmp_version);
-        json_object_int_add(json_row, "timerGroupMembershipIntervalMsec", gmi_msec);
-        json_object_int_add(json_row, "timerLastMemberQueryMsec", lmqt_msec);
-        json_object_int_add(json_row, "timerOlderHostPresentIntervalMsec", ohpi_msec);
-        json_object_int_add(json_row, "timerOtherQuerierPresentIntervalMsec", oqpi_msec);
-        json_object_int_add(json_row, "timerQueryInterval", igmp->querier_query_interval);
-        json_object_int_add(json_row, "timerQueryResponseIntervalMsec", qri_msec);
-        json_object_int_add(json_row, "timerRobustnessVariable", igmp->querier_robustness_variable);
-        json_object_int_add(json_row, "timerStartupQueryInterval", sqi);
-
-        json_object_object_add(json, ifp->name, json_row);
-
-      } else {
-        vty_out (vty, "Interface : %s\n", ifp->name);
-        vty_out (vty, "State     : %s\n", if_is_up(ifp) ? "up" : "down");
-        vty_out (vty, "Address   : %s\n",
-                  inet_ntoa(pim_ifp->primary_address));
-        vty_out (vty, "Uptime    : %s\n", uptime);
-        vty_out (vty, "Version   : %d\n", pim_ifp->igmp_version);
-        vty_out (vty, "\n");
-        vty_out (vty, "\n");
-
-        vty_out (vty, "Querier\n");
-        vty_out (vty, "-------\n");
-        vty_out (vty, "Querier     : %s\n",
-                  igmp->t_igmp_query_timer ? "local" : "other");
-        vty_out (vty, "Start Count : %d\n", igmp->startup_query_count);
-        vty_out (vty, "Query Timer : %s\n", query_hhmmss);
-        vty_out (vty, "Other Timer : %s\n", other_hhmmss);
-        vty_out (vty, "\n");
-        vty_out (vty, "\n");
-
-        vty_out (vty, "Timers\n");
-        vty_out (vty, "------\n");
-        vty_out (vty, "Group Membership Interval      : %lis\n",
-                  gmi_msec / 1000);
-        vty_out (vty, "Last Member Query Time         : %lis\n",
-                  lmqt_msec / 1000);
-        vty_out (vty, "Older Host Present Interval    : %lis\n",
-                  ohpi_msec / 1000);
-        vty_out (vty, "Other Querier Present Interval : %lis\n",
-                  oqpi_msec / 1000);
-        vty_out (vty, "Query Interval                 : %ds\n",
-                  igmp->querier_query_interval);
-        vty_out (vty, "Query Response Interval        : %lis\n",
-                  qri_msec / 1000);
-        vty_out (vty, "Robustness Variable            : %d\n",
-                  igmp->querier_robustness_variable);
-        vty_out (vty, "Startup Query Interval         : %ds\n", sqi);
-        vty_out (vty, "\n");
-        vty_out (vty, "\n");
-
-        pim_print_ifp_flags(vty, ifp, mloop);
-      }
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  } else {
-    if (!found_ifname)
-      vty_out (vty, "%% No such interface\n");
-  }
+	struct listnode *node;
+	struct interface *ifp;
+	time_t now;
+	json_object *json = NULL;
+	json_object *json_row = NULL;
+
+	now = pim_time_monotonic_sec();
+
+	if (uj)
+		json = json_object_new_object();
+	else
+		vty_out(vty,
+			"Interface  State          Address  V  Querier  Query Timer    Uptime\n");
+
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		struct pim_interface *pim_ifp;
+		struct listnode *sock_node;
+		struct igmp_sock *igmp;
+
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node,
+					  igmp)) {
+			char uptime[10];
+			char query_hhmmss[10];
+
+			pim_time_uptime(uptime, sizeof(uptime),
+					now - igmp->sock_creation);
+			pim_time_timer_to_hhmmss(query_hhmmss,
+						 sizeof(query_hhmmss),
+						 igmp->t_igmp_query_timer);
+
+			if (uj) {
+				json_row = json_object_new_object();
+				json_object_pim_ifp_add(json_row, ifp);
+				json_object_string_add(json_row, "upTime",
+						       uptime);
+				json_object_int_add(json_row, "version",
+						    pim_ifp->igmp_version);
+
+				if (igmp->t_igmp_query_timer) {
+					json_object_boolean_true_add(json_row,
+								     "querier");
+					json_object_string_add(json_row,
+							       "queryTimer",
+							       query_hhmmss);
+				}
+
+				json_object_object_add(json, ifp->name,
+						       json_row);
+
+			} else {
+				vty_out(vty,
+					"%-9s  %5s  %15s  %d  %7s  %11s  %8s\n",
+					ifp->name,
+					if_is_up(ifp) ? "up" : "down",
+					inet_ntoa(igmp->ifaddr),
+					pim_ifp->igmp_version,
+					igmp->t_igmp_query_timer ? "local"
+								 : "other",
+					query_hhmmss, uptime);
+			}
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
+}
+
+static void igmp_show_interfaces_single(struct vty *vty, const char *ifname,
+					u_char uj)
+{
+	struct igmp_sock *igmp;
+	struct interface *ifp;
+	struct listnode *node;
+	struct listnode *sock_node;
+	struct pim_interface *pim_ifp;
+	char uptime[10];
+	char query_hhmmss[10];
+	char other_hhmmss[10];
+	int found_ifname = 0;
+	int sqi;
+	int mloop;
+	long gmi_msec; /* Group Membership Interval */
+	long lmqt_msec;
+	long ohpi_msec;
+	long oqpi_msec; /* Other Querier Present Interval */
+	long qri_msec;
+	time_t now;
+
+	json_object *json = NULL;
+	json_object *json_row = NULL;
+
+	if (uj)
+		json = json_object_new_object();
+
+	now = pim_time_monotonic_sec();
+
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		if (strcmp(ifname, "detail") && strcmp(ifname, ifp->name))
+			continue;
+
+		for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node,
+					  igmp)) {
+			found_ifname = 1;
+			pim_time_uptime(uptime, sizeof(uptime),
+					now - igmp->sock_creation);
+			pim_time_timer_to_hhmmss(query_hhmmss,
+						 sizeof(query_hhmmss),
+						 igmp->t_igmp_query_timer);
+			pim_time_timer_to_hhmmss(other_hhmmss,
+						 sizeof(other_hhmmss),
+						 igmp->t_other_querier_timer);
+
+			gmi_msec = PIM_IGMP_GMI_MSEC(
+				igmp->querier_robustness_variable,
+				igmp->querier_query_interval,
+				pim_ifp->igmp_query_max_response_time_dsec);
+
+			sqi = PIM_IGMP_SQI(
+				pim_ifp->igmp_default_query_interval);
+
+			oqpi_msec = PIM_IGMP_OQPI_MSEC(
+				igmp->querier_robustness_variable,
+				igmp->querier_query_interval,
+				pim_ifp->igmp_query_max_response_time_dsec);
+
+			lmqt_msec = PIM_IGMP_LMQT_MSEC(
+				pim_ifp->igmp_query_max_response_time_dsec,
+				igmp->querier_robustness_variable);
+
+			ohpi_msec =
+				PIM_IGMP_OHPI_DSEC(
+					igmp->querier_robustness_variable,
+					igmp->querier_query_interval,
+					pim_ifp->igmp_query_max_response_time_dsec)
+				* 100;
+
+			qri_msec = pim_ifp->igmp_query_max_response_time_dsec
+				   * 100;
+			mloop = pim_socket_mcastloop_get(pim_ifp->pim_sock_fd);
+
+			if (uj) {
+				json_row = json_object_new_object();
+				json_object_pim_ifp_add(json_row, ifp);
+				json_object_string_add(json_row, "upTime",
+						       uptime);
+				json_object_string_add(json_row, "querier",
+						       igmp->t_igmp_query_timer
+							       ? "local"
+							       : "other");
+				json_object_int_add(json_row, "queryStartCount",
+						    igmp->startup_query_count);
+				json_object_string_add(json_row,
+						       "queryQueryTimer",
+						       query_hhmmss);
+				json_object_string_add(json_row,
+						       "queryOtherTimer",
+						       other_hhmmss);
+				json_object_int_add(json_row, "version",
+						    pim_ifp->igmp_version);
+				json_object_int_add(
+					json_row,
+					"timerGroupMembershipIntervalMsec",
+					gmi_msec);
+				json_object_int_add(json_row,
+						    "timerLastMemberQueryMsec",
+						    lmqt_msec);
+				json_object_int_add(
+					json_row,
+					"timerOlderHostPresentIntervalMsec",
+					ohpi_msec);
+				json_object_int_add(
+					json_row,
+					"timerOtherQuerierPresentIntervalMsec",
+					oqpi_msec);
+				json_object_int_add(
+					json_row, "timerQueryInterval",
+					igmp->querier_query_interval);
+				json_object_int_add(
+					json_row,
+					"timerQueryResponseIntervalMsec",
+					qri_msec);
+				json_object_int_add(
+					json_row, "timerRobustnessVariable",
+					igmp->querier_robustness_variable);
+				json_object_int_add(json_row,
+						    "timerStartupQueryInterval",
+						    sqi);
+
+				json_object_object_add(json, ifp->name,
+						       json_row);
+
+			} else {
+				vty_out(vty, "Interface : %s\n", ifp->name);
+				vty_out(vty, "State     : %s\n",
+					if_is_up(ifp) ? "up" : "down");
+				vty_out(vty, "Address   : %s\n",
+					inet_ntoa(pim_ifp->primary_address));
+				vty_out(vty, "Uptime    : %s\n", uptime);
+				vty_out(vty, "Version   : %d\n",
+					pim_ifp->igmp_version);
+				vty_out(vty, "\n");
+				vty_out(vty, "\n");
+
+				vty_out(vty, "Querier\n");
+				vty_out(vty, "-------\n");
+				vty_out(vty, "Querier     : %s\n",
+					igmp->t_igmp_query_timer ? "local"
+								 : "other");
+				vty_out(vty, "Start Count : %d\n",
+					igmp->startup_query_count);
+				vty_out(vty, "Query Timer : %s\n",
+					query_hhmmss);
+				vty_out(vty, "Other Timer : %s\n",
+					other_hhmmss);
+				vty_out(vty, "\n");
+				vty_out(vty, "\n");
+
+				vty_out(vty, "Timers\n");
+				vty_out(vty, "------\n");
+				vty_out(vty,
+					"Group Membership Interval      : %lis\n",
+					gmi_msec / 1000);
+				vty_out(vty,
+					"Last Member Query Time         : %lis\n",
+					lmqt_msec / 1000);
+				vty_out(vty,
+					"Older Host Present Interval    : %lis\n",
+					ohpi_msec / 1000);
+				vty_out(vty,
+					"Other Querier Present Interval : %lis\n",
+					oqpi_msec / 1000);
+				vty_out(vty,
+					"Query Interval                 : %ds\n",
+					igmp->querier_query_interval);
+				vty_out(vty,
+					"Query Response Interval        : %lis\n",
+					qri_msec / 1000);
+				vty_out(vty,
+					"Robustness Variable            : %d\n",
+					igmp->querier_robustness_variable);
+				vty_out(vty,
+					"Startup Query Interval         : %ds\n",
+					sqi);
+				vty_out(vty, "\n");
+				vty_out(vty, "\n");
+
+				pim_print_ifp_flags(vty, ifp, mloop);
+			}
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	} else {
+		if (!found_ifname)
+			vty_out(vty, "%% No such interface\n");
+	}
 }
 
 static void igmp_show_interface_join(struct vty *vty)
 {
-  struct listnode  *node;
-  struct interface *ifp;
-  time_t            now;
-  
-  now = pim_time_monotonic_sec();
-
-  vty_out (vty,
-	  "Interface Address         Source          Group           Socket Uptime  \n");
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
-    struct pim_interface *pim_ifp;
-    struct listnode *join_node;
-    struct igmp_join *ij;
-    struct in_addr pri_addr;
-    char pri_addr_str[INET_ADDRSTRLEN];
-
-    pim_ifp = ifp->info;
-    
-    if (!pim_ifp)
-      continue;
-
-    if (!pim_ifp->igmp_join_list)
-      continue;
-
-    pri_addr = pim_find_primary_addr(ifp);
-    pim_inet4_dump("<pri?>", pri_addr, pri_addr_str, sizeof(pri_addr_str));
-
-    for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_join_list, join_node, ij)) {
-      char group_str[INET_ADDRSTRLEN];
-      char source_str[INET_ADDRSTRLEN];
-      char uptime[10];
-
-      pim_time_uptime(uptime, sizeof(uptime), now - ij->sock_creation);
-      pim_inet4_dump("<grp?>", ij->group_addr, group_str, sizeof(group_str));
-      pim_inet4_dump("<src?>", ij->source_addr, source_str, sizeof(source_str));
-      
-      vty_out (vty, "%-9s %-15s %-15s %-15s %6d %8s\n",
-	      ifp->name,
-	      pri_addr_str,
-	      source_str,
-	      group_str,
-	      ij->sock_fd,
-	      uptime);
-    } /* for (pim_ifp->igmp_join_list) */
-
-  } /* for (iflist) */
-
-}
-
-static void pim_show_interfaces_single(struct vty *vty, const char *ifname, u_char uj)
-{
-  struct in_addr ifaddr;
-  struct interface *ifp;
-  struct listnode *neighnode;
-  struct listnode*node;
-  struct listnode *upnode;
-  struct pim_interface *pim_ifp;
-  struct pim_neighbor *neigh;
-  struct pim_upstream *up;
-  time_t now;
-  char dr_str[INET_ADDRSTRLEN];
-  char dr_uptime[10];
-  char expire[10];
-  char grp_str[INET_ADDRSTRLEN];
-  char hello_period[10];
-  char hello_timer[10];
-  char neigh_src_str[INET_ADDRSTRLEN];
-  char src_str[INET_ADDRSTRLEN];
-  char stat_uptime[10];
-  char uptime[10];
-  int mloop;
-  int found_ifname = 0;
-  int print_header;
-  json_object *json = NULL;
-  json_object *json_row = NULL;
-  json_object *json_pim_neighbor = NULL;
-  json_object *json_pim_neighbors = NULL;
-  json_object *json_group = NULL;
-  json_object *json_group_source = NULL;
-  json_object *json_fhr_sources = NULL;
-  struct pim_secondary_addr *sec_addr;
-  struct listnode *sec_node;
-
-  now = pim_time_monotonic_sec();
-
-  if (uj)
-    json = json_object_new_object();
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
-    pim_ifp = ifp->info;
-
-    if (!pim_ifp)
-      continue;
-
-    if (pim_ifp->pim_sock_fd < 0)
-      continue;
-
-    if (strcmp(ifname, "detail") && strcmp(ifname, ifp->name))
-      continue;
-
-    found_ifname = 1;
-    ifaddr = pim_ifp->primary_address;
-    pim_inet4_dump("<dr?>", pim_ifp->pim_dr_addr, dr_str, sizeof(dr_str));
-    pim_time_uptime_begin(dr_uptime, sizeof(dr_uptime), now, pim_ifp->pim_dr_election_last);
-    pim_time_timer_to_hhmmss(hello_timer, sizeof(hello_timer), pim_ifp->t_pim_hello_timer);
-    pim_time_mmss(hello_period, sizeof(hello_period), pim_ifp->pim_hello_period);
-    pim_time_uptime(stat_uptime, sizeof(stat_uptime), now - pim_ifp->pim_ifstat_start);
-    mloop = pim_socket_mcastloop_get(pim_ifp->pim_sock_fd);
-
-    if (uj) {
-      char pbuf[PREFIX2STR_BUFFER];
-      json_row = json_object_new_object();
-      json_object_pim_ifp_add(json_row, ifp);
-
-      if (pim_ifp->update_source.s_addr != INADDR_ANY) {
-        json_object_string_add(json_row, "useSource", inet_ntoa(pim_ifp->update_source));
-      }
-      if (pim_ifp->sec_addr_list) {
-        json_object *sec_list = NULL;
-
-        sec_list = json_object_new_array();
-        for (ALL_LIST_ELEMENTS_RO(pim_ifp->sec_addr_list, sec_node, sec_addr)) {
-          json_object_array_add(sec_list,
-                                json_object_new_string(prefix2str(&sec_addr->addr,
-								  pbuf,
-								  sizeof(pbuf))));
-        }
-        json_object_object_add(json_row, "secondaryAddressList", sec_list);
-      }
-
-      // PIM neighbors
-      if (pim_ifp->pim_neighbor_list->count) {
-        json_pim_neighbors = json_object_new_object();
-
-        for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, neighnode, neigh)) {
-          json_pim_neighbor = json_object_new_object();
-          pim_inet4_dump("<src?>", neigh->source_addr, neigh_src_str, sizeof(neigh_src_str));
-          pim_time_uptime(uptime, sizeof(uptime), now - neigh->creation);
-          pim_time_timer_to_hhmmss(expire, sizeof(expire), neigh->t_expire_timer);
-
-          json_object_string_add(json_pim_neighbor, "address", neigh_src_str);
-          json_object_string_add(json_pim_neighbor, "upTime", uptime);
-          json_object_string_add(json_pim_neighbor, "holdtime", expire);
-
-          json_object_object_add(json_pim_neighbors, neigh_src_str, json_pim_neighbor);
-        }
-
-        json_object_object_add(json_row, "neighbors", json_pim_neighbors);
-      }
-
-      json_object_string_add(json_row, "drAddress", dr_str);
-      json_object_int_add(json_row, "drPriority", pim_ifp->pim_dr_priority);
-      json_object_string_add(json_row, "drUptime", dr_uptime);
-      json_object_int_add(json_row, "drElections", pim_ifp->pim_dr_election_count);
-      json_object_int_add(json_row, "drChanges", pim_ifp->pim_dr_election_changes);
-
-      // FHR
-      for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode, up)) {
-        if (ifp ==  up->rpf.source_nexthop.interface) {
-          if (up->flags & PIM_UPSTREAM_FLAG_MASK_FHR) {
-            if (!json_fhr_sources) {
-              json_fhr_sources = json_object_new_object();
-            }
-
-            pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
-            pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
-            pim_time_uptime(uptime, sizeof(uptime), now - up->state_transition);
-
-            /* Does this group live in json_fhr_sources?  If not create it. */
-            json_object_object_get_ex(json_fhr_sources, grp_str, &json_group);
-
-            if (!json_group) {
-                json_group = json_object_new_object();
-                json_object_object_add(json_fhr_sources, grp_str, json_group);
-            }
-
-            json_group_source = json_object_new_object();
-            json_object_string_add(json_group_source, "source", src_str);
-            json_object_string_add(json_group_source, "group", grp_str);
-            json_object_string_add(json_group_source, "upTime", uptime);
-            json_object_object_add(json_group, src_str, json_group_source);
-          }
-        }
-      }
-
-      if (json_fhr_sources) {
-        json_object_object_add(json_row, "firstHopRouter", json_fhr_sources);
-      }
-
-      json_object_int_add(json_row, "helloPeriod", pim_ifp->pim_hello_period);
-      json_object_string_add(json_row, "helloTimer", hello_timer);
-      json_object_string_add(json_row, "helloStatStart", stat_uptime);
-      json_object_int_add(json_row, "helloReceived", pim_ifp->pim_ifstat_hello_recv);
-      json_object_int_add(json_row, "helloReceivedFailed", pim_ifp->pim_ifstat_hello_recvfail);
-      json_object_int_add(json_row, "helloSend", pim_ifp->pim_ifstat_hello_sent);
-      json_object_int_add(json_row, "hellosendFailed", pim_ifp->pim_ifstat_hello_sendfail);
-      json_object_int_add(json_row, "helloGenerationId", pim_ifp->pim_generation_id);
-      json_object_int_add(json_row, "flagMulticastLoop", mloop);
-
-      json_object_int_add(json_row, "effectivePropagationDelay", pim_if_effective_propagation_delay_msec(ifp));
-      json_object_int_add(json_row, "effectiveOverrideInterval", pim_if_effective_override_interval_msec(ifp));
-      json_object_int_add(json_row, "joinPruneOverrideInterval", pim_if_jp_override_interval_msec(ifp));
-
-      json_object_int_add(json_row, "propagationDelay", pim_ifp->pim_propagation_delay_msec);
-      json_object_int_add(json_row, "propagationDelayHighest", pim_ifp->pim_neighbors_highest_propagation_delay_msec);
-      json_object_int_add(json_row, "overrideInterval", pim_ifp->pim_override_interval_msec);
-      json_object_int_add(json_row, "overrideIntervalHighest", pim_ifp->pim_neighbors_highest_override_interval_msec);
-      json_object_object_add(json, ifp->name, json_row);
-
-    } else {
-      vty_out (vty, "Interface  : %s\n", ifp->name);
-      vty_out (vty, "State      : %s\n", if_is_up(ifp) ? "up" : "down");
-      if (pim_ifp->update_source.s_addr != INADDR_ANY) {
-        vty_out (vty, "Use Source : %s\n", inet_ntoa(pim_ifp->update_source));
-      }
-      if (pim_ifp->sec_addr_list) {
-        char pbuf[PREFIX2STR_BUFFER];
-        vty_out (vty, "Address    : %s (primary)\n",
-                inet_ntoa(ifaddr));
-        for (ALL_LIST_ELEMENTS_RO(pim_ifp->sec_addr_list, sec_node, sec_addr)) {
-          vty_out (vty, "             %s\n",
-                  prefix2str(&sec_addr->addr, pbuf, sizeof(pbuf)));
-        }
-      } else {
-        vty_out (vty, "Address    : %s\n", inet_ntoa(ifaddr));
-      }
-      vty_out (vty, "\n");
-
-      // PIM neighbors
-      print_header = 1;
-
-      for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, neighnode, neigh)) {
-
-        if (print_header) {
-          vty_out (vty, "PIM Neighbors\n");
-          vty_out (vty, "-------------\n");
-          print_header = 0;
-        }
-
-        pim_inet4_dump("<src?>", neigh->source_addr, neigh_src_str, sizeof(neigh_src_str));
-        pim_time_uptime(uptime, sizeof(uptime), now - neigh->creation);
-        pim_time_timer_to_hhmmss(expire, sizeof(expire), neigh->t_expire_timer);
-        vty_out (vty, "%-15s : up for %s, holdtime expires in %s\n", neigh_src_str, uptime,
-                  expire);
-      }
-
-      if (!print_header) {
-        vty_out (vty, "\n");
-        vty_out (vty, "\n");
-      }
-
-      vty_out (vty, "Designated Router\n");
-      vty_out (vty, "-----------------\n");
-      vty_out (vty, "Address   : %s\n", dr_str);
-      vty_out (vty, "Priority  : %d\n", pim_ifp->pim_dr_priority);
-      vty_out (vty, "Uptime    : %s\n", dr_uptime);
-      vty_out (vty, "Elections : %d\n", pim_ifp->pim_dr_election_count);
-      vty_out (vty, "Changes   : %d\n", pim_ifp->pim_dr_election_changes);
-      vty_out (vty, "\n");
-      vty_out (vty, "\n");
-
-      // FHR
-      print_header = 1;
-      for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode, up)) {
-        if (strcmp(ifp->name, up->rpf.source_nexthop.interface->name) == 0) {
-          if (up->flags & PIM_UPSTREAM_FLAG_MASK_FHR) {
-
-            if (print_header) {
-              vty_out (vty, "FHR - First Hop Router\n");
-              vty_out (vty, "----------------------\n");
-              print_header = 0;
-            }
-
-            pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
-            pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
-            pim_time_uptime(uptime, sizeof(uptime), now - up->state_transition);
-            vty_out (vty, "%s : %s is a source, uptime is %s\n", grp_str, src_str,
-                      uptime);
-          }
-        }
-      }
-
-      if (!print_header) {
-        vty_out (vty, "\n");
-        vty_out (vty, "\n");
-      }
-
-      vty_out (vty, "Hellos\n");
-      vty_out (vty, "------\n");
-      vty_out (vty, "Period         : %d\n", pim_ifp->pim_hello_period);
-      vty_out (vty, "Timer          : %s\n", hello_timer);
-      vty_out (vty, "StatStart      : %s\n", stat_uptime);
-      vty_out (vty, "Receive        : %d\n", pim_ifp->pim_ifstat_hello_recv);
-      vty_out (vty, "Receive Failed : %d\n",
-                pim_ifp->pim_ifstat_hello_recvfail);
-      vty_out (vty, "Send           : %d\n", pim_ifp->pim_ifstat_hello_sent);
-      vty_out (vty, "Send Failed    : %d\n",
-                pim_ifp->pim_ifstat_hello_sendfail);
-      vty_out (vty, "Generation ID  : %08x\n", pim_ifp->pim_generation_id);
-      vty_out (vty, "\n");
-      vty_out (vty, "\n");
-
-      pim_print_ifp_flags(vty, ifp, mloop);
-
-      vty_out (vty, "Join Prune Interval\n");
-      vty_out (vty, "-------------------\n");
-      vty_out (vty, "LAN Delay                    : %s\n",
-                pim_if_lan_delay_enabled(ifp) ? "yes" : "no");
-      vty_out (vty, "Effective Propagation Delay  : %d msec\n",
-                pim_if_effective_propagation_delay_msec(ifp));
-      vty_out (vty, "Effective Override Interval  : %d msec\n",
-                pim_if_effective_override_interval_msec(ifp));
-      vty_out (vty, "Join Prune Override Interval : %d msec\n",
-                pim_if_jp_override_interval_msec(ifp));
-      vty_out (vty, "\n");
-      vty_out (vty, "\n");
-
-      vty_out (vty, "LAN Prune Delay\n");
-      vty_out (vty, "---------------\n");
-      vty_out (vty, "Propagation Delay           : %d msec\n",
-                pim_ifp->pim_propagation_delay_msec);
-      vty_out (vty, "Propagation Delay (Highest) : %d msec\n",
-                pim_ifp->pim_neighbors_highest_propagation_delay_msec);
-      vty_out (vty, "Override Interval           : %d msec\n",
-                pim_ifp->pim_override_interval_msec);
-      vty_out (vty, "Override Interval (Highest) : %d msec\n",
-                pim_ifp->pim_neighbors_highest_override_interval_msec);
-      vty_out (vty, "\n");
-      vty_out (vty, "\n");
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  } else {
-    if (!found_ifname)
-      vty_out (vty, "%% No such interface\n");
-  }
+	struct listnode *node;
+	struct interface *ifp;
+	time_t now;
+
+	now = pim_time_monotonic_sec();
+
+	vty_out(vty,
+		"Interface Address         Source          Group           Socket Uptime  \n");
+
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		struct pim_interface *pim_ifp;
+		struct listnode *join_node;
+		struct igmp_join *ij;
+		struct in_addr pri_addr;
+		char pri_addr_str[INET_ADDRSTRLEN];
+
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		if (!pim_ifp->igmp_join_list)
+			continue;
+
+		pri_addr = pim_find_primary_addr(ifp);
+		pim_inet4_dump("<pri?>", pri_addr, pri_addr_str,
+			       sizeof(pri_addr_str));
+
+		for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_join_list, join_node,
+					  ij)) {
+			char group_str[INET_ADDRSTRLEN];
+			char source_str[INET_ADDRSTRLEN];
+			char uptime[10];
+
+			pim_time_uptime(uptime, sizeof(uptime),
+					now - ij->sock_creation);
+			pim_inet4_dump("<grp?>", ij->group_addr, group_str,
+				       sizeof(group_str));
+			pim_inet4_dump("<src?>", ij->source_addr, source_str,
+				       sizeof(source_str));
+
+			vty_out(vty, "%-9s %-15s %-15s %-15s %6d %8s\n",
+				ifp->name, pri_addr_str, source_str, group_str,
+				ij->sock_fd, uptime);
+		} /* for (pim_ifp->igmp_join_list) */
+
+	} /* for (iflist) */
+}
+
+static void pim_show_interfaces_single(struct vty *vty, const char *ifname,
+				       u_char uj)
+{
+	struct in_addr ifaddr;
+	struct interface *ifp;
+	struct listnode *neighnode;
+	struct listnode *node;
+	struct listnode *upnode;
+	struct pim_interface *pim_ifp;
+	struct pim_neighbor *neigh;
+	struct pim_upstream *up;
+	time_t now;
+	char dr_str[INET_ADDRSTRLEN];
+	char dr_uptime[10];
+	char expire[10];
+	char grp_str[INET_ADDRSTRLEN];
+	char hello_period[10];
+	char hello_timer[10];
+	char neigh_src_str[INET_ADDRSTRLEN];
+	char src_str[INET_ADDRSTRLEN];
+	char stat_uptime[10];
+	char uptime[10];
+	int mloop;
+	int found_ifname = 0;
+	int print_header;
+	json_object *json = NULL;
+	json_object *json_row = NULL;
+	json_object *json_pim_neighbor = NULL;
+	json_object *json_pim_neighbors = NULL;
+	json_object *json_group = NULL;
+	json_object *json_group_source = NULL;
+	json_object *json_fhr_sources = NULL;
+	struct pim_secondary_addr *sec_addr;
+	struct listnode *sec_node;
+
+	now = pim_time_monotonic_sec();
+
+	if (uj)
+		json = json_object_new_object();
+
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		if (pim_ifp->pim_sock_fd < 0)
+			continue;
+
+		if (strcmp(ifname, "detail") && strcmp(ifname, ifp->name))
+			continue;
+
+		found_ifname = 1;
+		ifaddr = pim_ifp->primary_address;
+		pim_inet4_dump("<dr?>", pim_ifp->pim_dr_addr, dr_str,
+			       sizeof(dr_str));
+		pim_time_uptime_begin(dr_uptime, sizeof(dr_uptime), now,
+				      pim_ifp->pim_dr_election_last);
+		pim_time_timer_to_hhmmss(hello_timer, sizeof(hello_timer),
+					 pim_ifp->t_pim_hello_timer);
+		pim_time_mmss(hello_period, sizeof(hello_period),
+			      pim_ifp->pim_hello_period);
+		pim_time_uptime(stat_uptime, sizeof(stat_uptime),
+				now - pim_ifp->pim_ifstat_start);
+		mloop = pim_socket_mcastloop_get(pim_ifp->pim_sock_fd);
+
+		if (uj) {
+			char pbuf[PREFIX2STR_BUFFER];
+			json_row = json_object_new_object();
+			json_object_pim_ifp_add(json_row, ifp);
+
+			if (pim_ifp->update_source.s_addr != INADDR_ANY) {
+				json_object_string_add(
+					json_row, "useSource",
+					inet_ntoa(pim_ifp->update_source));
+			}
+			if (pim_ifp->sec_addr_list) {
+				json_object *sec_list = NULL;
+
+				sec_list = json_object_new_array();
+				for (ALL_LIST_ELEMENTS_RO(
+					     pim_ifp->sec_addr_list, sec_node,
+					     sec_addr)) {
+					json_object_array_add(
+						sec_list,
+						json_object_new_string(
+							prefix2str(
+								&sec_addr->addr,
+								pbuf,
+								sizeof(pbuf))));
+				}
+				json_object_object_add(json_row,
+						       "secondaryAddressList",
+						       sec_list);
+			}
+
+			// PIM neighbors
+			if (pim_ifp->pim_neighbor_list->count) {
+				json_pim_neighbors = json_object_new_object();
+
+				for (ALL_LIST_ELEMENTS_RO(
+					     pim_ifp->pim_neighbor_list,
+					     neighnode, neigh)) {
+					json_pim_neighbor =
+						json_object_new_object();
+					pim_inet4_dump("<src?>",
+						       neigh->source_addr,
+						       neigh_src_str,
+						       sizeof(neigh_src_str));
+					pim_time_uptime(uptime, sizeof(uptime),
+							now - neigh->creation);
+					pim_time_timer_to_hhmmss(
+						expire, sizeof(expire),
+						neigh->t_expire_timer);
+
+					json_object_string_add(
+						json_pim_neighbor, "address",
+						neigh_src_str);
+					json_object_string_add(
+						json_pim_neighbor, "upTime",
+						uptime);
+					json_object_string_add(
+						json_pim_neighbor, "holdtime",
+						expire);
+
+					json_object_object_add(
+						json_pim_neighbors,
+						neigh_src_str,
+						json_pim_neighbor);
+				}
+
+				json_object_object_add(json_row, "neighbors",
+						       json_pim_neighbors);
+			}
+
+			json_object_string_add(json_row, "drAddress", dr_str);
+			json_object_int_add(json_row, "drPriority",
+					    pim_ifp->pim_dr_priority);
+			json_object_string_add(json_row, "drUptime", dr_uptime);
+			json_object_int_add(json_row, "drElections",
+					    pim_ifp->pim_dr_election_count);
+			json_object_int_add(json_row, "drChanges",
+					    pim_ifp->pim_dr_election_changes);
+
+			// FHR
+			for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode,
+						  up)) {
+				if (ifp == up->rpf.source_nexthop.interface) {
+					if (up->flags
+					    & PIM_UPSTREAM_FLAG_MASK_FHR) {
+						if (!json_fhr_sources) {
+							json_fhr_sources =
+								json_object_new_object();
+						}
+
+						pim_inet4_dump("<src?>",
+							       up->sg.src,
+							       src_str,
+							       sizeof(src_str));
+						pim_inet4_dump("<grp?>",
+							       up->sg.grp,
+							       grp_str,
+							       sizeof(grp_str));
+						pim_time_uptime(
+							uptime, sizeof(uptime),
+							now - up->state_transition);
+
+						/* Does this group live in
+						 * json_fhr_sources?  If not
+						 * create it. */
+						json_object_object_get_ex(
+							json_fhr_sources,
+							grp_str, &json_group);
+
+						if (!json_group) {
+							json_group =
+								json_object_new_object();
+							json_object_object_add(
+								json_fhr_sources,
+								grp_str,
+								json_group);
+						}
+
+						json_group_source =
+							json_object_new_object();
+						json_object_string_add(
+							json_group_source,
+							"source", src_str);
+						json_object_string_add(
+							json_group_source,
+							"group", grp_str);
+						json_object_string_add(
+							json_group_source,
+							"upTime", uptime);
+						json_object_object_add(
+							json_group, src_str,
+							json_group_source);
+					}
+				}
+			}
+
+			if (json_fhr_sources) {
+				json_object_object_add(json_row,
+						       "firstHopRouter",
+						       json_fhr_sources);
+			}
+
+			json_object_int_add(json_row, "helloPeriod",
+					    pim_ifp->pim_hello_period);
+			json_object_string_add(json_row, "helloTimer",
+					       hello_timer);
+			json_object_string_add(json_row, "helloStatStart",
+					       stat_uptime);
+			json_object_int_add(json_row, "helloReceived",
+					    pim_ifp->pim_ifstat_hello_recv);
+			json_object_int_add(json_row, "helloReceivedFailed",
+					    pim_ifp->pim_ifstat_hello_recvfail);
+			json_object_int_add(json_row, "helloSend",
+					    pim_ifp->pim_ifstat_hello_sent);
+			json_object_int_add(json_row, "hellosendFailed",
+					    pim_ifp->pim_ifstat_hello_sendfail);
+			json_object_int_add(json_row, "helloGenerationId",
+					    pim_ifp->pim_generation_id);
+			json_object_int_add(json_row, "flagMulticastLoop",
+					    mloop);
+
+			json_object_int_add(
+				json_row, "effectivePropagationDelay",
+				pim_if_effective_propagation_delay_msec(ifp));
+			json_object_int_add(
+				json_row, "effectiveOverrideInterval",
+				pim_if_effective_override_interval_msec(ifp));
+			json_object_int_add(
+				json_row, "joinPruneOverrideInterval",
+				pim_if_jp_override_interval_msec(ifp));
+
+			json_object_int_add(
+				json_row, "propagationDelay",
+				pim_ifp->pim_propagation_delay_msec);
+			json_object_int_add(
+				json_row, "propagationDelayHighest",
+				pim_ifp->pim_neighbors_highest_propagation_delay_msec);
+			json_object_int_add(
+				json_row, "overrideInterval",
+				pim_ifp->pim_override_interval_msec);
+			json_object_int_add(
+				json_row, "overrideIntervalHighest",
+				pim_ifp->pim_neighbors_highest_override_interval_msec);
+			json_object_object_add(json, ifp->name, json_row);
+
+		} else {
+			vty_out(vty, "Interface  : %s\n", ifp->name);
+			vty_out(vty, "State      : %s\n",
+				if_is_up(ifp) ? "up" : "down");
+			if (pim_ifp->update_source.s_addr != INADDR_ANY) {
+				vty_out(vty, "Use Source : %s\n",
+					inet_ntoa(pim_ifp->update_source));
+			}
+			if (pim_ifp->sec_addr_list) {
+				char pbuf[PREFIX2STR_BUFFER];
+				vty_out(vty, "Address    : %s (primary)\n",
+					inet_ntoa(ifaddr));
+				for (ALL_LIST_ELEMENTS_RO(
+					     pim_ifp->sec_addr_list, sec_node,
+					     sec_addr)) {
+					vty_out(vty, "             %s\n",
+						prefix2str(&sec_addr->addr,
+							   pbuf, sizeof(pbuf)));
+				}
+			} else {
+				vty_out(vty, "Address    : %s\n",
+					inet_ntoa(ifaddr));
+			}
+			vty_out(vty, "\n");
+
+			// PIM neighbors
+			print_header = 1;
+
+			for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list,
+						  neighnode, neigh)) {
+
+				if (print_header) {
+					vty_out(vty, "PIM Neighbors\n");
+					vty_out(vty, "-------------\n");
+					print_header = 0;
+				}
+
+				pim_inet4_dump("<src?>", neigh->source_addr,
+					       neigh_src_str,
+					       sizeof(neigh_src_str));
+				pim_time_uptime(uptime, sizeof(uptime),
+						now - neigh->creation);
+				pim_time_timer_to_hhmmss(expire, sizeof(expire),
+							 neigh->t_expire_timer);
+				vty_out(vty,
+					"%-15s : up for %s, holdtime expires in %s\n",
+					neigh_src_str, uptime, expire);
+			}
+
+			if (!print_header) {
+				vty_out(vty, "\n");
+				vty_out(vty, "\n");
+			}
+
+			vty_out(vty, "Designated Router\n");
+			vty_out(vty, "-----------------\n");
+			vty_out(vty, "Address   : %s\n", dr_str);
+			vty_out(vty, "Priority  : %d\n",
+				pim_ifp->pim_dr_priority);
+			vty_out(vty, "Uptime    : %s\n", dr_uptime);
+			vty_out(vty, "Elections : %d\n",
+				pim_ifp->pim_dr_election_count);
+			vty_out(vty, "Changes   : %d\n",
+				pim_ifp->pim_dr_election_changes);
+			vty_out(vty, "\n");
+			vty_out(vty, "\n");
+
+			// FHR
+			print_header = 1;
+			for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode,
+						  up)) {
+				if (strcmp(ifp->name,
+					   up->rpf.source_nexthop
+						   .interface->name)
+				    == 0) {
+					if (up->flags
+					    & PIM_UPSTREAM_FLAG_MASK_FHR) {
+
+						if (print_header) {
+							vty_out(vty,
+								"FHR - First Hop Router\n");
+							vty_out(vty,
+								"----------------------\n");
+							print_header = 0;
+						}
+
+						pim_inet4_dump("<src?>",
+							       up->sg.src,
+							       src_str,
+							       sizeof(src_str));
+						pim_inet4_dump("<grp?>",
+							       up->sg.grp,
+							       grp_str,
+							       sizeof(grp_str));
+						pim_time_uptime(
+							uptime, sizeof(uptime),
+							now - up->state_transition);
+						vty_out(vty,
+							"%s : %s is a source, uptime is %s\n",
+							grp_str, src_str,
+							uptime);
+					}
+				}
+			}
+
+			if (!print_header) {
+				vty_out(vty, "\n");
+				vty_out(vty, "\n");
+			}
+
+			vty_out(vty, "Hellos\n");
+			vty_out(vty, "------\n");
+			vty_out(vty, "Period         : %d\n",
+				pim_ifp->pim_hello_period);
+			vty_out(vty, "Timer          : %s\n", hello_timer);
+			vty_out(vty, "StatStart      : %s\n", stat_uptime);
+			vty_out(vty, "Receive        : %d\n",
+				pim_ifp->pim_ifstat_hello_recv);
+			vty_out(vty, "Receive Failed : %d\n",
+				pim_ifp->pim_ifstat_hello_recvfail);
+			vty_out(vty, "Send           : %d\n",
+				pim_ifp->pim_ifstat_hello_sent);
+			vty_out(vty, "Send Failed    : %d\n",
+				pim_ifp->pim_ifstat_hello_sendfail);
+			vty_out(vty, "Generation ID  : %08x\n",
+				pim_ifp->pim_generation_id);
+			vty_out(vty, "\n");
+			vty_out(vty, "\n");
+
+			pim_print_ifp_flags(vty, ifp, mloop);
+
+			vty_out(vty, "Join Prune Interval\n");
+			vty_out(vty, "-------------------\n");
+			vty_out(vty, "LAN Delay                    : %s\n",
+				pim_if_lan_delay_enabled(ifp) ? "yes" : "no");
+			vty_out(vty, "Effective Propagation Delay  : %d msec\n",
+				pim_if_effective_propagation_delay_msec(ifp));
+			vty_out(vty, "Effective Override Interval  : %d msec\n",
+				pim_if_effective_override_interval_msec(ifp));
+			vty_out(vty, "Join Prune Override Interval : %d msec\n",
+				pim_if_jp_override_interval_msec(ifp));
+			vty_out(vty, "\n");
+			vty_out(vty, "\n");
+
+			vty_out(vty, "LAN Prune Delay\n");
+			vty_out(vty, "---------------\n");
+			vty_out(vty, "Propagation Delay           : %d msec\n",
+				pim_ifp->pim_propagation_delay_msec);
+			vty_out(vty, "Propagation Delay (Highest) : %d msec\n",
+				pim_ifp->pim_neighbors_highest_propagation_delay_msec);
+			vty_out(vty, "Override Interval           : %d msec\n",
+				pim_ifp->pim_override_interval_msec);
+			vty_out(vty, "Override Interval (Highest) : %d msec\n",
+				pim_ifp->pim_neighbors_highest_override_interval_msec);
+			vty_out(vty, "\n");
+			vty_out(vty, "\n");
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	} else {
+		if (!found_ifname)
+			vty_out(vty, "%% No such interface\n");
+	}
 }
 
 static void pim_show_interfaces(struct vty *vty, u_char uj)
 {
-  struct interface *ifp;
-  struct listnode *node;
-  struct listnode *upnode;
-  struct pim_interface *pim_ifp;
-  struct pim_upstream *up;
-  int fhr = 0;
-  int pim_nbrs = 0;
-  int pim_ifchannels = 0;
-  json_object *json = NULL;
-  json_object *json_row = NULL;
-  json_object *json_tmp;
-
-  json = json_object_new_object();
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
-    pim_ifp = ifp->info;
-    
-    if (!pim_ifp)
-      continue;
-
-    if (pim_ifp->pim_sock_fd < 0)
-      continue;
-
-    pim_nbrs = pim_ifp->pim_neighbor_list->count;
-    pim_ifchannels = pim_ifp->pim_ifchannel_list->count;
-    fhr = 0;
-
-    for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode, up))
-      if (ifp ==  up->rpf.source_nexthop.interface)
-        if (up->flags & PIM_UPSTREAM_FLAG_MASK_FHR)
-          fhr++;
-
-    json_row = json_object_new_object();
-    json_object_pim_ifp_add(json_row, ifp);
-    json_object_int_add(json_row, "pimNeighbors", pim_nbrs);
-    json_object_int_add(json_row, "pimIfChannels", pim_ifchannels);
-    json_object_int_add(json_row, "firstHopRouter", fhr);
-    json_object_string_add(json_row, "pimDesignatedRouter", inet_ntoa(pim_ifp->pim_dr_addr));
-
-    if (pim_ifp->pim_dr_addr.s_addr == pim_ifp->primary_address.s_addr)
-      json_object_boolean_true_add(json_row, "pimDesignatedRouterLocal");
-
-    json_object_object_add(json, ifp->name, json_row);
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-  } else {
-    vty_out (vty,
-              "Interface  State          Address  PIM Nbrs           PIM DR  FHR IfChannels\n");
-
-    json_object_object_foreach(json, key, val) {
-      vty_out(vty, "%-9s  ", key);
-
-      json_object_object_get_ex(val, "state", &json_tmp);
-      vty_out(vty, "%5s  ", json_object_get_string(json_tmp));
-
-      json_object_object_get_ex(val, "address", &json_tmp);
-      vty_out(vty, "%15s  ", json_object_get_string(json_tmp));
-
-      json_object_object_get_ex(val, "pimNeighbors", &json_tmp);
-      vty_out(vty, "%8d  ", json_object_get_int(json_tmp));
-
-      if (json_object_object_get_ex(val, "pimDesignatedRouterLocal", &json_tmp)) {
-        vty_out(vty, "%15s  ", "local");
-      } else {
-        json_object_object_get_ex(val, "pimDesignatedRouter", &json_tmp);
-        vty_out(vty, "%15s  ", json_object_get_string(json_tmp));
-      }
-
-      json_object_object_get_ex(val, "firstHopRouter", &json_tmp);
-      vty_out(vty, "%3d  ", json_object_get_int(json_tmp));
-
-      json_object_object_get_ex(val, "pimIfChannels", &json_tmp);
-      vty_out (vty, "%9d\n", json_object_get_int(json_tmp));
-    }
-  }
-
-  json_object_free(json);
-}
-
-static void pim_show_interface_traffic (struct vty *vty, u_char uj)
-{
-  struct interface *ifp = NULL;
-  struct pim_interface *pim_ifp = NULL;
-  struct listnode *node = NULL;
-  json_object *json = NULL;
-  json_object *json_row = NULL;
-
-  if (uj)
-    json = json_object_new_object ();
-  else
-    {
-      vty_out (vty, "\n");
-      vty_out (vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s\n", "Interface",
-               "    HELLO", "    JOIN", "   PRUNE", "   REGISTER",
-               "  REGISTER-STOP", "  ASSERT");
-      vty_out (vty,
-               "%-10s%-18s%-17s%-17s%-17s%-17s%-17s\n",
-               "", "      Rx/Tx", "     Rx/Tx", "    Rx/Tx", "    Rx/Tx",
-               "     Rx/Tx", "    Rx/Tx");
-      vty_out (vty,
-           "---------------------------------------------------------------------------------------------------------------\n");
-    }
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp))
-    {
-      pim_ifp = ifp->info;
-
-      if (!pim_ifp)
-        continue;
-
-      if (pim_ifp->pim_sock_fd < 0)
-        continue;
-      if (uj)
-        {
-          json_row = json_object_new_object ();
-          json_object_pim_ifp_add (json_row, ifp);
-          json_object_int_add (json_row, "helloRx", pim_ifp->pim_ifstat_hello_recv);
-          json_object_int_add (json_row, "helloTx", pim_ifp->pim_ifstat_hello_sent);
-          json_object_int_add (json_row, "joinRx", pim_ifp->pim_ifstat_join_recv);
-          json_object_int_add (json_row, "joinTx", pim_ifp->pim_ifstat_join_send);
-          json_object_int_add (json_row, "registerRx", pim_ifp->pim_ifstat_reg_recv);
-          json_object_int_add (json_row, "registerTx", pim_ifp->pim_ifstat_reg_recv);
-          json_object_int_add (json_row, "registerStopRx", pim_ifp->pim_ifstat_reg_stop_recv);
-          json_object_int_add (json_row, "registerStopTx", pim_ifp->pim_ifstat_reg_stop_send);
-          json_object_int_add (json_row, "assertRx", pim_ifp->pim_ifstat_assert_recv);
-          json_object_int_add (json_row, "assertTx", pim_ifp->pim_ifstat_assert_send);
-
-          json_object_object_add (json, ifp->name, json_row);
-        }
-      else
-        {
-          vty_out (vty,
-               "%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u \n",
-               ifp->name, pim_ifp->pim_ifstat_hello_recv,
-               pim_ifp->pim_ifstat_hello_sent, pim_ifp->pim_ifstat_join_recv,
-               pim_ifp->pim_ifstat_join_send, pim_ifp->pim_ifstat_prune_recv,
-               pim_ifp->pim_ifstat_prune_send, pim_ifp->pim_ifstat_reg_recv,
-               pim_ifp->pim_ifstat_reg_send,
-               pim_ifp->pim_ifstat_reg_stop_recv,
-               pim_ifp->pim_ifstat_reg_stop_send,
-               pim_ifp->pim_ifstat_assert_recv,
-               pim_ifp->pim_ifstat_assert_send);
-        }
-    }
-  if (uj)
-    {
-      vty_out (vty, "%s\n",
-                 json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-      json_object_free (json);
-    }
-}
-
-static void pim_show_interface_traffic_single (struct vty *vty, const char *ifname, u_char uj)
-{
-  struct interface *ifp = NULL;
-  struct pim_interface *pim_ifp = NULL;
-  struct listnode *node = NULL;
-  json_object *json = NULL;
-  json_object *json_row = NULL;
-  uint8_t found_ifname = 0;
-
-  if (uj)
-    json = json_object_new_object ();
-  else
-    {
-      vty_out (vty, "\n");
-      vty_out (vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s\n", "Interface",
-               "    HELLO", "    JOIN", "   PRUNE", "   REGISTER",
-               "  REGISTER-STOP", "  ASSERT");
-      vty_out (vty,
-               "%-10s%-18s%-17s%-17s%-17s%-17s%-17s\n",
-               "", "      Rx/Tx", "     Rx/Tx", "    Rx/Tx", "    Rx/Tx",
-               "     Rx/Tx", "    Rx/Tx");
-      vty_out (vty,
-           "---------------------------------------------------------------------------------------------------------------\n");
-    }
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp))
-    {
-      if (strcmp (ifname, ifp->name))
-        continue;
-
-      pim_ifp = ifp->info;
-
-      if (!pim_ifp)
-        continue;
-
-      if (pim_ifp->pim_sock_fd < 0)
-        continue;
-
-      found_ifname = 1;
-      if (uj)
-        {
-          json_row = json_object_new_object ();
-          json_object_pim_ifp_add (json_row, ifp);
-          json_object_int_add (json_row, "helloRx", pim_ifp->pim_ifstat_hello_recv);
-          json_object_int_add (json_row, "helloTx", pim_ifp->pim_ifstat_hello_sent);
-          json_object_int_add (json_row, "joinRx", pim_ifp->pim_ifstat_join_recv);
-          json_object_int_add (json_row, "joinTx", pim_ifp->pim_ifstat_join_send);
-          json_object_int_add (json_row, "registerRx", pim_ifp->pim_ifstat_reg_recv);
-          json_object_int_add (json_row, "registerTx", pim_ifp->pim_ifstat_reg_recv);
-          json_object_int_add (json_row, "registerStopRx", pim_ifp->pim_ifstat_reg_stop_recv);
-          json_object_int_add (json_row, "registerStopTx", pim_ifp->pim_ifstat_reg_stop_send);
-          json_object_int_add (json_row, "assertRx", pim_ifp->pim_ifstat_assert_recv);
-          json_object_int_add (json_row, "assertTx", pim_ifp->pim_ifstat_assert_send);
-
-          json_object_object_add (json, ifp->name, json_row);
-        }
-      else
-        {
-          vty_out (vty,
-               "%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u \n",
-               ifp->name, pim_ifp->pim_ifstat_hello_recv,
-               pim_ifp->pim_ifstat_hello_sent, pim_ifp->pim_ifstat_join_recv,
-               pim_ifp->pim_ifstat_join_send, pim_ifp->pim_ifstat_prune_recv,
-               pim_ifp->pim_ifstat_prune_send, pim_ifp->pim_ifstat_reg_recv,
-               pim_ifp->pim_ifstat_reg_send,
-               pim_ifp->pim_ifstat_reg_stop_recv,
-               pim_ifp->pim_ifstat_reg_stop_send,
-               pim_ifp->pim_ifstat_assert_recv,
-               pim_ifp->pim_ifstat_assert_send);
-        }
-    }
-  if (uj)
-    {
-      vty_out (vty, "%s\n",
-                 json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-      json_object_free (json);
-    }
-  else
-    {
-      if (!found_ifname)
-        vty_out (vty, "%% No such interface\n");
-    }
+	struct interface *ifp;
+	struct listnode *node;
+	struct listnode *upnode;
+	struct pim_interface *pim_ifp;
+	struct pim_upstream *up;
+	int fhr = 0;
+	int pim_nbrs = 0;
+	int pim_ifchannels = 0;
+	json_object *json = NULL;
+	json_object *json_row = NULL;
+	json_object *json_tmp;
+
+	json = json_object_new_object();
+
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		if (pim_ifp->pim_sock_fd < 0)
+			continue;
+
+		pim_nbrs = pim_ifp->pim_neighbor_list->count;
+		pim_ifchannels = pim_ifp->pim_ifchannel_list->count;
+		fhr = 0;
+
+		for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode, up))
+			if (ifp == up->rpf.source_nexthop.interface)
+				if (up->flags & PIM_UPSTREAM_FLAG_MASK_FHR)
+					fhr++;
+
+		json_row = json_object_new_object();
+		json_object_pim_ifp_add(json_row, ifp);
+		json_object_int_add(json_row, "pimNeighbors", pim_nbrs);
+		json_object_int_add(json_row, "pimIfChannels", pim_ifchannels);
+		json_object_int_add(json_row, "firstHopRouter", fhr);
+		json_object_string_add(json_row, "pimDesignatedRouter",
+				       inet_ntoa(pim_ifp->pim_dr_addr));
+
+		if (pim_ifp->pim_dr_addr.s_addr
+		    == pim_ifp->primary_address.s_addr)
+			json_object_boolean_true_add(
+				json_row, "pimDesignatedRouterLocal");
+
+		json_object_object_add(json, ifp->name, json_row);
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+	} else {
+		vty_out(vty,
+			"Interface  State          Address  PIM Nbrs           PIM DR  FHR IfChannels\n");
+
+		json_object_object_foreach(json, key, val)
+		{
+			vty_out(vty, "%-9s  ", key);
+
+			json_object_object_get_ex(val, "state", &json_tmp);
+			vty_out(vty, "%5s  ", json_object_get_string(json_tmp));
+
+			json_object_object_get_ex(val, "address", &json_tmp);
+			vty_out(vty, "%15s  ",
+				json_object_get_string(json_tmp));
+
+			json_object_object_get_ex(val, "pimNeighbors",
+						  &json_tmp);
+			vty_out(vty, "%8d  ", json_object_get_int(json_tmp));
+
+			if (json_object_object_get_ex(
+				    val, "pimDesignatedRouterLocal",
+				    &json_tmp)) {
+				vty_out(vty, "%15s  ", "local");
+			} else {
+				json_object_object_get_ex(
+					val, "pimDesignatedRouter", &json_tmp);
+				vty_out(vty, "%15s  ",
+					json_object_get_string(json_tmp));
+			}
+
+			json_object_object_get_ex(val, "firstHopRouter",
+						  &json_tmp);
+			vty_out(vty, "%3d  ", json_object_get_int(json_tmp));
+
+			json_object_object_get_ex(val, "pimIfChannels",
+						  &json_tmp);
+			vty_out(vty, "%9d\n", json_object_get_int(json_tmp));
+		}
+	}
+
+	json_object_free(json);
+}
+
+static void pim_show_interface_traffic(struct vty *vty, u_char uj)
+{
+	struct interface *ifp = NULL;
+	struct pim_interface *pim_ifp = NULL;
+	struct listnode *node = NULL;
+	json_object *json = NULL;
+	json_object *json_row = NULL;
+
+	if (uj)
+		json = json_object_new_object();
+	else {
+		vty_out(vty, "\n");
+		vty_out(vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s\n",
+			"Interface", "    HELLO", "    JOIN", "   PRUNE",
+			"   REGISTER", "  REGISTER-STOP", "  ASSERT");
+		vty_out(vty, "%-10s%-18s%-17s%-17s%-17s%-17s%-17s\n", "",
+			"      Rx/Tx", "     Rx/Tx", "    Rx/Tx", "    Rx/Tx",
+			"     Rx/Tx", "    Rx/Tx");
+		vty_out(vty,
+			"---------------------------------------------------------------------------------------------------------------\n");
+	}
+
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		if (pim_ifp->pim_sock_fd < 0)
+			continue;
+		if (uj) {
+			json_row = json_object_new_object();
+			json_object_pim_ifp_add(json_row, ifp);
+			json_object_int_add(json_row, "helloRx",
+					    pim_ifp->pim_ifstat_hello_recv);
+			json_object_int_add(json_row, "helloTx",
+					    pim_ifp->pim_ifstat_hello_sent);
+			json_object_int_add(json_row, "joinRx",
+					    pim_ifp->pim_ifstat_join_recv);
+			json_object_int_add(json_row, "joinTx",
+					    pim_ifp->pim_ifstat_join_send);
+			json_object_int_add(json_row, "registerRx",
+					    pim_ifp->pim_ifstat_reg_recv);
+			json_object_int_add(json_row, "registerTx",
+					    pim_ifp->pim_ifstat_reg_recv);
+			json_object_int_add(json_row, "registerStopRx",
+					    pim_ifp->pim_ifstat_reg_stop_recv);
+			json_object_int_add(json_row, "registerStopTx",
+					    pim_ifp->pim_ifstat_reg_stop_send);
+			json_object_int_add(json_row, "assertRx",
+					    pim_ifp->pim_ifstat_assert_recv);
+			json_object_int_add(json_row, "assertTx",
+					    pim_ifp->pim_ifstat_assert_send);
+
+			json_object_object_add(json, ifp->name, json_row);
+		} else {
+			vty_out(vty,
+				"%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u \n",
+				ifp->name, pim_ifp->pim_ifstat_hello_recv,
+				pim_ifp->pim_ifstat_hello_sent,
+				pim_ifp->pim_ifstat_join_recv,
+				pim_ifp->pim_ifstat_join_send,
+				pim_ifp->pim_ifstat_prune_recv,
+				pim_ifp->pim_ifstat_prune_send,
+				pim_ifp->pim_ifstat_reg_recv,
+				pim_ifp->pim_ifstat_reg_send,
+				pim_ifp->pim_ifstat_reg_stop_recv,
+				pim_ifp->pim_ifstat_reg_stop_send,
+				pim_ifp->pim_ifstat_assert_recv,
+				pim_ifp->pim_ifstat_assert_send);
+		}
+	}
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
+}
+
+static void pim_show_interface_traffic_single(struct vty *vty,
+					      const char *ifname, u_char uj)
+{
+	struct interface *ifp = NULL;
+	struct pim_interface *pim_ifp = NULL;
+	struct listnode *node = NULL;
+	json_object *json = NULL;
+	json_object *json_row = NULL;
+	uint8_t found_ifname = 0;
+
+	if (uj)
+		json = json_object_new_object();
+	else {
+		vty_out(vty, "\n");
+		vty_out(vty, "%-12s%-17s%-17s%-17s%-17s%-17s%-17s\n",
+			"Interface", "    HELLO", "    JOIN", "   PRUNE",
+			"   REGISTER", "  REGISTER-STOP", "  ASSERT");
+		vty_out(vty, "%-10s%-18s%-17s%-17s%-17s%-17s%-17s\n", "",
+			"      Rx/Tx", "     Rx/Tx", "    Rx/Tx", "    Rx/Tx",
+			"     Rx/Tx", "    Rx/Tx");
+		vty_out(vty,
+			"---------------------------------------------------------------------------------------------------------------\n");
+	}
+
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		if (strcmp(ifname, ifp->name))
+			continue;
+
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		if (pim_ifp->pim_sock_fd < 0)
+			continue;
+
+		found_ifname = 1;
+		if (uj) {
+			json_row = json_object_new_object();
+			json_object_pim_ifp_add(json_row, ifp);
+			json_object_int_add(json_row, "helloRx",
+					    pim_ifp->pim_ifstat_hello_recv);
+			json_object_int_add(json_row, "helloTx",
+					    pim_ifp->pim_ifstat_hello_sent);
+			json_object_int_add(json_row, "joinRx",
+					    pim_ifp->pim_ifstat_join_recv);
+			json_object_int_add(json_row, "joinTx",
+					    pim_ifp->pim_ifstat_join_send);
+			json_object_int_add(json_row, "registerRx",
+					    pim_ifp->pim_ifstat_reg_recv);
+			json_object_int_add(json_row, "registerTx",
+					    pim_ifp->pim_ifstat_reg_recv);
+			json_object_int_add(json_row, "registerStopRx",
+					    pim_ifp->pim_ifstat_reg_stop_recv);
+			json_object_int_add(json_row, "registerStopTx",
+					    pim_ifp->pim_ifstat_reg_stop_send);
+			json_object_int_add(json_row, "assertRx",
+					    pim_ifp->pim_ifstat_assert_recv);
+			json_object_int_add(json_row, "assertTx",
+					    pim_ifp->pim_ifstat_assert_send);
+
+			json_object_object_add(json, ifp->name, json_row);
+		} else {
+			vty_out(vty,
+				"%-10s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u \n",
+				ifp->name, pim_ifp->pim_ifstat_hello_recv,
+				pim_ifp->pim_ifstat_hello_sent,
+				pim_ifp->pim_ifstat_join_recv,
+				pim_ifp->pim_ifstat_join_send,
+				pim_ifp->pim_ifstat_prune_recv,
+				pim_ifp->pim_ifstat_prune_send,
+				pim_ifp->pim_ifstat_reg_recv,
+				pim_ifp->pim_ifstat_reg_send,
+				pim_ifp->pim_ifstat_reg_stop_recv,
+				pim_ifp->pim_ifstat_reg_stop_send,
+				pim_ifp->pim_ifstat_assert_recv,
+				pim_ifp->pim_ifstat_assert_send);
+		}
+	}
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	} else {
+		if (!found_ifname)
+			vty_out(vty, "%% No such interface\n");
+	}
 }
 
 static void pim_show_join(struct vty *vty, u_char uj)
 {
-  struct pim_interface *pim_ifp;
-  struct in_addr ifaddr;
-  struct listnode *ch_node;
-  struct pim_ifchannel *ch;
-  time_t            now;
-  json_object *json = NULL;
-  json_object *json_iface = NULL;
-  json_object *json_row = NULL;
-  json_object *json_grp = NULL;
-  
-  now = pim_time_monotonic_sec();
-
-  if (uj)
-    json = json_object_new_object();
-  else
-    vty_out (vty,
-            "Interface Address         Source          Group           State  Uptime   Expire Prune\n");
-
-  for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
-
-    pim_ifp = ch->interface->info;
-    
-    if (!pim_ifp)
-      continue;
-
-    ifaddr = pim_ifp->primary_address;
-
-    char ch_src_str[INET_ADDRSTRLEN];
-    char ch_grp_str[INET_ADDRSTRLEN];
-    char uptime[10];
-    char expire[10];
-    char prune[10];
-
-    pim_inet4_dump("<ch_src?>", ch->sg.src,
-		   ch_src_str, sizeof(ch_src_str));
-    pim_inet4_dump("<ch_grp?>", ch->sg.grp,
-		   ch_grp_str, sizeof(ch_grp_str));
-
-    pim_time_uptime_begin(uptime, sizeof(uptime), now, ch->ifjoin_creation);
-    pim_time_timer_to_mmss(expire, sizeof(expire),
-			   ch->t_ifjoin_expiry_timer);
-    pim_time_timer_to_mmss(prune, sizeof(prune),
-			   ch->t_ifjoin_prune_pending_timer);
-
-    if (uj) {
-      json_object_object_get_ex(json, ch->interface->name, &json_iface);
-
-      if (!json_iface) {
-	json_iface = json_object_new_object();
-	json_object_pim_ifp_add(json_iface, ch->interface);
-	json_object_object_add(json, ch->interface->name, json_iface);
-      }
-
-      json_row = json_object_new_object();
-      json_object_string_add(json_row, "source", ch_src_str);
-      json_object_string_add(json_row, "group", ch_grp_str);
-      json_object_string_add(json_row, "upTime", uptime);
-      json_object_string_add(json_row, "expire", expire);
-      json_object_string_add(json_row, "prune", prune);
-      json_object_string_add(json_row, "channelJoinName",
-                             pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags));
-      if (PIM_IF_FLAG_TEST_S_G_RPT(ch->flags))
-        json_object_int_add(json_row, "SGRpt", 1);
-
-      json_object_object_get_ex(json_iface, ch_grp_str, &json_grp);
-      if (!json_grp)
-        {
-          json_grp = json_object_new_object();
-          json_object_object_add(json_grp, ch_src_str, json_row);
-          json_object_object_add(json_iface, ch_grp_str, json_grp);
-        }
-      else
-        json_object_object_add(json_grp, ch_src_str, json_row);
-    } else {
-      vty_out (vty, "%-9s %-15s %-15s %-15s %-6s %8s %-6s %5s\n",
-	      ch->interface->name,
-	      inet_ntoa(ifaddr),
-	      ch_src_str,
-	      ch_grp_str,
-	      pim_ifchannel_ifjoin_name(ch->ifjoin_state, ch->flags),
-	      uptime,
-	      expire,
-	      prune);
-    }
-  } /* scan interface channels */
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
-}
-
-static void pim_show_neighbors_single(struct vty *vty, const char *neighbor, u_char uj)
-{
-  struct listnode  *node;
-  struct listnode *neighnode;
-  struct interface *ifp;
-  struct pim_interface *pim_ifp;
-  struct pim_neighbor *neigh;
-  time_t            now;
-  int found_neighbor = 0;
-  int option_address_list;
-  int option_dr_priority;
-  int option_generation_id;
-  int option_holdtime;
-  int option_lan_prune_delay;
-  int option_t_bit;
-  char uptime[10];
-  char expire[10];
-  char neigh_src_str[INET_ADDRSTRLEN];
-
-  json_object *json = NULL;
-  json_object *json_ifp = NULL;
-  json_object *json_row = NULL;
-
-  now = pim_time_monotonic_sec();
-
-  if (uj)
-    json = json_object_new_object();
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
-    pim_ifp = ifp->info;
-
-    if (!pim_ifp)
-      continue;
-
-    if (pim_ifp->pim_sock_fd < 0)
-      continue;
-
-    for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, neighnode, neigh)) {
-      pim_inet4_dump("<src?>", neigh->source_addr,
-		     neigh_src_str, sizeof(neigh_src_str));
-
-      /*
-       * The user can specify either the interface name or the PIM neighbor IP.
-       * If this pim_ifp matches neither then skip.
-       */
-      if (strcmp(neighbor, "detail") &&
-          strcmp(neighbor, ifp->name) &&
-          strcmp(neighbor, neigh_src_str))
-        continue;
-
-      found_neighbor = 1;
-      pim_time_uptime(uptime, sizeof(uptime), now - neigh->creation);
-      pim_time_timer_to_hhmmss(expire, sizeof(expire), neigh->t_expire_timer);
-
-      option_address_list = 0;
-      option_dr_priority = 0;
-      option_generation_id = 0;
-      option_holdtime = 0;
-      option_lan_prune_delay = 0;
-      option_t_bit = 0;
-
-      if (PIM_OPTION_IS_SET(neigh->hello_options, PIM_OPTION_MASK_ADDRESS_LIST))
-        option_address_list = 1;
-
-      if (PIM_OPTION_IS_SET(neigh->hello_options, PIM_OPTION_MASK_DR_PRIORITY))
-        option_dr_priority = 1;
-
-      if (PIM_OPTION_IS_SET(neigh->hello_options, PIM_OPTION_MASK_GENERATION_ID))
-        option_generation_id = 1;
-
-      if (PIM_OPTION_IS_SET(neigh->hello_options, PIM_OPTION_MASK_HOLDTIME))
-        option_holdtime = 1;
-
-      if (PIM_OPTION_IS_SET(neigh->hello_options, PIM_OPTION_MASK_LAN_PRUNE_DELAY))
-        option_lan_prune_delay = 1;
-
-      if (PIM_OPTION_IS_SET(neigh->hello_options, PIM_OPTION_MASK_CAN_DISABLE_JOIN_SUPPRESSION))
-        option_t_bit = 1;
-
-      if (uj) {
-
-        /* Does this ifp live in json?  If not create it. */
-        json_object_object_get_ex(json, ifp->name, &json_ifp);
-
-        if (!json_ifp) {
-          json_ifp = json_object_new_object();
-          json_object_pim_ifp_add(json_ifp, ifp);
-          json_object_object_add(json, ifp->name, json_ifp);
-        }
-
-        json_row = json_object_new_object();
-        json_object_string_add(json_row, "interface", ifp->name);
-        json_object_string_add(json_row, "address", neigh_src_str);
-        json_object_string_add(json_row, "upTime", uptime);
-        json_object_string_add(json_row, "holdtime", expire);
-        json_object_int_add(json_row, "drPriority", neigh->dr_priority);
-        json_object_int_add(json_row, "generationId", neigh->generation_id);
-
-        if (option_address_list)
-          json_object_boolean_true_add(json_row, "helloOptionAddressList");
-
-        if (option_dr_priority)
-          json_object_boolean_true_add(json_row, "helloOptionDrPriority");
-
-        if (option_generation_id)
-          json_object_boolean_true_add(json_row, "helloOptionGenerationId");
-
-        if (option_holdtime)
-          json_object_boolean_true_add(json_row, "helloOptionHoldtime");
-
-        if (option_lan_prune_delay)
-          json_object_boolean_true_add(json_row, "helloOptionLanPruneDelay");
-
-        if (option_t_bit)
-          json_object_boolean_true_add(json_row, "helloOptionTBit");
-
-        json_object_object_add(json_ifp, neigh_src_str, json_row);
-
-      } else {
-        vty_out (vty, "Interface : %s\n", ifp->name);
-        vty_out (vty, "Neighbor  : %s\n", neigh_src_str);
-        vty_out (vty, "    Uptime                         : %s\n", uptime);
-        vty_out (vty, "    Holdtime                       : %s\n", expire);
-        vty_out (vty, "    DR Priority                    : %d\n",
-                  neigh->dr_priority);
-        vty_out (vty, "    Generation ID                  : %08x\n",
-                  neigh->generation_id);
-        vty_out (vty, "    Override Interval (msec)       : %d\n",
-                  neigh->override_interval_msec);
-        vty_out (vty, "    Propagation Delay (msec)       : %d\n",
-                  neigh->propagation_delay_msec);
-        vty_out (vty, "    Hello Option - Address List    : %s\n",
-                  option_address_list ? "yes" : "no");
-        vty_out (vty, "    Hello Option - DR Priority     : %s\n",
-                  option_dr_priority ? "yes" : "no");
-        vty_out (vty, "    Hello Option - Generation ID   : %s\n",
-                  option_generation_id ? "yes" : "no");
-        vty_out (vty, "    Hello Option - Holdtime        : %s\n",
-                  option_holdtime ? "yes" : "no");
-        vty_out (vty, "    Hello Option - LAN Prune Delay : %s\n",
-                  option_lan_prune_delay ? "yes" : "no");
-        vty_out (vty, "    Hello Option - T-bit           : %s\n",
-                  option_t_bit ? "yes" : "no");
-        pim_bfd_show_info (vty, neigh->bfd_info, json_ifp, uj, 0);
-        vty_out (vty, "\n");
-      }
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  } else {
-    {
-      if (!found_neighbor)
-        vty_out (vty, "%% No such interface or neighbor\n");
-    }
-  }
-}
-
-static void
-pim_show_state(struct vty *vty, const char *src_or_group, const char *group, u_char uj)
-{
-  struct channel_oil *c_oil;
-  struct listnode *node;
-  json_object *json = NULL;
-  json_object *json_group = NULL;
-  json_object *json_ifp_in = NULL;
-  json_object *json_ifp_out = NULL;
-  json_object *json_source = NULL;
-  time_t now;
-  int first_oif;
-  now = pim_time_monotonic_sec();
-
-  if (uj) {
-    json = json_object_new_object();
-  } else {
-    vty_out(vty, "Codes: J -> Pim Join, I -> IGMP Report, S -> Source, * -> Inherited from (*,G)");
-    vty_out (vty, "\nInstalled Source           Group            IIF      OIL\n");
-  }
-
-  for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
-    char grp_str[INET_ADDRSTRLEN];
-    char src_str[INET_ADDRSTRLEN];
-    char in_ifname[INTERFACE_NAMSIZ+1];
-    char out_ifname[INTERFACE_NAMSIZ+1];
-    int oif_vif_index;
-    struct interface *ifp_in;
-    first_oif = 1;
-
-    pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp, grp_str, sizeof(grp_str));
-    pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, src_str, sizeof(src_str));
-    ifp_in = pim_if_find_by_vif_index(c_oil->oil.mfcc_parent);
-
-    if (ifp_in)
-      strcpy(in_ifname, ifp_in->name);
-    else
-      strcpy(in_ifname, "<iif?>");
-
-    if (src_or_group)
-      {
-        if (strcmp(src_or_group, src_str) && strcmp(src_or_group, grp_str))
-          continue;
-
-        if (group && strcmp(group, grp_str))
-          continue;
-      }
-
-    if (uj) {
-
-      /* Find the group, create it if it doesn't exist */
-      json_object_object_get_ex(json, grp_str, &json_group);
-
-      if (!json_group) {
-        json_group = json_object_new_object();
-        json_object_object_add(json, grp_str, json_group);
-      }
-
-      /* Find the source nested under the group, create it if it doesn't exist */
-      json_object_object_get_ex(json_group, src_str, &json_source);
-
-      if (!json_source) {
-        json_source = json_object_new_object();
-        json_object_object_add(json_group, src_str, json_source);
-      }
-
-      /* Find the inbound interface nested under the source, create it if it doesn't exist */
-      json_object_object_get_ex(json_source, in_ifname, &json_ifp_in);
-
-      if (!json_ifp_in) {
-        json_ifp_in = json_object_new_object();
-        json_object_object_add(json_source, in_ifname, json_ifp_in);
-        json_object_int_add (json_source, "Installed", c_oil->installed);
-        json_object_int_add (json_source, "RefCount", c_oil->oil_ref_count);
-        json_object_int_add (json_source, "OilListSize", c_oil->oil_size);
-        json_object_int_add (json_source, "OilRescan", c_oil->oil_inherited_rescan);
-        json_object_int_add (json_source, "LastUsed", c_oil->cc.lastused);
-        json_object_int_add (json_source, "PacketCount", c_oil->cc.pktcnt);
-        json_object_int_add (json_source, "ByteCount", c_oil->cc.bytecnt);
-        json_object_int_add (json_source, "WrongInterface", c_oil->cc.wrong_if);
-      }
-    } else {
-        vty_out(vty, "%-9d %-15s  %-15s  %-7s  ",
-                c_oil->installed,
-                src_str,
-                grp_str,
-                ifp_in->name);
-    }
-
-    for (oif_vif_index = 0; oif_vif_index < MAXVIFS; ++oif_vif_index) {
-      struct interface *ifp_out;
-      char oif_uptime[10];
-      int ttl;
-
-      ttl = c_oil->oil.mfcc_ttls[oif_vif_index];
-      if (ttl < 1)
-        continue;
-
-      ifp_out = pim_if_find_by_vif_index(oif_vif_index);
-      pim_time_uptime(oif_uptime, sizeof(oif_uptime), now - c_oil->oif_creation[oif_vif_index]);
-
-      if (ifp_out)
-        strcpy(out_ifname, ifp_out->name);
-      else
-        strcpy(out_ifname, "<oif?>");
-
-      if (uj) {
-        json_ifp_out = json_object_new_object();
-        json_object_string_add(json_ifp_out, "source", src_str);
-        json_object_string_add(json_ifp_out, "group", grp_str);
-        json_object_string_add(json_ifp_out, "inboundInterface", in_ifname);
-        json_object_string_add(json_ifp_out, "outboundInterface", out_ifname);
-        json_object_int_add(json_ifp_out, "installed", c_oil->installed);
-
-        json_object_object_add(json_ifp_in, out_ifname, json_ifp_out);
-      } else {
-        if (first_oif)
-          {
-            first_oif = 0;
-            vty_out(vty, "%s(%c%c%c%c)", out_ifname,
-                    (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_IGMP) ? 'I' : ' ',
-                    (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_PIM) ? 'J' : ' ',
-                    (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_SOURCE) ? 'S' : ' ',
-                    (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_STAR) ? '*' : ' ');
-          }
-        else
-          vty_out(vty, ", %s(%c%c%c%c)", out_ifname,
-                  (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_IGMP) ? 'I' : ' ',
-                  (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_PIM) ? 'J' : ' ',
-                  (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_SOURCE) ? 'S' : ' ',
-                  (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_STAR) ? '*' : ' ' );
-      }
-    }
-
-    if (!uj)
-      vty_out (vty, "\n");
-  }
-
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  } else {
-    vty_out (vty, "\n");
-  }
+	struct pim_interface *pim_ifp;
+	struct in_addr ifaddr;
+	struct listnode *ch_node;
+	struct pim_ifchannel *ch;
+	time_t now;
+	json_object *json = NULL;
+	json_object *json_iface = NULL;
+	json_object *json_row = NULL;
+	json_object *json_grp = NULL;
+
+	now = pim_time_monotonic_sec();
+
+	if (uj)
+		json = json_object_new_object();
+	else
+		vty_out(vty,
+			"Interface Address         Source          Group           State  Uptime   Expire Prune\n");
+
+	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, ch_node, ch)) {
+
+		pim_ifp = ch->interface->info;
+
+		if (!pim_ifp)
+			continue;
+
+		ifaddr = pim_ifp->primary_address;
+
+		char ch_src_str[INET_ADDRSTRLEN];
+		char ch_grp_str[INET_ADDRSTRLEN];
+		char uptime[10];
+		char expire[10];
+		char prune[10];
+
+		pim_inet4_dump("<ch_src?>", ch->sg.src, ch_src_str,
+			       sizeof(ch_src_str));
+		pim_inet4_dump("<ch_grp?>", ch->sg.grp, ch_grp_str,
+			       sizeof(ch_grp_str));
+
+		pim_time_uptime_begin(uptime, sizeof(uptime), now,
+				      ch->ifjoin_creation);
+		pim_time_timer_to_mmss(expire, sizeof(expire),
+				       ch->t_ifjoin_expiry_timer);
+		pim_time_timer_to_mmss(prune, sizeof(prune),
+				       ch->t_ifjoin_prune_pending_timer);
+
+		if (uj) {
+			json_object_object_get_ex(json, ch->interface->name,
+						  &json_iface);
+
+			if (!json_iface) {
+				json_iface = json_object_new_object();
+				json_object_pim_ifp_add(json_iface,
+							ch->interface);
+				json_object_object_add(
+					json, ch->interface->name, json_iface);
+			}
+
+			json_row = json_object_new_object();
+			json_object_string_add(json_row, "source", ch_src_str);
+			json_object_string_add(json_row, "group", ch_grp_str);
+			json_object_string_add(json_row, "upTime", uptime);
+			json_object_string_add(json_row, "expire", expire);
+			json_object_string_add(json_row, "prune", prune);
+			json_object_string_add(
+				json_row, "channelJoinName",
+				pim_ifchannel_ifjoin_name(ch->ifjoin_state,
+							  ch->flags));
+			if (PIM_IF_FLAG_TEST_S_G_RPT(ch->flags))
+				json_object_int_add(json_row, "SGRpt", 1);
+
+			json_object_object_get_ex(json_iface, ch_grp_str,
+						  &json_grp);
+			if (!json_grp) {
+				json_grp = json_object_new_object();
+				json_object_object_add(json_grp, ch_src_str,
+						       json_row);
+				json_object_object_add(json_iface, ch_grp_str,
+						       json_grp);
+			} else
+				json_object_object_add(json_grp, ch_src_str,
+						       json_row);
+		} else {
+			vty_out(vty,
+				"%-9s %-15s %-15s %-15s %-6s %8s %-6s %5s\n",
+				ch->interface->name, inet_ntoa(ifaddr),
+				ch_src_str, ch_grp_str,
+				pim_ifchannel_ifjoin_name(ch->ifjoin_state,
+							  ch->flags),
+				uptime, expire, prune);
+		}
+	} /* scan interface channels */
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
+}
+
+static void pim_show_neighbors_single(struct vty *vty, const char *neighbor,
+				      u_char uj)
+{
+	struct listnode *node;
+	struct listnode *neighnode;
+	struct interface *ifp;
+	struct pim_interface *pim_ifp;
+	struct pim_neighbor *neigh;
+	time_t now;
+	int found_neighbor = 0;
+	int option_address_list;
+	int option_dr_priority;
+	int option_generation_id;
+	int option_holdtime;
+	int option_lan_prune_delay;
+	int option_t_bit;
+	char uptime[10];
+	char expire[10];
+	char neigh_src_str[INET_ADDRSTRLEN];
+
+	json_object *json = NULL;
+	json_object *json_ifp = NULL;
+	json_object *json_row = NULL;
+
+	now = pim_time_monotonic_sec();
+
+	if (uj)
+		json = json_object_new_object();
+
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		if (pim_ifp->pim_sock_fd < 0)
+			continue;
+
+		for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, neighnode,
+					  neigh)) {
+			pim_inet4_dump("<src?>", neigh->source_addr,
+				       neigh_src_str, sizeof(neigh_src_str));
+
+			/*
+			 * The user can specify either the interface name or the
+			 * PIM neighbor IP.
+			 * If this pim_ifp matches neither then skip.
+			 */
+			if (strcmp(neighbor, "detail")
+			    && strcmp(neighbor, ifp->name)
+			    && strcmp(neighbor, neigh_src_str))
+				continue;
+
+			found_neighbor = 1;
+			pim_time_uptime(uptime, sizeof(uptime),
+					now - neigh->creation);
+			pim_time_timer_to_hhmmss(expire, sizeof(expire),
+						 neigh->t_expire_timer);
+
+			option_address_list = 0;
+			option_dr_priority = 0;
+			option_generation_id = 0;
+			option_holdtime = 0;
+			option_lan_prune_delay = 0;
+			option_t_bit = 0;
+
+			if (PIM_OPTION_IS_SET(neigh->hello_options,
+					      PIM_OPTION_MASK_ADDRESS_LIST))
+				option_address_list = 1;
+
+			if (PIM_OPTION_IS_SET(neigh->hello_options,
+					      PIM_OPTION_MASK_DR_PRIORITY))
+				option_dr_priority = 1;
+
+			if (PIM_OPTION_IS_SET(neigh->hello_options,
+					      PIM_OPTION_MASK_GENERATION_ID))
+				option_generation_id = 1;
+
+			if (PIM_OPTION_IS_SET(neigh->hello_options,
+					      PIM_OPTION_MASK_HOLDTIME))
+				option_holdtime = 1;
+
+			if (PIM_OPTION_IS_SET(neigh->hello_options,
+					      PIM_OPTION_MASK_LAN_PRUNE_DELAY))
+				option_lan_prune_delay = 1;
+
+			if (PIM_OPTION_IS_SET(
+				    neigh->hello_options,
+				    PIM_OPTION_MASK_CAN_DISABLE_JOIN_SUPPRESSION))
+				option_t_bit = 1;
+
+			if (uj) {
+
+				/* Does this ifp live in json?  If not create
+				 * it. */
+				json_object_object_get_ex(json, ifp->name,
+							  &json_ifp);
+
+				if (!json_ifp) {
+					json_ifp = json_object_new_object();
+					json_object_pim_ifp_add(json_ifp, ifp);
+					json_object_object_add(json, ifp->name,
+							       json_ifp);
+				}
+
+				json_row = json_object_new_object();
+				json_object_string_add(json_row, "interface",
+						       ifp->name);
+				json_object_string_add(json_row, "address",
+						       neigh_src_str);
+				json_object_string_add(json_row, "upTime",
+						       uptime);
+				json_object_string_add(json_row, "holdtime",
+						       expire);
+				json_object_int_add(json_row, "drPriority",
+						    neigh->dr_priority);
+				json_object_int_add(json_row, "generationId",
+						    neigh->generation_id);
+
+				if (option_address_list)
+					json_object_boolean_true_add(
+						json_row,
+						"helloOptionAddressList");
+
+				if (option_dr_priority)
+					json_object_boolean_true_add(
+						json_row,
+						"helloOptionDrPriority");
+
+				if (option_generation_id)
+					json_object_boolean_true_add(
+						json_row,
+						"helloOptionGenerationId");
+
+				if (option_holdtime)
+					json_object_boolean_true_add(
+						json_row,
+						"helloOptionHoldtime");
+
+				if (option_lan_prune_delay)
+					json_object_boolean_true_add(
+						json_row,
+						"helloOptionLanPruneDelay");
+
+				if (option_t_bit)
+					json_object_boolean_true_add(
+						json_row, "helloOptionTBit");
+
+				json_object_object_add(json_ifp, neigh_src_str,
+						       json_row);
+
+			} else {
+				vty_out(vty, "Interface : %s\n", ifp->name);
+				vty_out(vty, "Neighbor  : %s\n", neigh_src_str);
+				vty_out(vty,
+					"    Uptime                         : %s\n",
+					uptime);
+				vty_out(vty,
+					"    Holdtime                       : %s\n",
+					expire);
+				vty_out(vty,
+					"    DR Priority                    : %d\n",
+					neigh->dr_priority);
+				vty_out(vty,
+					"    Generation ID                  : %08x\n",
+					neigh->generation_id);
+				vty_out(vty,
+					"    Override Interval (msec)       : %d\n",
+					neigh->override_interval_msec);
+				vty_out(vty,
+					"    Propagation Delay (msec)       : %d\n",
+					neigh->propagation_delay_msec);
+				vty_out(vty,
+					"    Hello Option - Address List    : %s\n",
+					option_address_list ? "yes" : "no");
+				vty_out(vty,
+					"    Hello Option - DR Priority     : %s\n",
+					option_dr_priority ? "yes" : "no");
+				vty_out(vty,
+					"    Hello Option - Generation ID   : %s\n",
+					option_generation_id ? "yes" : "no");
+				vty_out(vty,
+					"    Hello Option - Holdtime        : %s\n",
+					option_holdtime ? "yes" : "no");
+				vty_out(vty,
+					"    Hello Option - LAN Prune Delay : %s\n",
+					option_lan_prune_delay ? "yes" : "no");
+				vty_out(vty,
+					"    Hello Option - T-bit           : %s\n",
+					option_t_bit ? "yes" : "no");
+				pim_bfd_show_info(vty, neigh->bfd_info,
+						  json_ifp, uj, 0);
+				vty_out(vty, "\n");
+			}
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	} else {
+		{
+			if (!found_neighbor)
+				vty_out(vty,
+					"%% No such interface or neighbor\n");
+		}
+	}
+}
+
+static void pim_show_state(struct vty *vty, const char *src_or_group,
+			   const char *group, u_char uj)
+{
+	struct channel_oil *c_oil;
+	struct listnode *node;
+	json_object *json = NULL;
+	json_object *json_group = NULL;
+	json_object *json_ifp_in = NULL;
+	json_object *json_ifp_out = NULL;
+	json_object *json_source = NULL;
+	time_t now;
+	int first_oif;
+	now = pim_time_monotonic_sec();
+
+	if (uj) {
+		json = json_object_new_object();
+	} else {
+		vty_out(vty,
+			"Codes: J -> Pim Join, I -> IGMP Report, S -> Source, * -> Inherited from (*,G)");
+		vty_out(vty,
+			"\nInstalled Source           Group            IIF      OIL\n");
+	}
+
+	for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
+		char grp_str[INET_ADDRSTRLEN];
+		char src_str[INET_ADDRSTRLEN];
+		char in_ifname[INTERFACE_NAMSIZ + 1];
+		char out_ifname[INTERFACE_NAMSIZ + 1];
+		int oif_vif_index;
+		struct interface *ifp_in;
+		first_oif = 1;
+
+		pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp, grp_str,
+			       sizeof(grp_str));
+		pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, src_str,
+			       sizeof(src_str));
+		ifp_in = pim_if_find_by_vif_index(c_oil->oil.mfcc_parent);
+
+		if (ifp_in)
+			strcpy(in_ifname, ifp_in->name);
+		else
+			strcpy(in_ifname, "<iif?>");
+
+		if (src_or_group) {
+			if (strcmp(src_or_group, src_str)
+			    && strcmp(src_or_group, grp_str))
+				continue;
+
+			if (group && strcmp(group, grp_str))
+				continue;
+		}
+
+		if (uj) {
+
+			/* Find the group, create it if it doesn't exist */
+			json_object_object_get_ex(json, grp_str, &json_group);
+
+			if (!json_group) {
+				json_group = json_object_new_object();
+				json_object_object_add(json, grp_str,
+						       json_group);
+			}
+
+			/* Find the source nested under the group, create it if
+			 * it doesn't exist */
+			json_object_object_get_ex(json_group, src_str,
+						  &json_source);
+
+			if (!json_source) {
+				json_source = json_object_new_object();
+				json_object_object_add(json_group, src_str,
+						       json_source);
+			}
+
+			/* Find the inbound interface nested under the source,
+			 * create it if it doesn't exist */
+			json_object_object_get_ex(json_source, in_ifname,
+						  &json_ifp_in);
+
+			if (!json_ifp_in) {
+				json_ifp_in = json_object_new_object();
+				json_object_object_add(json_source, in_ifname,
+						       json_ifp_in);
+				json_object_int_add(json_source, "Installed",
+						    c_oil->installed);
+				json_object_int_add(json_source, "RefCount",
+						    c_oil->oil_ref_count);
+				json_object_int_add(json_source, "OilListSize",
+						    c_oil->oil_size);
+				json_object_int_add(
+					json_source, "OilRescan",
+					c_oil->oil_inherited_rescan);
+				json_object_int_add(json_source, "LastUsed",
+						    c_oil->cc.lastused);
+				json_object_int_add(json_source, "PacketCount",
+						    c_oil->cc.pktcnt);
+				json_object_int_add(json_source, "ByteCount",
+						    c_oil->cc.bytecnt);
+				json_object_int_add(json_source,
+						    "WrongInterface",
+						    c_oil->cc.wrong_if);
+			}
+		} else {
+			vty_out(vty, "%-9d %-15s  %-15s  %-7s  ",
+				c_oil->installed, src_str, grp_str,
+				ifp_in->name);
+		}
+
+		for (oif_vif_index = 0; oif_vif_index < MAXVIFS;
+		     ++oif_vif_index) {
+			struct interface *ifp_out;
+			char oif_uptime[10];
+			int ttl;
+
+			ttl = c_oil->oil.mfcc_ttls[oif_vif_index];
+			if (ttl < 1)
+				continue;
+
+			ifp_out = pim_if_find_by_vif_index(oif_vif_index);
+			pim_time_uptime(
+				oif_uptime, sizeof(oif_uptime),
+				now - c_oil->oif_creation[oif_vif_index]);
+
+			if (ifp_out)
+				strcpy(out_ifname, ifp_out->name);
+			else
+				strcpy(out_ifname, "<oif?>");
+
+			if (uj) {
+				json_ifp_out = json_object_new_object();
+				json_object_string_add(json_ifp_out, "source",
+						       src_str);
+				json_object_string_add(json_ifp_out, "group",
+						       grp_str);
+				json_object_string_add(json_ifp_out,
+						       "inboundInterface",
+						       in_ifname);
+				json_object_string_add(json_ifp_out,
+						       "outboundInterface",
+						       out_ifname);
+				json_object_int_add(json_ifp_out, "installed",
+						    c_oil->installed);
+
+				json_object_object_add(json_ifp_in, out_ifname,
+						       json_ifp_out);
+			} else {
+				if (first_oif) {
+					first_oif = 0;
+					vty_out(vty, "%s(%c%c%c%c)", out_ifname,
+						(c_oil->oif_flags[oif_vif_index]
+						 & PIM_OIF_FLAG_PROTO_IGMP)
+							? 'I'
+							: ' ',
+						(c_oil->oif_flags[oif_vif_index]
+						 & PIM_OIF_FLAG_PROTO_PIM)
+							? 'J'
+							: ' ',
+						(c_oil->oif_flags[oif_vif_index]
+						 & PIM_OIF_FLAG_PROTO_SOURCE)
+							? 'S'
+							: ' ',
+						(c_oil->oif_flags[oif_vif_index]
+						 & PIM_OIF_FLAG_PROTO_STAR)
+							? '*'
+							: ' ');
+				} else
+					vty_out(vty, ", %s(%c%c%c%c)",
+						out_ifname,
+						(c_oil->oif_flags[oif_vif_index]
+						 & PIM_OIF_FLAG_PROTO_IGMP)
+							? 'I'
+							: ' ',
+						(c_oil->oif_flags[oif_vif_index]
+						 & PIM_OIF_FLAG_PROTO_PIM)
+							? 'J'
+							: ' ',
+						(c_oil->oif_flags[oif_vif_index]
+						 & PIM_OIF_FLAG_PROTO_SOURCE)
+							? 'S'
+							: ' ',
+						(c_oil->oif_flags[oif_vif_index]
+						 & PIM_OIF_FLAG_PROTO_STAR)
+							? '*'
+							: ' ');
+			}
+		}
+
+		if (!uj)
+			vty_out(vty, "\n");
+	}
+
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	} else {
+		vty_out(vty, "\n");
+	}
 }
 
 static void pim_show_neighbors(struct vty *vty, u_char uj)
 {
-  struct listnode *node;
-  struct listnode *neighnode;
-  struct interface *ifp;
-  struct pim_interface *pim_ifp;
-  struct pim_neighbor *neigh;
-  time_t now;
-  char uptime[10];
-  char expire[10];
-  char neigh_src_str[INET_ADDRSTRLEN];
-  json_object *json = NULL;
-  json_object *json_ifp_rows = NULL;
-  json_object *json_row = NULL;
-
-  now = pim_time_monotonic_sec();
-
-  if (uj) {
-    json = json_object_new_object();
-  } else {
-    vty_out (vty, "Interface         Neighbor    Uptime  Holdtime  DR Pri\n");
-  }
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
-    pim_ifp = ifp->info;
-
-    if (!pim_ifp)
-      continue;
-
-    if (pim_ifp->pim_sock_fd < 0)
-      continue;
-
-    if (uj)
-      json_ifp_rows = json_object_new_object();
-
-    for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, neighnode, neigh)) {
-      pim_inet4_dump("<src?>", neigh->source_addr,
-		     neigh_src_str, sizeof(neigh_src_str));
-      pim_time_uptime(uptime, sizeof(uptime), now - neigh->creation);
-      pim_time_timer_to_hhmmss(expire, sizeof(expire), neigh->t_expire_timer);
-
-      if (uj) {
-        json_row = json_object_new_object();
-        json_object_string_add(json_row, "interface", ifp->name);
-        json_object_string_add(json_row, "neighbor", neigh_src_str);
-        json_object_string_add(json_row, "upTime", uptime);
-        json_object_string_add(json_row, "holdTime", expire);
-        json_object_int_add(json_row, "holdTimeMax", neigh->holdtime);
-        json_object_int_add(json_row, "drPriority", neigh->dr_priority);
-        json_object_object_add(json_ifp_rows, neigh_src_str, json_row);
-
-      } else {
-        vty_out (vty, "%-9s  %15s  %8s  %8s  %6d\n",
-                ifp->name,
-                neigh_src_str,
-                uptime,
-                expire,
-                neigh->dr_priority);
-      }
-    }
-
-    if (uj) {
-      json_object_object_add(json, ifp->name, json_ifp_rows);
-      json_ifp_rows = NULL;
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
+	struct listnode *node;
+	struct listnode *neighnode;
+	struct interface *ifp;
+	struct pim_interface *pim_ifp;
+	struct pim_neighbor *neigh;
+	time_t now;
+	char uptime[10];
+	char expire[10];
+	char neigh_src_str[INET_ADDRSTRLEN];
+	json_object *json = NULL;
+	json_object *json_ifp_rows = NULL;
+	json_object *json_row = NULL;
+
+	now = pim_time_monotonic_sec();
+
+	if (uj) {
+		json = json_object_new_object();
+	} else {
+		vty_out(vty,
+			"Interface         Neighbor    Uptime  Holdtime  DR Pri\n");
+	}
+
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		if (pim_ifp->pim_sock_fd < 0)
+			continue;
+
+		if (uj)
+			json_ifp_rows = json_object_new_object();
+
+		for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, neighnode,
+					  neigh)) {
+			pim_inet4_dump("<src?>", neigh->source_addr,
+				       neigh_src_str, sizeof(neigh_src_str));
+			pim_time_uptime(uptime, sizeof(uptime),
+					now - neigh->creation);
+			pim_time_timer_to_hhmmss(expire, sizeof(expire),
+						 neigh->t_expire_timer);
+
+			if (uj) {
+				json_row = json_object_new_object();
+				json_object_string_add(json_row, "interface",
+						       ifp->name);
+				json_object_string_add(json_row, "neighbor",
+						       neigh_src_str);
+				json_object_string_add(json_row, "upTime",
+						       uptime);
+				json_object_string_add(json_row, "holdTime",
+						       expire);
+				json_object_int_add(json_row, "holdTimeMax",
+						    neigh->holdtime);
+				json_object_int_add(json_row, "drPriority",
+						    neigh->dr_priority);
+				json_object_object_add(json_ifp_rows,
+						       neigh_src_str, json_row);
+
+			} else {
+				vty_out(vty, "%-9s  %15s  %8s  %8s  %6d\n",
+					ifp->name, neigh_src_str, uptime,
+					expire, neigh->dr_priority);
+			}
+		}
+
+		if (uj) {
+			json_object_object_add(json, ifp->name, json_ifp_rows);
+			json_ifp_rows = NULL;
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
 static void pim_show_neighbors_secondary(struct vty *vty)
 {
-  struct listnode  *node;
-  struct interface *ifp;
+	struct listnode *node;
+	struct interface *ifp;
 
-  vty_out (vty,
-            "Interface Address         Neighbor        Secondary      \n");
+	vty_out(vty,
+		"Interface Address         Neighbor        Secondary      \n");
 
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
-    struct pim_interface *pim_ifp;
-    struct in_addr ifaddr;
-    struct listnode *neighnode;
-    struct pim_neighbor *neigh;
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		struct pim_interface *pim_ifp;
+		struct in_addr ifaddr;
+		struct listnode *neighnode;
+		struct pim_neighbor *neigh;
 
-    pim_ifp = ifp->info;
-    
-    if (!pim_ifp)
-      continue;
+		pim_ifp = ifp->info;
 
-    if (pim_ifp->pim_sock_fd < 0)
-      continue;
+		if (!pim_ifp)
+			continue;
 
-    ifaddr = pim_ifp->primary_address;
+		if (pim_ifp->pim_sock_fd < 0)
+			continue;
 
-    for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, neighnode, neigh)) {
-      char neigh_src_str[INET_ADDRSTRLEN];
-      struct listnode *prefix_node;
-      struct prefix *p;
+		ifaddr = pim_ifp->primary_address;
 
-      if (!neigh->prefix_list)
-	continue;
+		for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_neighbor_list, neighnode,
+					  neigh)) {
+			char neigh_src_str[INET_ADDRSTRLEN];
+			struct listnode *prefix_node;
+			struct prefix *p;
 
-      pim_inet4_dump("<src?>", neigh->source_addr,
-		     neigh_src_str, sizeof(neigh_src_str));
+			if (!neigh->prefix_list)
+				continue;
 
-      for (ALL_LIST_ELEMENTS_RO(neigh->prefix_list, prefix_node, p)) {
-	char neigh_sec_str[PREFIX2STR_BUFFER];
+			pim_inet4_dump("<src?>", neigh->source_addr,
+				       neigh_src_str, sizeof(neigh_src_str));
 
-	prefix2str(p, neigh_sec_str, sizeof(neigh_sec_str));
+			for (ALL_LIST_ELEMENTS_RO(neigh->prefix_list,
+						  prefix_node, p)) {
+				char neigh_sec_str[PREFIX2STR_BUFFER];
 
-	vty_out (vty, "%-9s %-15s %-15s %-15s\n",
-		ifp->name,
-		inet_ntoa(ifaddr),
-		neigh_src_str,
-		neigh_sec_str);
-      }
-    }
-  }
+				prefix2str(p, neigh_sec_str,
+					   sizeof(neigh_sec_str));
+
+				vty_out(vty, "%-9s %-15s %-15s %-15s\n",
+					ifp->name, inet_ntoa(ifaddr),
+					neigh_src_str, neigh_sec_str);
+			}
+		}
+	}
 }
 
-static void
-json_object_pim_upstream_add (json_object *json, struct pim_upstream *up)
+static void json_object_pim_upstream_add(json_object *json,
+					 struct pim_upstream *up)
 {
-  if (up->flags & PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED)
-    json_object_boolean_true_add(json, "drJoinDesired");
-
-  if (up->flags & PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED_UPDATED)
-    json_object_boolean_true_add(json, "drJoinDesiredUpdated");
+	if (up->flags & PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED)
+		json_object_boolean_true_add(json, "drJoinDesired");
 
-  if (up->flags & PIM_UPSTREAM_FLAG_MASK_FHR)
-    json_object_boolean_true_add(json, "firstHopRouter");
+	if (up->flags & PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED_UPDATED)
+		json_object_boolean_true_add(json, "drJoinDesiredUpdated");
 
-  if (up->flags & PIM_UPSTREAM_FLAG_MASK_SRC_IGMP)
-    json_object_boolean_true_add(json, "sourceIgmp");
+	if (up->flags & PIM_UPSTREAM_FLAG_MASK_FHR)
+		json_object_boolean_true_add(json, "firstHopRouter");
 
-  if (up->flags & PIM_UPSTREAM_FLAG_MASK_SRC_PIM)
-    json_object_boolean_true_add(json, "sourcePim");
+	if (up->flags & PIM_UPSTREAM_FLAG_MASK_SRC_IGMP)
+		json_object_boolean_true_add(json, "sourceIgmp");
 
-  if (up->flags & PIM_UPSTREAM_FLAG_MASK_SRC_STREAM)
-    json_object_boolean_true_add(json, "sourceStream");
+	if (up->flags & PIM_UPSTREAM_FLAG_MASK_SRC_PIM)
+		json_object_boolean_true_add(json, "sourcePim");
 
-  /* XXX: need to print ths flag in the plain text display as well */
-  if (up->flags & PIM_UPSTREAM_FLAG_MASK_SRC_MSDP)
-    json_object_boolean_true_add(json, "sourceMsdp");
-}
+	if (up->flags & PIM_UPSTREAM_FLAG_MASK_SRC_STREAM)
+		json_object_boolean_true_add(json, "sourceStream");
 
-static const char *
-pim_upstream_state2brief_str (enum pim_upstream_state join_state, char *state_str)
-{
-  switch (join_state)
-    {
-    case PIM_UPSTREAM_NOTJOINED:
-      strcpy (state_str, "NotJ");
-      break;
-    case PIM_UPSTREAM_JOINED:
-      strcpy (state_str, "J");
-      break;
-    default:
-      strcpy (state_str, "Unk");
-    }
-  return state_str;
+	/* XXX: need to print ths flag in the plain text display as well */
+	if (up->flags & PIM_UPSTREAM_FLAG_MASK_SRC_MSDP)
+		json_object_boolean_true_add(json, "sourceMsdp");
 }
 
 static const char *
-pim_reg_state2brief_str (enum pim_reg_state reg_state, char *state_str)
-{
-  switch (reg_state)
-    {
-    case PIM_REG_NOINFO:
-      strcpy (state_str, "RegNI");
-      break;
-    case PIM_REG_JOIN:
-      strcpy (state_str, "RegJ");
-      break;
-    case PIM_REG_JOIN_PENDING:
-    case PIM_REG_PRUNE:
-      strcpy (state_str, "RegP");
-      break;
-    default:
-      strcpy (state_str, "Unk");
-    }
-  return state_str;
+pim_upstream_state2brief_str(enum pim_upstream_state join_state,
+			     char *state_str)
+{
+	switch (join_state) {
+	case PIM_UPSTREAM_NOTJOINED:
+		strcpy(state_str, "NotJ");
+		break;
+	case PIM_UPSTREAM_JOINED:
+		strcpy(state_str, "J");
+		break;
+	default:
+		strcpy(state_str, "Unk");
+	}
+	return state_str;
+}
+
+static const char *pim_reg_state2brief_str(enum pim_reg_state reg_state,
+					   char *state_str)
+{
+	switch (reg_state) {
+	case PIM_REG_NOINFO:
+		strcpy(state_str, "RegNI");
+		break;
+	case PIM_REG_JOIN:
+		strcpy(state_str, "RegJ");
+		break;
+	case PIM_REG_JOIN_PENDING:
+	case PIM_REG_PRUNE:
+		strcpy(state_str, "RegP");
+		break;
+	default:
+		strcpy(state_str, "Unk");
+	}
+	return state_str;
 }
 
 static void pim_show_upstream(struct vty *vty, u_char uj)
 {
-  struct listnode     *upnode;
-  struct pim_upstream *up;
-  time_t               now;
-  json_object *json = NULL;
-  json_object *json_group = NULL;
-  json_object *json_row = NULL;
-
-  now = pim_time_monotonic_sec();
-
-  if (uj)
-    json = json_object_new_object();
-  else
-    vty_out (vty,
-              "Iif       Source          Group           State       Uptime   JoinTimer RSTimer   KATimer   RefCnt\n");
-
-  for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode, up)) {
-    char src_str[INET_ADDRSTRLEN];
-    char grp_str[INET_ADDRSTRLEN];
-    char uptime[10];
-    char join_timer[10];
-    char rs_timer[10];
-    char ka_timer[10];
-    char msdp_reg_timer[10];
-    char state_str[PIM_REG_STATE_STR_LEN];
-
-    pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
-    pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
-    pim_time_uptime(uptime, sizeof(uptime), now - up->state_transition);
-    pim_time_timer_to_hhmmss (join_timer, sizeof(join_timer), up->t_join_timer);
-
-    /*
-     * If we have a J/P timer for the neighbor display that
-     */
-    if (!up->t_join_timer)
-      {
-        struct pim_neighbor *nbr;
-
-        nbr = pim_neighbor_find (up->rpf.source_nexthop.interface,
-                                 up->rpf.rpf_addr.u.prefix4);
-        if (nbr)
-          pim_time_timer_to_hhmmss (join_timer, sizeof(join_timer), nbr->jp_timer);
-      }
-
-    pim_time_timer_to_hhmmss (rs_timer, sizeof (rs_timer), up->t_rs_timer);
-    pim_time_timer_to_hhmmss (ka_timer, sizeof (ka_timer), up->t_ka_timer);
-    pim_time_timer_to_hhmmss (msdp_reg_timer, sizeof (msdp_reg_timer), up->t_msdp_reg_timer);
-
-    pim_upstream_state2brief_str (up->join_state, state_str);
-    if (up->reg_state != PIM_REG_NOINFO) {
-      char tmp_str[PIM_REG_STATE_STR_LEN];
-
-      sprintf (state_str + strlen (state_str), ",%s",
-               pim_reg_state2brief_str (up->reg_state, tmp_str));
-    }
-
-    if (uj) {
-      json_object_object_get_ex(json, grp_str, &json_group);
-
-      if (!json_group) {
-        json_group = json_object_new_object();
-        json_object_object_add(json, grp_str, json_group);
-      }
-
-      json_row = json_object_new_object();
-      json_object_pim_upstream_add(json_row, up);
-      json_object_string_add(json_row, "inboundInterface", up->rpf.source_nexthop.interface->name);
-      json_object_string_add(json_row, "source", src_str);
-      json_object_string_add(json_row, "group", grp_str);
-      json_object_string_add(json_row, "state", state_str);
-      json_object_string_add(json_row, "joinState", pim_upstream_state2str (up->join_state));
-      json_object_string_add(json_row, "regState", pim_reg_state2str (up->reg_state, state_str));
-      json_object_string_add(json_row, "upTime", uptime);
-      json_object_string_add(json_row, "joinTimer", join_timer);
-      json_object_string_add(json_row, "resetTimer", rs_timer);
-      json_object_string_add(json_row, "keepaliveTimer", ka_timer);
-      json_object_string_add(json_row, "msdpRegTimer", msdp_reg_timer);
-      json_object_int_add(json_row, "refCount", up->ref_count);
-      json_object_int_add(json_row, "sptBit", up->sptbit);
-      json_object_object_add(json_group, src_str, json_row);
-    } else {
-      vty_out (vty, "%-10s%-15s %-15s %-11s %-8s %-9s %-9s %-9s %6d\n",
-              up->rpf.source_nexthop.interface->name,
-              src_str,
-              grp_str,
-              state_str,
-              uptime,
-              join_timer,
-              rs_timer,
-              ka_timer,
-              up->ref_count);
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
+	struct listnode *upnode;
+	struct pim_upstream *up;
+	time_t now;
+	json_object *json = NULL;
+	json_object *json_group = NULL;
+	json_object *json_row = NULL;
+
+	now = pim_time_monotonic_sec();
+
+	if (uj)
+		json = json_object_new_object();
+	else
+		vty_out(vty,
+			"Iif       Source          Group           State       Uptime   JoinTimer RSTimer   KATimer   RefCnt\n");
+
+	for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode, up)) {
+		char src_str[INET_ADDRSTRLEN];
+		char grp_str[INET_ADDRSTRLEN];
+		char uptime[10];
+		char join_timer[10];
+		char rs_timer[10];
+		char ka_timer[10];
+		char msdp_reg_timer[10];
+		char state_str[PIM_REG_STATE_STR_LEN];
+
+		pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
+		pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
+		pim_time_uptime(uptime, sizeof(uptime),
+				now - up->state_transition);
+		pim_time_timer_to_hhmmss(join_timer, sizeof(join_timer),
+					 up->t_join_timer);
+
+		/*
+		 * If we have a J/P timer for the neighbor display that
+		 */
+		if (!up->t_join_timer) {
+			struct pim_neighbor *nbr;
+
+			nbr = pim_neighbor_find(
+				up->rpf.source_nexthop.interface,
+				up->rpf.rpf_addr.u.prefix4);
+			if (nbr)
+				pim_time_timer_to_hhmmss(join_timer,
+							 sizeof(join_timer),
+							 nbr->jp_timer);
+		}
+
+		pim_time_timer_to_hhmmss(rs_timer, sizeof(rs_timer),
+					 up->t_rs_timer);
+		pim_time_timer_to_hhmmss(ka_timer, sizeof(ka_timer),
+					 up->t_ka_timer);
+		pim_time_timer_to_hhmmss(msdp_reg_timer, sizeof(msdp_reg_timer),
+					 up->t_msdp_reg_timer);
+
+		pim_upstream_state2brief_str(up->join_state, state_str);
+		if (up->reg_state != PIM_REG_NOINFO) {
+			char tmp_str[PIM_REG_STATE_STR_LEN];
+
+			sprintf(state_str + strlen(state_str), ",%s",
+				pim_reg_state2brief_str(up->reg_state,
+							tmp_str));
+		}
+
+		if (uj) {
+			json_object_object_get_ex(json, grp_str, &json_group);
+
+			if (!json_group) {
+				json_group = json_object_new_object();
+				json_object_object_add(json, grp_str,
+						       json_group);
+			}
+
+			json_row = json_object_new_object();
+			json_object_pim_upstream_add(json_row, up);
+			json_object_string_add(
+				json_row, "inboundInterface",
+				up->rpf.source_nexthop.interface->name);
+			json_object_string_add(json_row, "source", src_str);
+			json_object_string_add(json_row, "group", grp_str);
+			json_object_string_add(json_row, "state", state_str);
+			json_object_string_add(
+				json_row, "joinState",
+				pim_upstream_state2str(up->join_state));
+			json_object_string_add(
+				json_row, "regState",
+				pim_reg_state2str(up->reg_state, state_str));
+			json_object_string_add(json_row, "upTime", uptime);
+			json_object_string_add(json_row, "joinTimer",
+					       join_timer);
+			json_object_string_add(json_row, "resetTimer",
+					       rs_timer);
+			json_object_string_add(json_row, "keepaliveTimer",
+					       ka_timer);
+			json_object_string_add(json_row, "msdpRegTimer",
+					       msdp_reg_timer);
+			json_object_int_add(json_row, "refCount",
+					    up->ref_count);
+			json_object_int_add(json_row, "sptBit", up->sptbit);
+			json_object_object_add(json_group, src_str, json_row);
+		} else {
+			vty_out(vty,
+				"%-10s%-15s %-15s %-11s %-8s %-9s %-9s %-9s %6d\n",
+				up->rpf.source_nexthop.interface->name, src_str,
+				grp_str, state_str, uptime, join_timer,
+				rs_timer, ka_timer, up->ref_count);
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
 static void pim_show_join_desired(struct vty *vty, u_char uj)
 {
-  struct listnode      *chnode;
-  struct pim_interface *pim_ifp;
-  struct pim_ifchannel *ch;
-  char src_str[INET_ADDRSTRLEN];
-  char grp_str[INET_ADDRSTRLEN];
-  json_object *json = NULL;
-  json_object *json_group = NULL;
-  json_object *json_row = NULL;
-
-  if (uj)
-    json = json_object_new_object();
-  else
-    vty_out (vty,
-            "Interface Source          Group           LostAssert Joins PimInclude JoinDesired EvalJD\n");
-
-  /* scan per-interface (S,G) state */
-  for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, chnode, ch)) {
-    /* scan all interfaces */
-    pim_ifp = ch->interface->info;
-    if (!pim_ifp)
-      continue;
-
-    struct pim_upstream *up = ch->upstream;
-
-    pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
-    pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
-
-    if (uj) {
-      json_object_object_get_ex(json, grp_str, &json_group);
-
-      if (!json_group) {
-	json_group = json_object_new_object();
-	json_object_object_add(json, grp_str, json_group);
-      }
-
-      json_row = json_object_new_object();
-      json_object_pim_upstream_add(json_row, up);
-      json_object_string_add(json_row, "interface", ch->interface->name);
-      json_object_string_add(json_row, "source", src_str);
-      json_object_string_add(json_row, "group", grp_str);
-
-      if (pim_macro_ch_lost_assert(ch))
-	json_object_boolean_true_add(json_row, "lostAssert");
-
-      if (pim_macro_chisin_joins(ch))
-	json_object_boolean_true_add(json_row, "joins");
-
-      if (pim_macro_chisin_pim_include(ch))
-	json_object_boolean_true_add(json_row, "pimInclude");
-
-      if (pim_upstream_evaluate_join_desired(up))
-	json_object_boolean_true_add(json_row, "evaluateJoinDesired");
-
-      json_object_object_add(json_group, src_str, json_row);
-
-    } else {
-      vty_out (vty, "%-9s %-15s %-15s %-10s %-5s %-10s %-11s %-6s\n",
-	      ch->interface->name,
-	      src_str,
-	      grp_str,
-	      pim_macro_ch_lost_assert(ch) ? "yes" : "no",
-	      pim_macro_chisin_joins(ch) ? "yes" : "no",
-	      pim_macro_chisin_pim_include(ch) ? "yes" : "no",
-	      PIM_UPSTREAM_FLAG_TEST_DR_JOIN_DESIRED(up->flags) ? "yes" : "no",
-	      pim_upstream_evaluate_join_desired(up) ? "yes" : "no");
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
+	struct listnode *chnode;
+	struct pim_interface *pim_ifp;
+	struct pim_ifchannel *ch;
+	char src_str[INET_ADDRSTRLEN];
+	char grp_str[INET_ADDRSTRLEN];
+	json_object *json = NULL;
+	json_object *json_group = NULL;
+	json_object *json_row = NULL;
+
+	if (uj)
+		json = json_object_new_object();
+	else
+		vty_out(vty,
+			"Interface Source          Group           LostAssert Joins PimInclude JoinDesired EvalJD\n");
+
+	/* scan per-interface (S,G) state */
+	for (ALL_LIST_ELEMENTS_RO(pim_ifchannel_list, chnode, ch)) {
+		/* scan all interfaces */
+		pim_ifp = ch->interface->info;
+		if (!pim_ifp)
+			continue;
+
+		struct pim_upstream *up = ch->upstream;
+
+		pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
+		pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
+
+		if (uj) {
+			json_object_object_get_ex(json, grp_str, &json_group);
+
+			if (!json_group) {
+				json_group = json_object_new_object();
+				json_object_object_add(json, grp_str,
+						       json_group);
+			}
+
+			json_row = json_object_new_object();
+			json_object_pim_upstream_add(json_row, up);
+			json_object_string_add(json_row, "interface",
+					       ch->interface->name);
+			json_object_string_add(json_row, "source", src_str);
+			json_object_string_add(json_row, "group", grp_str);
+
+			if (pim_macro_ch_lost_assert(ch))
+				json_object_boolean_true_add(json_row,
+							     "lostAssert");
+
+			if (pim_macro_chisin_joins(ch))
+				json_object_boolean_true_add(json_row, "joins");
+
+			if (pim_macro_chisin_pim_include(ch))
+				json_object_boolean_true_add(json_row,
+							     "pimInclude");
+
+			if (pim_upstream_evaluate_join_desired(up))
+				json_object_boolean_true_add(
+					json_row, "evaluateJoinDesired");
+
+			json_object_object_add(json_group, src_str, json_row);
+
+		} else {
+			vty_out(vty,
+				"%-9s %-15s %-15s %-10s %-5s %-10s %-11s %-6s\n",
+				ch->interface->name, src_str, grp_str,
+				pim_macro_ch_lost_assert(ch) ? "yes" : "no",
+				pim_macro_chisin_joins(ch) ? "yes" : "no",
+				pim_macro_chisin_pim_include(ch) ? "yes" : "no",
+				PIM_UPSTREAM_FLAG_TEST_DR_JOIN_DESIRED(
+					up->flags)
+					? "yes"
+					: "no",
+				pim_upstream_evaluate_join_desired(up) ? "yes"
+								       : "no");
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
 static void pim_show_upstream_rpf(struct vty *vty, u_char uj)
 {
-  struct listnode     *upnode;
-  struct pim_upstream *up;
-  json_object *json = NULL;
-  json_object *json_group = NULL;
-  json_object *json_row = NULL;
-
-  if (uj)
-    json = json_object_new_object();
-  else
-    vty_out (vty,
-            "Source          Group           RpfIface RibNextHop      RpfAddress     \n");
-
-  for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode, up)) {
-    char src_str[INET_ADDRSTRLEN];
-    char grp_str[INET_ADDRSTRLEN];
-    char rpf_nexthop_str[PREFIX_STRLEN];
-    char rpf_addr_str[PREFIX_STRLEN];
-    struct pim_rpf *rpf;
-    const char *rpf_ifname;
-
-    rpf = &up->rpf;
-
-    pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
-    pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
-    pim_addr_dump("<nexthop?>", &rpf->source_nexthop.mrib_nexthop_addr, rpf_nexthop_str, sizeof(rpf_nexthop_str));
-    pim_addr_dump("<rpf?>", &rpf->rpf_addr, rpf_addr_str, sizeof(rpf_addr_str));
-
-    rpf_ifname = rpf->source_nexthop.interface ? rpf->source_nexthop.interface->name : "<ifname?>";
-
-    if (uj) {
-        json_object_object_get_ex(json, grp_str, &json_group);
-
-        if (!json_group) {
-          json_group = json_object_new_object();
-          json_object_object_add(json, grp_str, json_group);
-        }
-
-        json_row = json_object_new_object();
-        json_object_pim_upstream_add(json_row, up);
-        json_object_string_add(json_row, "source", src_str);
-        json_object_string_add(json_row, "group", grp_str);
-        json_object_string_add(json_row, "rpfInterface", rpf_ifname);
-        json_object_string_add(json_row, "ribNexthop", rpf_nexthop_str);
-        json_object_string_add(json_row, "rpfAddress", rpf_addr_str);
-        json_object_object_add(json_group, src_str, json_row);
-    } else {
-        vty_out (vty, "%-15s %-15s %-8s %-15s %-15s\n",
-                src_str,
-                grp_str,
-                rpf_ifname,
-                rpf_nexthop_str,
-                rpf_addr_str);
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
-}
-
-static void show_rpf_refresh_stats(struct vty *vty, time_t now, json_object *json)
-{
-  char refresh_uptime[10];
-
-  pim_time_uptime_begin(refresh_uptime, sizeof(refresh_uptime), now, qpim_rpf_cache_refresh_last);
-
-  if (json) {
-    json_object_int_add(json, "rpfCacheRefreshDelayMsecs", qpim_rpf_cache_refresh_delay_msec);
-    json_object_int_add(json, "rpfCacheRefreshTimer", pim_time_timer_remain_msec(qpim_rpf_cache_refresher));
-    json_object_int_add(json, "rpfCacheRefreshRequests", qpim_rpf_cache_refresh_requests);
-    json_object_int_add(json, "rpfCacheRefreshEvents", qpim_rpf_cache_refresh_events);
-    json_object_string_add(json, "rpfCacheRefreshLast", refresh_uptime);
-    json_object_int_add(json, "nexthopLookups", qpim_nexthop_lookups);
-    json_object_int_add(json, "nexthopLookupsAvoided", nexthop_lookups_avoided);
-  } else {
-    vty_out (vty,
-            "RPF Cache Refresh Delay:    %ld msecs\n"
-            "RPF Cache Refresh Timer:    %ld msecs\n"
-            "RPF Cache Refresh Requests: %lld\n"
-            "RPF Cache Refresh Events:   %lld\n"
-            "RPF Cache Refresh Last:     %s\n"
-            "Nexthop Lookups:            %lld\n"
-	    "Nexthop Lookups Avoided:    %lld\n",
-            qpim_rpf_cache_refresh_delay_msec,
-            pim_time_timer_remain_msec(qpim_rpf_cache_refresher),
-            (long long)qpim_rpf_cache_refresh_requests,
-            (long long)qpim_rpf_cache_refresh_events,
-            refresh_uptime,
-            (long long) qpim_nexthop_lookups,
-	    (long long)nexthop_lookups_avoided);
-  }
+	struct listnode *upnode;
+	struct pim_upstream *up;
+	json_object *json = NULL;
+	json_object *json_group = NULL;
+	json_object *json_row = NULL;
+
+	if (uj)
+		json = json_object_new_object();
+	else
+		vty_out(vty,
+			"Source          Group           RpfIface RibNextHop      RpfAddress     \n");
+
+	for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, upnode, up)) {
+		char src_str[INET_ADDRSTRLEN];
+		char grp_str[INET_ADDRSTRLEN];
+		char rpf_nexthop_str[PREFIX_STRLEN];
+		char rpf_addr_str[PREFIX_STRLEN];
+		struct pim_rpf *rpf;
+		const char *rpf_ifname;
+
+		rpf = &up->rpf;
+
+		pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
+		pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
+		pim_addr_dump("<nexthop?>",
+			      &rpf->source_nexthop.mrib_nexthop_addr,
+			      rpf_nexthop_str, sizeof(rpf_nexthop_str));
+		pim_addr_dump("<rpf?>", &rpf->rpf_addr, rpf_addr_str,
+			      sizeof(rpf_addr_str));
+
+		rpf_ifname = rpf->source_nexthop.interface ? rpf->source_nexthop.interface->name : "<ifname?>";
+
+		if (uj) {
+			json_object_object_get_ex(json, grp_str, &json_group);
+
+			if (!json_group) {
+				json_group = json_object_new_object();
+				json_object_object_add(json, grp_str,
+						       json_group);
+			}
+
+			json_row = json_object_new_object();
+			json_object_pim_upstream_add(json_row, up);
+			json_object_string_add(json_row, "source", src_str);
+			json_object_string_add(json_row, "group", grp_str);
+			json_object_string_add(json_row, "rpfInterface",
+					       rpf_ifname);
+			json_object_string_add(json_row, "ribNexthop",
+					       rpf_nexthop_str);
+			json_object_string_add(json_row, "rpfAddress",
+					       rpf_addr_str);
+			json_object_object_add(json_group, src_str, json_row);
+		} else {
+			vty_out(vty, "%-15s %-15s %-8s %-15s %-15s\n", src_str,
+				grp_str, rpf_ifname, rpf_nexthop_str,
+				rpf_addr_str);
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
+}
+
+static void show_rpf_refresh_stats(struct vty *vty, time_t now,
+				   json_object *json)
+{
+	char refresh_uptime[10];
+
+	pim_time_uptime_begin(refresh_uptime, sizeof(refresh_uptime), now,
+			      qpim_rpf_cache_refresh_last);
+
+	if (json) {
+		json_object_int_add(json, "rpfCacheRefreshDelayMsecs",
+				    qpim_rpf_cache_refresh_delay_msec);
+		json_object_int_add(
+			json, "rpfCacheRefreshTimer",
+			pim_time_timer_remain_msec(qpim_rpf_cache_refresher));
+		json_object_int_add(json, "rpfCacheRefreshRequests",
+				    qpim_rpf_cache_refresh_requests);
+		json_object_int_add(json, "rpfCacheRefreshEvents",
+				    qpim_rpf_cache_refresh_events);
+		json_object_string_add(json, "rpfCacheRefreshLast",
+				       refresh_uptime);
+		json_object_int_add(json, "nexthopLookups",
+				    qpim_nexthop_lookups);
+		json_object_int_add(json, "nexthopLookupsAvoided",
+				    nexthop_lookups_avoided);
+	} else {
+		vty_out(vty,
+			"RPF Cache Refresh Delay:    %ld msecs\n"
+			"RPF Cache Refresh Timer:    %ld msecs\n"
+			"RPF Cache Refresh Requests: %lld\n"
+			"RPF Cache Refresh Events:   %lld\n"
+			"RPF Cache Refresh Last:     %s\n"
+			"Nexthop Lookups:            %lld\n"
+			"Nexthop Lookups Avoided:    %lld\n",
+			qpim_rpf_cache_refresh_delay_msec,
+			pim_time_timer_remain_msec(qpim_rpf_cache_refresher),
+			(long long)qpim_rpf_cache_refresh_requests,
+			(long long)qpim_rpf_cache_refresh_events,
+			refresh_uptime, (long long)qpim_nexthop_lookups,
+			(long long)nexthop_lookups_avoided);
+	}
 }
 
 static void show_scan_oil_stats(struct vty *vty, time_t now)
 {
-  char uptime_scan_oil[10];
-  char uptime_mroute_add[10];
-  char uptime_mroute_del[10];
+	char uptime_scan_oil[10];
+	char uptime_mroute_add[10];
+	char uptime_mroute_del[10];
 
-  pim_time_uptime_begin(uptime_scan_oil, sizeof(uptime_scan_oil), now, qpim_scan_oil_last);
-  pim_time_uptime_begin(uptime_mroute_add, sizeof(uptime_mroute_add), now, qpim_mroute_add_last);
-  pim_time_uptime_begin(uptime_mroute_del, sizeof(uptime_mroute_del), now, qpim_mroute_del_last);
+	pim_time_uptime_begin(uptime_scan_oil, sizeof(uptime_scan_oil), now,
+			      qpim_scan_oil_last);
+	pim_time_uptime_begin(uptime_mroute_add, sizeof(uptime_mroute_add), now,
+			      qpim_mroute_add_last);
+	pim_time_uptime_begin(uptime_mroute_del, sizeof(uptime_mroute_del), now,
+			      qpim_mroute_del_last);
 
-  vty_out (vty,
-          "Scan OIL - Last: %s  Events: %lld\n"
-          "MFC Add  - Last: %s  Events: %lld\n"
-          "MFC Del  - Last: %s  Events: %lld\n",
-          uptime_scan_oil,   (long long) qpim_scan_oil_events,
-          uptime_mroute_add, (long long) qpim_mroute_add_events,
-          uptime_mroute_del, (long long)qpim_mroute_del_events);
+	vty_out(vty,
+		"Scan OIL - Last: %s  Events: %lld\n"
+		"MFC Add  - Last: %s  Events: %lld\n"
+		"MFC Del  - Last: %s  Events: %lld\n",
+		uptime_scan_oil, (long long)qpim_scan_oil_events,
+		uptime_mroute_add, (long long)qpim_mroute_add_events,
+		uptime_mroute_del, (long long)qpim_mroute_del_events);
 }
 
 static void pim_show_rpf(struct vty *vty, u_char uj)
 {
-  struct listnode     *up_node;
-  struct pim_upstream *up;
-  time_t               now = pim_time_monotonic_sec();
-  json_object *json = NULL;
-  json_object *json_group = NULL;
-  json_object *json_row = NULL;
-
-  if (uj) {
-    json = json_object_new_object();
-    show_rpf_refresh_stats(vty, now, json);
-  } else {
-    show_rpf_refresh_stats(vty, now, json);
-    vty_out (vty, "\n");
-    vty_out (vty,
-            "Source          Group           RpfIface RpfAddress      RibNextHop      Metric Pref\n");
-  }
-
-  for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, up_node, up)) {
-    char src_str[INET_ADDRSTRLEN];
-    char grp_str[INET_ADDRSTRLEN];
-    char rpf_addr_str[PREFIX_STRLEN];
-    char rib_nexthop_str[PREFIX_STRLEN];
-    const char *rpf_ifname;
-    struct pim_rpf  *rpf = &up->rpf;
-    
-    pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
-    pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
-    pim_addr_dump("<rpf?>", &rpf->rpf_addr, rpf_addr_str, sizeof(rpf_addr_str));
-    pim_addr_dump("<nexthop?>", &rpf->source_nexthop.mrib_nexthop_addr, rib_nexthop_str, sizeof(rib_nexthop_str));
-    
-    rpf_ifname = rpf->source_nexthop.interface ? rpf->source_nexthop.interface->name : "<ifname?>";
-    
-    if (uj) {
-      json_object_object_get_ex(json, grp_str, &json_group);
-
-      if (!json_group) {
-        json_group = json_object_new_object();
-        json_object_object_add(json, grp_str, json_group);
-      }
-
-      json_row = json_object_new_object();
-      json_object_string_add(json_row, "source", src_str);
-      json_object_string_add(json_row, "group", grp_str);
-      json_object_string_add(json_row, "rpfInterface", rpf_ifname);
-      json_object_string_add(json_row, "rpfAddress", rpf_addr_str);
-      json_object_string_add(json_row, "ribNexthop", rib_nexthop_str);
-      json_object_int_add(json_row, "routeMetric", rpf->source_nexthop.mrib_route_metric);
-      json_object_int_add(json_row, "routePreference", rpf->source_nexthop.mrib_metric_preference);
-      json_object_object_add(json_group, src_str, json_row);
-
-    } else {
-      vty_out (vty, "%-15s %-15s %-8s %-15s %-15s %6d %4d\n",
-              src_str,
-              grp_str,
-              rpf_ifname,
-              rpf_addr_str,
-              rib_nexthop_str,
-              rpf->source_nexthop.mrib_route_metric,
-              rpf->source_nexthop.mrib_metric_preference);
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
-}
-
-static int
-pim_print_pnc_cache_walkcb (struct hash_backet *backet, void *arg)
-{
-  struct pim_nexthop_cache *pnc = backet->data;
-  struct vty *vty = arg;
-  struct nexthop *nh_node = NULL;
-  ifindex_t first_ifindex;
-  struct interface *ifp = NULL;
-
-  if (!pnc)
-    return CMD_SUCCESS;
-
-  for (nh_node = pnc->nexthop; nh_node; nh_node = nh_node->next)
-    {
-      first_ifindex = nh_node->ifindex;
-      ifp = if_lookup_by_index (first_ifindex, VRF_DEFAULT);
-
-      vty_out (vty, "%-15s ", inet_ntoa (pnc->rpf.rpf_addr.u.prefix4));
-      vty_out (vty, "%-14s ", ifp ? ifp->name : "NULL");
-      vty_out (vty, "%s ", inet_ntoa (nh_node->gate.ipv4));
-      vty_out (vty, "\n");
-    }
-  return CMD_SUCCESS;
-}
-
-static void
-pim_show_nexthop (struct vty *vty)
-{
-
-  if (pimg && !pimg->rpf_hash)
-    {
-      vty_out (vty, "no nexthop cache \n");
-      return;
-    }
-
-  vty_out (vty, "Number of registered addresses: %lu \n",
-           pimg->rpf_hash->count);
-  vty_out (vty, "Address         Interface      Nexthop\n");
-  vty_out (vty, "-------------------------------------------\n");
-
-  hash_walk (pimg->rpf_hash, pim_print_pnc_cache_walkcb, vty);
+	struct listnode *up_node;
+	struct pim_upstream *up;
+	time_t now = pim_time_monotonic_sec();
+	json_object *json = NULL;
+	json_object *json_group = NULL;
+	json_object *json_row = NULL;
+
+	if (uj) {
+		json = json_object_new_object();
+		show_rpf_refresh_stats(vty, now, json);
+	} else {
+		show_rpf_refresh_stats(vty, now, json);
+		vty_out(vty, "\n");
+		vty_out(vty,
+			"Source          Group           RpfIface RpfAddress      RibNextHop      Metric Pref\n");
+	}
 
+	for (ALL_LIST_ELEMENTS_RO(pim_upstream_list, up_node, up)) {
+		char src_str[INET_ADDRSTRLEN];
+		char grp_str[INET_ADDRSTRLEN];
+		char rpf_addr_str[PREFIX_STRLEN];
+		char rib_nexthop_str[PREFIX_STRLEN];
+		const char *rpf_ifname;
+		struct pim_rpf *rpf = &up->rpf;
+
+		pim_inet4_dump("<src?>", up->sg.src, src_str, sizeof(src_str));
+		pim_inet4_dump("<grp?>", up->sg.grp, grp_str, sizeof(grp_str));
+		pim_addr_dump("<rpf?>", &rpf->rpf_addr, rpf_addr_str,
+			      sizeof(rpf_addr_str));
+		pim_addr_dump("<nexthop?>",
+			      &rpf->source_nexthop.mrib_nexthop_addr,
+			      rib_nexthop_str, sizeof(rib_nexthop_str));
+
+		rpf_ifname = rpf->source_nexthop.interface ? rpf->source_nexthop.interface->name : "<ifname?>";
+
+		if (uj) {
+			json_object_object_get_ex(json, grp_str, &json_group);
+
+			if (!json_group) {
+				json_group = json_object_new_object();
+				json_object_object_add(json, grp_str,
+						       json_group);
+			}
+
+			json_row = json_object_new_object();
+			json_object_string_add(json_row, "source", src_str);
+			json_object_string_add(json_row, "group", grp_str);
+			json_object_string_add(json_row, "rpfInterface",
+					       rpf_ifname);
+			json_object_string_add(json_row, "rpfAddress",
+					       rpf_addr_str);
+			json_object_string_add(json_row, "ribNexthop",
+					       rib_nexthop_str);
+			json_object_int_add(
+				json_row, "routeMetric",
+				rpf->source_nexthop.mrib_route_metric);
+			json_object_int_add(
+				json_row, "routePreference",
+				rpf->source_nexthop.mrib_metric_preference);
+			json_object_object_add(json_group, src_str, json_row);
+
+		} else {
+			vty_out(vty, "%-15s %-15s %-8s %-15s %-15s %6d %4d\n",
+				src_str, grp_str, rpf_ifname, rpf_addr_str,
+				rib_nexthop_str,
+				rpf->source_nexthop.mrib_route_metric,
+				rpf->source_nexthop.mrib_metric_preference);
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
-static void igmp_show_groups(struct vty *vty, u_char uj)
+static int pim_print_pnc_cache_walkcb(struct hash_backet *backet, void *arg)
 {
-  struct listnode  *ifnode;
-  struct interface *ifp;
-  time_t            now;
-  json_object *json = NULL;
-  json_object *json_iface = NULL;
-  json_object *json_row = NULL;
-
-  now = pim_time_monotonic_sec();
-
-  if (uj)
-    json = json_object_new_object();
-  else
-    vty_out (vty,
-              "Interface Address         Group           Mode Timer    Srcs V Uptime  \n");
-
-  /* scan interfaces */
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), ifnode, ifp)) {
-    struct pim_interface *pim_ifp = ifp->info;
-    struct listnode  *sock_node;
-    struct igmp_sock *igmp;
-    
-    if (!pim_ifp)
-      continue;
-    
-    /* scan igmp sockets */
-    for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
-      char ifaddr_str[INET_ADDRSTRLEN];
-      struct listnode *grpnode;
-      struct igmp_group *grp;
-
-      pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str, sizeof(ifaddr_str));
-
-      /* scan igmp groups */
-      for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list, grpnode, grp)) {
-	char group_str[INET_ADDRSTRLEN];
-	char hhmmss[10];
-	char uptime[10];
+	struct pim_nexthop_cache *pnc = backet->data;
+	struct vty *vty = arg;
+	struct nexthop *nh_node = NULL;
+	ifindex_t first_ifindex;
+	struct interface *ifp = NULL;
+
+	if (!pnc)
+		return CMD_SUCCESS;
+
+	for (nh_node = pnc->nexthop; nh_node; nh_node = nh_node->next) {
+		first_ifindex = nh_node->ifindex;
+		ifp = if_lookup_by_index(first_ifindex, VRF_DEFAULT);
+
+		vty_out(vty, "%-15s ", inet_ntoa(pnc->rpf.rpf_addr.u.prefix4));
+		vty_out(vty, "%-14s ", ifp ? ifp->name : "NULL");
+		vty_out(vty, "%s ", inet_ntoa(nh_node->gate.ipv4));
+		vty_out(vty, "\n");
+	}
+	return CMD_SUCCESS;
+}
+
+static void pim_show_nexthop(struct vty *vty)
+{
+
+	if (pimg && !pimg->rpf_hash) {
+		vty_out(vty, "no nexthop cache \n");
+		return;
+	}
+
+	vty_out(vty, "Number of registered addresses: %lu \n",
+		pimg->rpf_hash->count);
+	vty_out(vty, "Address         Interface      Nexthop\n");
+	vty_out(vty, "-------------------------------------------\n");
 
-	pim_inet4_dump("<group?>", grp->group_addr, group_str, sizeof(group_str));
-	pim_time_timer_to_hhmmss(hhmmss, sizeof(hhmmss), grp->t_group_timer);
-	pim_time_uptime(uptime, sizeof(uptime), now - grp->group_creation);
-
-        if (uj) {
-            json_object_object_get_ex(json, ifp->name, &json_iface);
-
-            if (!json_iface) {
-              json_iface = json_object_new_object();
-              json_object_pim_ifp_add(json_iface, ifp);
-              json_object_object_add(json, ifp->name, json_iface);
-            }
-
-            json_row = json_object_new_object();
-            json_object_string_add(json_row, "source", ifaddr_str);
-            json_object_string_add(json_row, "group", group_str);
-
-            if (grp->igmp_version == 3)
-              json_object_string_add(json_row, "mode", grp->group_filtermode_isexcl ? "EXCLUDE" : "INCLUDE");
-
-            json_object_string_add(json_row, "timer", hhmmss);
-            json_object_int_add(json_row, "sourcesCount", grp->group_source_list ? listcount(grp->group_source_list) : 0);
-            json_object_int_add(json_row, "version", grp->igmp_version);
-            json_object_string_add(json_row, "uptime", uptime);
-            json_object_object_add(json_iface, group_str, json_row);
-
-        } else {
-          vty_out (vty, "%-9s %-15s %-15s %4s %8s %4d %d %8s\n",
-                  ifp->name,
-                  ifaddr_str,
-                  group_str,
-                  grp->igmp_version == 3 ? (grp->group_filtermode_isexcl ? "EXCL" : "INCL") : "----",
-                  hhmmss,
-                  grp->group_source_list ? listcount(grp->group_source_list) : 0,
-                  grp->igmp_version,
-                  uptime);
-        }
-      } /* scan igmp groups */
-    } /* scan igmp sockets */
-  } /* scan interfaces */
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
+	hash_walk(pimg->rpf_hash, pim_print_pnc_cache_walkcb, vty);
+}
+
+static void igmp_show_groups(struct vty *vty, u_char uj)
+{
+	struct listnode *ifnode;
+	struct interface *ifp;
+	time_t now;
+	json_object *json = NULL;
+	json_object *json_iface = NULL;
+	json_object *json_row = NULL;
+
+	now = pim_time_monotonic_sec();
+
+	if (uj)
+		json = json_object_new_object();
+	else
+		vty_out(vty,
+			"Interface Address         Group           Mode Timer    Srcs V Uptime  \n");
+
+	/* scan interfaces */
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), ifnode, ifp)) {
+		struct pim_interface *pim_ifp = ifp->info;
+		struct listnode *sock_node;
+		struct igmp_sock *igmp;
+
+		if (!pim_ifp)
+			continue;
+
+		/* scan igmp sockets */
+		for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node,
+					  igmp)) {
+			char ifaddr_str[INET_ADDRSTRLEN];
+			struct listnode *grpnode;
+			struct igmp_group *grp;
+
+			pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str,
+				       sizeof(ifaddr_str));
+
+			/* scan igmp groups */
+			for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list,
+						  grpnode, grp)) {
+				char group_str[INET_ADDRSTRLEN];
+				char hhmmss[10];
+				char uptime[10];
+
+				pim_inet4_dump("<group?>", grp->group_addr,
+					       group_str, sizeof(group_str));
+				pim_time_timer_to_hhmmss(hhmmss, sizeof(hhmmss),
+							 grp->t_group_timer);
+				pim_time_uptime(uptime, sizeof(uptime),
+						now - grp->group_creation);
+
+				if (uj) {
+					json_object_object_get_ex(
+						json, ifp->name, &json_iface);
+
+					if (!json_iface) {
+						json_iface =
+							json_object_new_object();
+						json_object_pim_ifp_add(
+							json_iface, ifp);
+						json_object_object_add(
+							json, ifp->name,
+							json_iface);
+					}
+
+					json_row = json_object_new_object();
+					json_object_string_add(
+						json_row, "source", ifaddr_str);
+					json_object_string_add(
+						json_row, "group", group_str);
+
+					if (grp->igmp_version == 3)
+						json_object_string_add(
+							json_row, "mode",
+							grp->group_filtermode_isexcl
+								? "EXCLUDE"
+								: "INCLUDE");
+
+					json_object_string_add(json_row,
+							       "timer", hhmmss);
+					json_object_int_add(
+						json_row, "sourcesCount",
+						grp->group_source_list
+							? listcount(
+								  grp->group_source_list)
+							: 0);
+					json_object_int_add(json_row, "version",
+							    grp->igmp_version);
+					json_object_string_add(
+						json_row, "uptime", uptime);
+					json_object_object_add(json_iface,
+							       group_str,
+							       json_row);
+
+				} else {
+					vty_out(vty,
+						"%-9s %-15s %-15s %4s %8s %4d %d %8s\n",
+						ifp->name, ifaddr_str,
+						group_str,
+						grp->igmp_version == 3
+							? (grp->group_filtermode_isexcl
+								   ? "EXCL"
+								   : "INCL")
+							: "----",
+						hhmmss,
+						grp->group_source_list
+							? listcount(
+								  grp->group_source_list)
+							: 0,
+						grp->igmp_version, uptime);
+				}
+			} /* scan igmp groups */
+		}	 /* scan igmp sockets */
+	}		  /* scan interfaces */
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
 static void igmp_show_group_retransmission(struct vty *vty)
 {
-  struct listnode  *ifnode;
-  struct interface *ifp;
-
-  vty_out (vty,
-            "Interface Address         Group           RetTimer Counter RetSrcs\n");
-
-  /* scan interfaces */
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), ifnode, ifp)) {
-    struct pim_interface *pim_ifp = ifp->info;
-    struct listnode  *sock_node;
-    struct igmp_sock *igmp;
-    
-    if (!pim_ifp)
-      continue;
-    
-    /* scan igmp sockets */
-    for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
-      char ifaddr_str[INET_ADDRSTRLEN];
-      struct listnode *grpnode;
-      struct igmp_group *grp;
-
-      pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str, sizeof(ifaddr_str));
-
-      /* scan igmp groups */
-      for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list, grpnode, grp)) {
-	char group_str[INET_ADDRSTRLEN];
-	char grp_retr_mmss[10];
-	struct listnode    *src_node;
-	struct igmp_source *src;
-	int grp_retr_sources = 0;
-
-	pim_inet4_dump("<group?>", grp->group_addr, group_str, sizeof(group_str));
-	pim_time_timer_to_mmss(grp_retr_mmss, sizeof(grp_retr_mmss), grp->t_group_query_retransmit_timer);
-
-
-	/* count group sources with retransmission state */
-	for (ALL_LIST_ELEMENTS_RO(grp->group_source_list, src_node, src)) {
-	  if (src->source_query_retransmit_count > 0) {
-	    ++grp_retr_sources;
-	  }
-	}
-
-	vty_out (vty, "%-9s %-15s %-15s %-8s %7d %7d\n",
-		ifp->name,
-		ifaddr_str,
-		group_str,
-		grp_retr_mmss,
-		grp->group_specific_query_retransmit_count,
-		grp_retr_sources);
-
-      } /* scan igmp groups */
-    } /* scan igmp sockets */
-  } /* scan interfaces */
+	struct listnode *ifnode;
+	struct interface *ifp;
+
+	vty_out(vty,
+		"Interface Address         Group           RetTimer Counter RetSrcs\n");
+
+	/* scan interfaces */
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), ifnode, ifp)) {
+		struct pim_interface *pim_ifp = ifp->info;
+		struct listnode *sock_node;
+		struct igmp_sock *igmp;
+
+		if (!pim_ifp)
+			continue;
+
+		/* scan igmp sockets */
+		for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node,
+					  igmp)) {
+			char ifaddr_str[INET_ADDRSTRLEN];
+			struct listnode *grpnode;
+			struct igmp_group *grp;
+
+			pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str,
+				       sizeof(ifaddr_str));
+
+			/* scan igmp groups */
+			for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list,
+						  grpnode, grp)) {
+				char group_str[INET_ADDRSTRLEN];
+				char grp_retr_mmss[10];
+				struct listnode *src_node;
+				struct igmp_source *src;
+				int grp_retr_sources = 0;
+
+				pim_inet4_dump("<group?>", grp->group_addr,
+					       group_str, sizeof(group_str));
+				pim_time_timer_to_mmss(
+					grp_retr_mmss, sizeof(grp_retr_mmss),
+					grp->t_group_query_retransmit_timer);
+
+
+				/* count group sources with retransmission state
+				 */
+				for (ALL_LIST_ELEMENTS_RO(
+					     grp->group_source_list, src_node,
+					     src)) {
+					if (src->source_query_retransmit_count
+					    > 0) {
+						++grp_retr_sources;
+					}
+				}
+
+				vty_out(vty, "%-9s %-15s %-15s %-8s %7d %7d\n",
+					ifp->name, ifaddr_str, group_str,
+					grp_retr_mmss,
+					grp->group_specific_query_retransmit_count,
+					grp_retr_sources);
+
+			} /* scan igmp groups */
+		}	 /* scan igmp sockets */
+	}		  /* scan interfaces */
 }
 
 static void igmp_show_sources(struct vty *vty)
 {
-  struct listnode  *ifnode;
-  struct interface *ifp;
-  time_t            now;
-
-  now = pim_time_monotonic_sec();
-
-  vty_out (vty,
-            "Interface Address         Group           Source          Timer Fwd Uptime  \n");
-
-  /* scan interfaces */
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), ifnode, ifp)) {
-    struct pim_interface *pim_ifp = ifp->info;
-    struct listnode  *sock_node;
-    struct igmp_sock *igmp;
-    
-    if (!pim_ifp)
-      continue;
-    
-    /* scan igmp sockets */
-    for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
-      char ifaddr_str[INET_ADDRSTRLEN];
-      struct listnode   *grpnode;
-      struct igmp_group *grp;
-
-      pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str, sizeof(ifaddr_str));
-
-      /* scan igmp groups */
-      for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list, grpnode, grp)) {
-	char group_str[INET_ADDRSTRLEN];
-	struct listnode    *srcnode;
-	struct igmp_source *src;
-
-	pim_inet4_dump("<group?>", grp->group_addr, group_str, sizeof(group_str));
-	
-	/* scan group sources */
-	for (ALL_LIST_ELEMENTS_RO(grp->group_source_list, srcnode, src)) {
-	  char source_str[INET_ADDRSTRLEN];
-	  char mmss[10];
-	  char uptime[10];
-
-	  pim_inet4_dump("<source?>", src->source_addr, source_str, sizeof(source_str));
-
-	  pim_time_timer_to_mmss(mmss, sizeof(mmss), src->t_source_timer);
-
-	  pim_time_uptime(uptime, sizeof(uptime), now - src->source_creation);
-
-	  vty_out (vty, "%-9s %-15s %-15s %-15s %5s %3s %8s\n",
-		  ifp->name,
-		  ifaddr_str,
-		  group_str,
-		  source_str,
-		  mmss,
-		  IGMP_SOURCE_TEST_FORWARDING(src->source_flags) ? "Y" : "N",
-		  uptime);
-	  
-	} /* scan group sources */
-      } /* scan igmp groups */
-    } /* scan igmp sockets */
-  } /* scan interfaces */
+	struct listnode *ifnode;
+	struct interface *ifp;
+	time_t now;
+
+	now = pim_time_monotonic_sec();
+
+	vty_out(vty,
+		"Interface Address         Group           Source          Timer Fwd Uptime  \n");
+
+	/* scan interfaces */
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), ifnode, ifp)) {
+		struct pim_interface *pim_ifp = ifp->info;
+		struct listnode *sock_node;
+		struct igmp_sock *igmp;
+
+		if (!pim_ifp)
+			continue;
+
+		/* scan igmp sockets */
+		for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node,
+					  igmp)) {
+			char ifaddr_str[INET_ADDRSTRLEN];
+			struct listnode *grpnode;
+			struct igmp_group *grp;
+
+			pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str,
+				       sizeof(ifaddr_str));
+
+			/* scan igmp groups */
+			for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list,
+						  grpnode, grp)) {
+				char group_str[INET_ADDRSTRLEN];
+				struct listnode *srcnode;
+				struct igmp_source *src;
+
+				pim_inet4_dump("<group?>", grp->group_addr,
+					       group_str, sizeof(group_str));
+
+				/* scan group sources */
+				for (ALL_LIST_ELEMENTS_RO(
+					     grp->group_source_list, srcnode,
+					     src)) {
+					char source_str[INET_ADDRSTRLEN];
+					char mmss[10];
+					char uptime[10];
+
+					pim_inet4_dump(
+						"<source?>", src->source_addr,
+						source_str, sizeof(source_str));
+
+					pim_time_timer_to_mmss(
+						mmss, sizeof(mmss),
+						src->t_source_timer);
+
+					pim_time_uptime(
+						uptime, sizeof(uptime),
+						now - src->source_creation);
+
+					vty_out(vty,
+						"%-9s %-15s %-15s %-15s %5s %3s %8s\n",
+						ifp->name, ifaddr_str,
+						group_str, source_str, mmss,
+						IGMP_SOURCE_TEST_FORWARDING(
+							src->source_flags)
+							? "Y"
+							: "N",
+						uptime);
+
+				} /* scan group sources */
+			}	 /* scan igmp groups */
+		}		  /* scan igmp sockets */
+	}			  /* scan interfaces */
 }
 
 static void igmp_show_source_retransmission(struct vty *vty)
 {
-  struct listnode  *ifnode;
-  struct interface *ifp;
-
-  vty_out (vty,
-            "Interface Address         Group           Source          Counter\n");
-
-  /* scan interfaces */
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), ifnode, ifp)) {
-    struct pim_interface *pim_ifp = ifp->info;
-    struct listnode  *sock_node;
-    struct igmp_sock *igmp;
-    
-    if (!pim_ifp)
-      continue;
-    
-    /* scan igmp sockets */
-    for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
-      char ifaddr_str[INET_ADDRSTRLEN];
-      struct listnode   *grpnode;
-      struct igmp_group *grp;
-
-      pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str, sizeof(ifaddr_str));
-
-      /* scan igmp groups */
-      for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list, grpnode, grp)) {
-	char group_str[INET_ADDRSTRLEN];
-	struct listnode    *srcnode;
-	struct igmp_source *src;
-
-	pim_inet4_dump("<group?>", grp->group_addr, group_str, sizeof(group_str));
-	
-	/* scan group sources */
-	for (ALL_LIST_ELEMENTS_RO(grp->group_source_list, srcnode, src)) {
-	  char source_str[INET_ADDRSTRLEN];
-
-	  pim_inet4_dump("<source?>", src->source_addr, source_str, sizeof(source_str));
-
-	  vty_out (vty, "%-9s %-15s %-15s %-15s %7d\n",
-		  ifp->name,
-		  ifaddr_str,
-		  group_str,
-		  source_str,
-		  src->source_query_retransmit_count);
-	  
-	} /* scan group sources */
-      } /* scan igmp groups */
-    } /* scan igmp sockets */
-  } /* scan interfaces */
+	struct listnode *ifnode;
+	struct interface *ifp;
+
+	vty_out(vty,
+		"Interface Address         Group           Source          Counter\n");
+
+	/* scan interfaces */
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), ifnode, ifp)) {
+		struct pim_interface *pim_ifp = ifp->info;
+		struct listnode *sock_node;
+		struct igmp_sock *igmp;
+
+		if (!pim_ifp)
+			continue;
+
+		/* scan igmp sockets */
+		for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node,
+					  igmp)) {
+			char ifaddr_str[INET_ADDRSTRLEN];
+			struct listnode *grpnode;
+			struct igmp_group *grp;
+
+			pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str,
+				       sizeof(ifaddr_str));
+
+			/* scan igmp groups */
+			for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list,
+						  grpnode, grp)) {
+				char group_str[INET_ADDRSTRLEN];
+				struct listnode *srcnode;
+				struct igmp_source *src;
+
+				pim_inet4_dump("<group?>", grp->group_addr,
+					       group_str, sizeof(group_str));
+
+				/* scan group sources */
+				for (ALL_LIST_ELEMENTS_RO(
+					     grp->group_source_list, srcnode,
+					     src)) {
+					char source_str[INET_ADDRSTRLEN];
+
+					pim_inet4_dump(
+						"<source?>", src->source_addr,
+						source_str, sizeof(source_str));
+
+					vty_out(vty,
+						"%-9s %-15s %-15s %-15s %7d\n",
+						ifp->name, ifaddr_str,
+						group_str, source_str,
+						src->source_query_retransmit_count);
+
+				} /* scan group sources */
+			}	 /* scan igmp groups */
+		}		  /* scan igmp sockets */
+	}			  /* scan interfaces */
 }
 
 static void clear_igmp_interfaces()
 {
-  struct listnode  *ifnode;
-  struct listnode  *ifnextnode;
-  struct interface *ifp;
+	struct listnode *ifnode;
+	struct listnode *ifnextnode;
+	struct interface *ifp;
 
-  for (ALL_LIST_ELEMENTS (vrf_iflist (VRF_DEFAULT), ifnode, ifnextnode, ifp)) {
-    pim_if_addr_del_all_igmp(ifp);
-  }
+	for (ALL_LIST_ELEMENTS(vrf_iflist(VRF_DEFAULT), ifnode, ifnextnode,
+			       ifp)) {
+		pim_if_addr_del_all_igmp(ifp);
+	}
 
-  for (ALL_LIST_ELEMENTS (vrf_iflist (VRF_DEFAULT), ifnode, ifnextnode, ifp)) {
-    pim_if_addr_add_all(ifp);
-  }
+	for (ALL_LIST_ELEMENTS(vrf_iflist(VRF_DEFAULT), ifnode, ifnextnode,
+			       ifp)) {
+		pim_if_addr_add_all(ifp);
+	}
 }
 
 static void clear_pim_interfaces()
 {
-  struct listnode  *ifnode;
-  struct listnode  *ifnextnode;
-  struct interface *ifp;
+	struct listnode *ifnode;
+	struct listnode *ifnextnode;
+	struct interface *ifp;
 
-  for (ALL_LIST_ELEMENTS (vrf_iflist (VRF_DEFAULT), ifnode, ifnextnode, ifp)) {
-    if (ifp->info) {
-      pim_neighbor_delete_all(ifp, "interface cleared");
-    }
-  }
+	for (ALL_LIST_ELEMENTS(vrf_iflist(VRF_DEFAULT), ifnode, ifnextnode,
+			       ifp)) {
+		if (ifp->info) {
+			pim_neighbor_delete_all(ifp, "interface cleared");
+		}
+	}
 }
 
 static void clear_interfaces()
 {
-  clear_igmp_interfaces();
-  clear_pim_interfaces();
+	clear_igmp_interfaces();
+	clear_pim_interfaces();
 }
 
 DEFUN (clear_ip_interfaces,
@@ -2600,9 +3052,9 @@ DEFUN (clear_ip_interfaces,
        IP_STR
        "Reset interfaces\n")
 {
-  clear_interfaces();
+	clear_interfaces();
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (clear_ip_igmp_interfaces,
@@ -2613,47 +3065,51 @@ DEFUN (clear_ip_igmp_interfaces,
        CLEAR_IP_IGMP_STR
        "Reset IGMP interfaces\n")
 {
-  clear_igmp_interfaces();
+	clear_igmp_interfaces();
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 static void mroute_add_all()
 {
-  struct listnode    *node;
-  struct channel_oil *c_oil;
-
-  for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
-    if (pim_mroute_add(c_oil, __PRETTY_FUNCTION__)) {
-      /* just log warning */
-      char source_str[INET_ADDRSTRLEN];
-      char group_str[INET_ADDRSTRLEN];
-      pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, source_str, sizeof(source_str));
-      pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp, group_str, sizeof(group_str));
-      zlog_warn("%s %s: (S,G)=(%s,%s) failure writing MFC",
-                __FILE__, __PRETTY_FUNCTION__,
-                source_str, group_str);
-    }
-  }
+	struct listnode *node;
+	struct channel_oil *c_oil;
+
+	for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
+		if (pim_mroute_add(c_oil, __PRETTY_FUNCTION__)) {
+			/* just log warning */
+			char source_str[INET_ADDRSTRLEN];
+			char group_str[INET_ADDRSTRLEN];
+			pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin,
+				       source_str, sizeof(source_str));
+			pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp,
+				       group_str, sizeof(group_str));
+			zlog_warn("%s %s: (S,G)=(%s,%s) failure writing MFC",
+				  __FILE__, __PRETTY_FUNCTION__, source_str,
+				  group_str);
+		}
+	}
 }
 
 static void mroute_del_all()
 {
-  struct listnode    *node;
-  struct channel_oil *c_oil;
-
-  for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
-    if (pim_mroute_del(c_oil, __PRETTY_FUNCTION__)) {
-      /* just log warning */
-      char source_str[INET_ADDRSTRLEN];
-      char group_str[INET_ADDRSTRLEN];
-      pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, source_str, sizeof(source_str));
-      pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp, group_str, sizeof(group_str));
-      zlog_warn("%s %s: (S,G)=(%s,%s) failure clearing MFC",
-                __FILE__, __PRETTY_FUNCTION__,
-                source_str, group_str);
-    }
-  }
+	struct listnode *node;
+	struct channel_oil *c_oil;
+
+	for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
+		if (pim_mroute_del(c_oil, __PRETTY_FUNCTION__)) {
+			/* just log warning */
+			char source_str[INET_ADDRSTRLEN];
+			char group_str[INET_ADDRSTRLEN];
+			pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin,
+				       source_str, sizeof(source_str));
+			pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp,
+				       group_str, sizeof(group_str));
+			zlog_warn("%s %s: (S,G)=(%s,%s) failure clearing MFC",
+				  __FILE__, __PRETTY_FUNCTION__, source_str,
+				  group_str);
+		}
+	}
 }
 
 DEFUN (clear_ip_mroute,
@@ -2663,10 +3119,10 @@ DEFUN (clear_ip_mroute,
        IP_STR
        "Reset multicast routes\n")
 {
-  mroute_del_all();
-  mroute_add_all();
+	mroute_del_all();
+	mroute_add_all();
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (clear_ip_pim_interfaces,
@@ -2677,9 +3133,9 @@ DEFUN (clear_ip_pim_interfaces,
        CLEAR_IP_PIM_STR
        "Reset PIM interfaces\n")
 {
-  clear_pim_interfaces();
+	clear_pim_interfaces();
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (clear_ip_pim_interface_traffic,
@@ -2691,34 +3147,33 @@ DEFUN (clear_ip_pim_interface_traffic,
        "Reset PIM interfaces\n"
        "Reset Protocol Packet counters\n")
 {
-  struct listnode  *ifnode = NULL;
-  struct listnode  *ifnextnode = NULL;
-  struct interface *ifp = NULL;
-  struct pim_interface *pim_ifp = NULL;
-
-  for (ALL_LIST_ELEMENTS (vrf_iflist (VRF_DEFAULT), ifnode, ifnextnode, ifp))
-    {
-      pim_ifp = ifp->info;
-
-      if (!pim_ifp)
-        continue;
-
-      pim_ifp->pim_ifstat_hello_recv = 0;
-      pim_ifp->pim_ifstat_hello_sent = 0;
-      pim_ifp->pim_ifstat_join_recv = 0;
-      pim_ifp->pim_ifstat_join_send = 0;
-      pim_ifp->pim_ifstat_prune_recv = 0;
-      pim_ifp->pim_ifstat_prune_send = 0;
-      pim_ifp->pim_ifstat_reg_recv = 0;
-      pim_ifp->pim_ifstat_reg_send = 0;
-      pim_ifp->pim_ifstat_reg_stop_recv = 0;
-      pim_ifp->pim_ifstat_reg_stop_send = 0;
-      pim_ifp->pim_ifstat_assert_recv = 0;
-      pim_ifp->pim_ifstat_assert_send = 0;
-
-    }
+	struct listnode *ifnode = NULL;
+	struct listnode *ifnextnode = NULL;
+	struct interface *ifp = NULL;
+	struct pim_interface *pim_ifp = NULL;
+
+	for (ALL_LIST_ELEMENTS(vrf_iflist(VRF_DEFAULT), ifnode, ifnextnode,
+			       ifp)) {
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		pim_ifp->pim_ifstat_hello_recv = 0;
+		pim_ifp->pim_ifstat_hello_sent = 0;
+		pim_ifp->pim_ifstat_join_recv = 0;
+		pim_ifp->pim_ifstat_join_send = 0;
+		pim_ifp->pim_ifstat_prune_recv = 0;
+		pim_ifp->pim_ifstat_prune_send = 0;
+		pim_ifp->pim_ifstat_reg_recv = 0;
+		pim_ifp->pim_ifstat_reg_send = 0;
+		pim_ifp->pim_ifstat_reg_stop_recv = 0;
+		pim_ifp->pim_ifstat_reg_stop_send = 0;
+		pim_ifp->pim_ifstat_assert_recv = 0;
+		pim_ifp->pim_ifstat_assert_send = 0;
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (clear_ip_pim_oil,
@@ -2729,9 +3184,9 @@ DEFUN (clear_ip_pim_oil,
        CLEAR_IP_PIM_STR
        "Rescan PIM OIL (output interface list)\n")
 {
-  pim_scan_oil();
+	pim_scan_oil();
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_igmp_interface,
@@ -2745,16 +3200,16 @@ DEFUN (show_ip_igmp_interface,
        "interface name\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  int idx = 0;
+	u_char uj = use_json(argc, argv);
+	int idx = 0;
 
-  if (argv_find(argv, argc, "detail", &idx) ||
-      argv_find(argv, argc, "WORD", &idx))
-    igmp_show_interfaces_single(vty, argv[idx]->arg, uj);
-  else
-    igmp_show_interfaces(vty, uj);
+	if (argv_find(argv, argc, "detail", &idx)
+	    || argv_find(argv, argc, "WORD", &idx))
+		igmp_show_interfaces_single(vty, argv[idx]->arg, uj);
+	else
+		igmp_show_interfaces(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_igmp_join,
@@ -2765,9 +3220,9 @@ DEFUN (show_ip_igmp_join,
        IGMP_STR
        "IGMP static join information\n")
 {
-  igmp_show_interface_join(vty);
+	igmp_show_interface_join(vty);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_igmp_groups,
@@ -2779,10 +3234,10 @@ DEFUN (show_ip_igmp_groups,
        IGMP_GROUP_STR
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  igmp_show_groups(vty, uj);
+	u_char uj = use_json(argc, argv);
+	igmp_show_groups(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_igmp_groups_retransmissions,
@@ -2794,9 +3249,9 @@ DEFUN (show_ip_igmp_groups_retransmissions,
        IGMP_GROUP_STR
        "IGMP group retransmissions\n")
 {
-  igmp_show_group_retransmission(vty);
+	igmp_show_group_retransmission(vty);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_igmp_sources,
@@ -2807,9 +3262,9 @@ DEFUN (show_ip_igmp_sources,
        IGMP_STR
        IGMP_SOURCE_STR)
 {
-  igmp_show_sources(vty);
+	igmp_show_sources(vty);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_igmp_sources_retransmissions,
@@ -2821,9 +3276,9 @@ DEFUN (show_ip_igmp_sources_retransmissions,
        IGMP_SOURCE_STR
        "IGMP source retransmissions\n")
 {
-  igmp_show_source_retransmission(vty);
+	igmp_show_source_retransmission(vty);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_assert,
@@ -2834,9 +3289,9 @@ DEFUN (show_ip_pim_assert,
        PIM_STR
        "PIM interface assert\n")
 {
-  pim_show_assert(vty);
+	pim_show_assert(vty);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_assert_internal,
@@ -2847,9 +3302,9 @@ DEFUN (show_ip_pim_assert_internal,
        PIM_STR
        "PIM interface internal assert state\n")
 {
-  pim_show_assert_internal(vty);
+	pim_show_assert_internal(vty);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_assert_metric,
@@ -2860,9 +3315,9 @@ DEFUN (show_ip_pim_assert_metric,
        PIM_STR
        "PIM interface assert metric\n")
 {
-  pim_show_assert_metric(vty);
+	pim_show_assert_metric(vty);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_assert_winner_metric,
@@ -2873,9 +3328,9 @@ DEFUN (show_ip_pim_assert_winner_metric,
        PIM_STR
        "PIM interface assert winner metric\n")
 {
-  pim_show_assert_winner_metric(vty);
+	pim_show_assert_winner_metric(vty);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_interface,
@@ -2889,17 +3344,17 @@ DEFUN (show_ip_pim_interface,
        "interface name\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  int idx = 0;
+	u_char uj = use_json(argc, argv);
+	int idx = 0;
 
-  if (argv_find(argv, argc, "WORD", &idx) ||
-      argv_find(argv, argc, "detail", &idx))
-    pim_show_interfaces_single(vty, argv[idx]->arg, uj);
+	if (argv_find(argv, argc, "WORD", &idx)
+	    || argv_find(argv, argc, "detail", &idx))
+		pim_show_interfaces_single(vty, argv[idx]->arg, uj);
 
-  else
-    pim_show_interfaces(vty, uj);
+	else
+		pim_show_interfaces(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_join,
@@ -2911,10 +3366,10 @@ DEFUN (show_ip_pim_join,
        "PIM interface join information\n"
        JSON_STR)
 {
-  u_char uj = use_json(argc, argv);
-  pim_show_join(vty, uj);
+	u_char uj = use_json(argc, argv);
+	pim_show_join(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_local_membership,
@@ -2926,10 +3381,10 @@ DEFUN (show_ip_pim_local_membership,
        "PIM interface local-membership\n"
        JSON_STR)
 {
-  u_char uj = use_json(argc, argv);
-  pim_show_membership(vty, uj);
+	u_char uj = use_json(argc, argv);
+	pim_show_membership(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_neighbor,
@@ -2943,16 +3398,16 @@ DEFUN (show_ip_pim_neighbor,
        "Name of interface or neighbor\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  int idx = 0;
+	u_char uj = use_json(argc, argv);
+	int idx = 0;
 
-  if (argv_find(argv, argc, "detail", &idx) ||
-      argv_find(argv, argc, "WORD", &idx))
-    pim_show_neighbors_single(vty, argv[idx]->arg, uj);
-  else
-    pim_show_neighbors(vty, uj);
+	if (argv_find(argv, argc, "detail", &idx)
+	    || argv_find(argv, argc, "WORD", &idx))
+		pim_show_neighbors_single(vty, argv[idx]->arg, uj);
+	else
+		pim_show_neighbors(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_secondary,
@@ -2963,9 +3418,9 @@ DEFUN (show_ip_pim_secondary,
        PIM_STR
        "PIM neighbor addresses\n")
 {
-  pim_show_neighbors_secondary(vty);
+	pim_show_neighbors_secondary(vty);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_state,
@@ -2979,23 +3434,21 @@ DEFUN (show_ip_pim_state,
        "Multicast address\n"
        "JavaScript Object Notation\n")
 {
-  const char *src_or_group = NULL;
-  const char *group = NULL;
-  u_char uj = use_json(argc, argv);
-  if (uj)
-    argc--;
+	const char *src_or_group = NULL;
+	const char *group = NULL;
+	u_char uj = use_json(argc, argv);
+	if (uj)
+		argc--;
 
-  if (argc == 6)
-    {
-      src_or_group = argv[4]->arg;
-      group = argv[5]->arg;
-    }
-  else if (argc == 5)
-    src_or_group = argv[4]->arg;
+	if (argc == 6) {
+		src_or_group = argv[4]->arg;
+		group = argv[5]->arg;
+	} else if (argc == 5)
+		src_or_group = argv[4]->arg;
 
-  pim_show_state(vty, src_or_group, group, uj);
+	pim_show_state(vty, src_or_group, group, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_upstream,
@@ -3007,10 +3460,10 @@ DEFUN (show_ip_pim_upstream,
        "PIM upstream information\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  pim_show_upstream(vty, uj);
+	u_char uj = use_json(argc, argv);
+	pim_show_upstream(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_upstream_join_desired,
@@ -3022,10 +3475,10 @@ DEFUN (show_ip_pim_upstream_join_desired,
        "PIM upstream join-desired\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  pim_show_join_desired(vty, uj);
+	u_char uj = use_json(argc, argv);
+	pim_show_join_desired(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_upstream_rpf,
@@ -3037,10 +3490,10 @@ DEFUN (show_ip_pim_upstream_rpf,
        "PIM upstream source rpf\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  pim_show_upstream_rpf(vty, uj);
+	u_char uj = use_json(argc, argv);
+	pim_show_upstream_rpf(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_rp,
@@ -3052,10 +3505,10 @@ DEFUN (show_ip_pim_rp,
        "PIM RP information\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  pim_rp_show_information (vty, uj);
+	u_char uj = use_json(argc, argv);
+	pim_rp_show_information(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_rpf,
@@ -3067,10 +3520,10 @@ DEFUN (show_ip_pim_rpf,
        "PIM cached source rpf information\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  pim_show_rpf(vty, uj);
+	u_char uj = use_json(argc, argv);
+	pim_show_rpf(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_nexthop,
@@ -3081,9 +3534,9 @@ DEFUN (show_ip_pim_nexthop,
        PIM_STR
        "PIM cached nexthop rpf information\n")
 {
-  pim_show_nexthop (vty);
+	pim_show_nexthop(vty);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_nexthop_lookup,
@@ -3096,75 +3549,70 @@ DEFUN (show_ip_pim_nexthop_lookup,
        "Source/RP address\n"
        "Multicast Group address\n")
 {
-  struct pim_nexthop_cache pnc;
-  struct prefix nht_p;
-  int result = 0;
-  struct in_addr src_addr, grp_addr;
-  struct in_addr vif_source;
-  const char *addr_str, *addr_str1;
-  struct prefix grp;
-  struct pim_nexthop nexthop;
-  char nexthop_addr_str[PREFIX_STRLEN];
-  char grp_str[PREFIX_STRLEN];
-
-  addr_str = argv[4]->arg;
-  result = inet_pton (AF_INET, addr_str, &src_addr);
-  if (result <= 0)
-    {
-      vty_out (vty, "Bad unicast address %s: errno=%d: %s\n",
-               addr_str, errno, safe_strerror(errno));
-      return CMD_WARNING;
-    }
-
-  if (pim_is_group_224_4 (src_addr))
-    {
-      vty_out (vty, "Invalid argument. Expected Valid Source Address.\n");
-      return CMD_WARNING;
-    }
-
-  addr_str1 = argv[5]->arg;
-  result = inet_pton (AF_INET, addr_str1, &grp_addr);
-  if (result <= 0)
-    {
-      vty_out (vty, "Bad unicast address %s: errno=%d: %s\n",
-               addr_str, errno, safe_strerror(errno));
-      return CMD_WARNING;
-    }
-
-  if (!pim_is_group_224_4 (grp_addr))
-    {
-      vty_out (vty,
-                 "Invalid argument. Expected Valid Multicast Group Address.\n");
-      return CMD_WARNING;
-    }
-
-  if (!pim_rp_set_upstream_addr (&vif_source, src_addr, grp_addr))
-    return CMD_SUCCESS;
-
-  memset (&pnc, 0, sizeof (struct pim_nexthop_cache));
-  nht_p.family = AF_INET;
-  nht_p.prefixlen = IPV4_MAX_BITLEN;
-  nht_p.u.prefix4 = vif_source;
-  grp.family = AF_INET;
-  grp.prefixlen = IPV4_MAX_BITLEN;
-  grp.u.prefix4 = grp_addr;
-  memset (&nexthop, 0, sizeof (nexthop));
-
-  if ((pim_find_or_track_nexthop (&nht_p, NULL, NULL, &pnc)) == 1)
-    {
-      //Compute PIM RPF using Cached nexthop
-      pim_ecmp_nexthop_search (&pnc, &nexthop, &nht_p, &grp, 0);
-    }
-  else
-    pim_ecmp_nexthop_lookup (&nexthop, vif_source, &nht_p, &grp, 0);
-
-  pim_addr_dump ("<grp?>", &grp, grp_str, sizeof (grp_str));
-  pim_addr_dump ("<nexthop?>", &nexthop.mrib_nexthop_addr,
-                 nexthop_addr_str, sizeof (nexthop_addr_str));
-  vty_out (vty, "Group %s --- Nexthop %s Interface %s \n", grp_str,
-           nexthop_addr_str, nexthop.interface->name);
-
-  return CMD_SUCCESS;
+	struct pim_nexthop_cache pnc;
+	struct prefix nht_p;
+	int result = 0;
+	struct in_addr src_addr, grp_addr;
+	struct in_addr vif_source;
+	const char *addr_str, *addr_str1;
+	struct prefix grp;
+	struct pim_nexthop nexthop;
+	char nexthop_addr_str[PREFIX_STRLEN];
+	char grp_str[PREFIX_STRLEN];
+
+	addr_str = argv[4]->arg;
+	result = inet_pton(AF_INET, addr_str, &src_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad unicast address %s: errno=%d: %s\n", addr_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING;
+	}
+
+	if (pim_is_group_224_4(src_addr)) {
+		vty_out(vty,
+			"Invalid argument. Expected Valid Source Address.\n");
+		return CMD_WARNING;
+	}
+
+	addr_str1 = argv[5]->arg;
+	result = inet_pton(AF_INET, addr_str1, &grp_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad unicast address %s: errno=%d: %s\n", addr_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING;
+	}
+
+	if (!pim_is_group_224_4(grp_addr)) {
+		vty_out(vty,
+			"Invalid argument. Expected Valid Multicast Group Address.\n");
+		return CMD_WARNING;
+	}
+
+	if (!pim_rp_set_upstream_addr(&vif_source, src_addr, grp_addr))
+		return CMD_SUCCESS;
+
+	memset(&pnc, 0, sizeof(struct pim_nexthop_cache));
+	nht_p.family = AF_INET;
+	nht_p.prefixlen = IPV4_MAX_BITLEN;
+	nht_p.u.prefix4 = vif_source;
+	grp.family = AF_INET;
+	grp.prefixlen = IPV4_MAX_BITLEN;
+	grp.u.prefix4 = grp_addr;
+	memset(&nexthop, 0, sizeof(nexthop));
+
+	if ((pim_find_or_track_nexthop(&nht_p, NULL, NULL, &pnc)) == 1) {
+		// Compute PIM RPF using Cached nexthop
+		pim_ecmp_nexthop_search(&pnc, &nexthop, &nht_p, &grp, 0);
+	} else
+		pim_ecmp_nexthop_lookup(&nexthop, vif_source, &nht_p, &grp, 0);
+
+	pim_addr_dump("<grp?>", &grp, grp_str, sizeof(grp_str));
+	pim_addr_dump("<nexthop?>", &nexthop.mrib_nexthop_addr,
+		      nexthop_addr_str, sizeof(nexthop_addr_str));
+	vty_out(vty, "Group %s --- Nexthop %s Interface %s \n", grp_str,
+		nexthop_addr_str, nexthop.interface->name);
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_pim_interface_traffic,
@@ -3178,61 +3626,56 @@ DEFUN (show_ip_pim_interface_traffic,
        "Interface name\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json (argc, argv);
-  int idx = 0;
+	u_char uj = use_json(argc, argv);
+	int idx = 0;
 
-  if (argv_find(argv, argc, "WORD", &idx))
-    pim_show_interface_traffic_single (vty, argv[idx]->arg, uj);
-  else
-    pim_show_interface_traffic (vty, uj);
+	if (argv_find(argv, argc, "WORD", &idx))
+		pim_show_interface_traffic_single(vty, argv[idx]->arg, uj);
+	else
+		pim_show_interface_traffic(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 static void show_multicast_interfaces(struct vty *vty)
 {
-  struct listnode  *node;
-  struct interface *ifp;
-
-  vty_out (vty, "\n");
-  
-  vty_out (vty,
-            "Interface Address         ifi Vif  PktsIn PktsOut    BytesIn   BytesOut\n");
-
-  for (ALL_LIST_ELEMENTS_RO (vrf_iflist (VRF_DEFAULT), node, ifp)) {
-    struct pim_interface *pim_ifp;
-    struct in_addr ifaddr;
-    struct sioc_vif_req vreq;
-
-    pim_ifp = ifp->info;
-    
-    if (!pim_ifp)
-      continue;
-
-    memset(&vreq, 0, sizeof(vreq));
-    vreq.vifi = pim_ifp->mroute_vif_index;
-
-    if (ioctl(qpim_mroute_socket_fd, SIOCGETVIFCNT, &vreq)) {
-      zlog_warn("ioctl(SIOCGETVIFCNT=%lu) failure for interface %s vif_index=%d: errno=%d: %s\n",
-		(unsigned long)SIOCGETVIFCNT,
-		ifp->name,
-		pim_ifp->mroute_vif_index,
-		errno,
-		safe_strerror(errno));
-    }
-
-    ifaddr = pim_ifp->primary_address;
-
-    vty_out (vty, "%-9s %-15s %3d %3d %7lu %7lu %10lu %10lu\n",
-	    ifp->name,
-	    inet_ntoa(ifaddr),
-	    ifp->ifindex,
-	    pim_ifp->mroute_vif_index,
-	    (unsigned long) vreq.icount,
-	    (unsigned long) vreq.ocount,
-	    (unsigned long) vreq.ibytes,
-	    (unsigned long)vreq.obytes);
-  }
+	struct listnode *node;
+	struct interface *ifp;
+
+	vty_out(vty, "\n");
+
+	vty_out(vty,
+		"Interface Address         ifi Vif  PktsIn PktsOut    BytesIn   BytesOut\n");
+
+	for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp)) {
+		struct pim_interface *pim_ifp;
+		struct in_addr ifaddr;
+		struct sioc_vif_req vreq;
+
+		pim_ifp = ifp->info;
+
+		if (!pim_ifp)
+			continue;
+
+		memset(&vreq, 0, sizeof(vreq));
+		vreq.vifi = pim_ifp->mroute_vif_index;
+
+		if (ioctl(qpim_mroute_socket_fd, SIOCGETVIFCNT, &vreq)) {
+			zlog_warn(
+				"ioctl(SIOCGETVIFCNT=%lu) failure for interface %s vif_index=%d: errno=%d: %s\n",
+				(unsigned long)SIOCGETVIFCNT, ifp->name,
+				pim_ifp->mroute_vif_index, errno,
+				safe_strerror(errno));
+		}
+
+		ifaddr = pim_ifp->primary_address;
+
+		vty_out(vty, "%-9s %-15s %3d %3d %7lu %7lu %10lu %10lu\n",
+			ifp->name, inet_ntoa(ifaddr), ifp->ifindex,
+			pim_ifp->mroute_vif_index, (unsigned long)vreq.icount,
+			(unsigned long)vreq.ocount, (unsigned long)vreq.ibytes,
+			(unsigned long)vreq.obytes);
+	}
 }
 
 DEFUN (show_ip_multicast,
@@ -3242,327 +3685,364 @@ DEFUN (show_ip_multicast,
        IP_STR
        "Multicast global information\n")
 {
-  time_t now = pim_time_monotonic_sec();
+	time_t now = pim_time_monotonic_sec();
 
-  char uptime[10];
+	char uptime[10];
+
+	vty_out(vty, "Mroute socket descriptor: %d\n", qpim_mroute_socket_fd);
 
-  vty_out (vty, "Mroute socket descriptor: %d\n",
-          qpim_mroute_socket_fd);
+	pim_time_uptime(uptime, sizeof(uptime),
+			now - qpim_mroute_socket_creation);
+	vty_out(vty, "Mroute socket uptime: %s\n", uptime);
 
-  pim_time_uptime(uptime, sizeof(uptime), now - qpim_mroute_socket_creation);
-  vty_out (vty, "Mroute socket uptime: %s\n",
-          uptime);
+	vty_out(vty, "\n");
 
-  vty_out (vty, "\n");
+	pim_zebra_zclient_update(vty);
+	pim_zlookup_show_ip_multicast(vty);
 
-  pim_zebra_zclient_update (vty);
-  pim_zlookup_show_ip_multicast (vty);
+	vty_out(vty, "\n");
+	vty_out(vty, "Maximum highest VifIndex: %d\n", PIM_MAX_USABLE_VIFS);
 
-  vty_out (vty, "\n");
-  vty_out (vty, "Maximum highest VifIndex: %d\n",
-	  PIM_MAX_USABLE_VIFS);
+	vty_out(vty, "\n");
+	vty_out(vty, "Upstream Join Timer: %d secs\n", qpim_t_periodic);
+	vty_out(vty, "Join/Prune Holdtime: %d secs\n", PIM_JP_HOLDTIME);
+	vty_out(vty, "PIM ECMP: %s\n", qpim_ecmp_enable ? "Enable" : "Disable");
+	vty_out(vty, "PIM ECMP Rebalance: %s\n",
+		qpim_ecmp_rebalance_enable ? "Enable" : "Disable");
 
-  vty_out (vty, "\n");
-  vty_out (vty, "Upstream Join Timer: %d secs\n",
-           qpim_t_periodic);
-  vty_out (vty, "Join/Prune Holdtime: %d secs\n",
-           PIM_JP_HOLDTIME);
-  vty_out (vty, "PIM ECMP: %s\n",
-           qpim_ecmp_enable ? "Enable" : "Disable");
-  vty_out (vty, "PIM ECMP Rebalance: %s\n",
-           qpim_ecmp_rebalance_enable ? "Enable" : "Disable");
+	vty_out(vty, "\n");
 
-  vty_out (vty, "\n");
+	show_rpf_refresh_stats(vty, now, NULL);
 
-  show_rpf_refresh_stats(vty, now, NULL);
+	vty_out(vty, "\n");
 
-  vty_out (vty, "\n");
+	show_scan_oil_stats(vty, now);
 
-  show_scan_oil_stats(vty, now);
+	show_multicast_interfaces(vty);
 
-  show_multicast_interfaces(vty);
-  
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 static void show_mroute(struct vty *vty, u_char uj)
 {
-  struct listnode    *node;
-  struct channel_oil *c_oil;
-  struct static_route *s_route;
-  time_t              now;
-  json_object *json = NULL;
-  json_object *json_group = NULL;
-  json_object *json_source = NULL;
-  json_object *json_oil = NULL;
-  json_object *json_ifp_out = NULL;
-  int found_oif = 0;
-  int first = 1;
-  char grp_str[INET_ADDRSTRLEN];
-  char src_str[INET_ADDRSTRLEN];
-  char in_ifname[INTERFACE_NAMSIZ+1];
-  char out_ifname[INTERFACE_NAMSIZ+1];
-  int oif_vif_index;
-  struct interface *ifp_in;
-  char proto[100];
-
-  if (uj) {
-    json = json_object_new_object();
-  } else {
-    vty_out (vty,
-              "Source          Group           Proto  Input      Output     TTL  Uptime\n");
-  }
-
-  now = pim_time_monotonic_sec();
-
-  /* print list of PIM and IGMP routes */
-  for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
-    found_oif = 0;
-    first = 1;
-    if (!c_oil->installed && !uj)
-      continue;
-
-    pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp, grp_str, sizeof(grp_str));
-    pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, src_str, sizeof(src_str));
-    ifp_in = pim_if_find_by_vif_index(c_oil->oil.mfcc_parent);
-
-    if (ifp_in)
-      strcpy(in_ifname, ifp_in->name);
-    else
-      strcpy(in_ifname, "<iif?>");
-
-    if (uj) {
-
-      /* Find the group, create it if it doesn't exist */
-      json_object_object_get_ex(json, grp_str, &json_group);
-
-      if (!json_group) {
-        json_group = json_object_new_object();
-        json_object_object_add(json, grp_str, json_group);
-      }
-
-      /* Find the source nested under the group, create it if it doesn't exist */
-      json_object_object_get_ex(json_group, src_str, &json_source);
-
-      if (!json_source) {
-        json_source = json_object_new_object();
-        json_object_object_add(json_group, src_str, json_source);
-      }
-
-      /* Find the inbound interface nested under the source, create it if it doesn't exist */
-      json_object_int_add(json_source, "installed", c_oil->installed);
-      json_object_int_add(json_source, "refCount", c_oil->oil_ref_count);
-      json_object_int_add(json_source, "oilSize", c_oil->oil_size);
-      json_object_int_add(json_source, "OilInheritedRescan", c_oil->oil_inherited_rescan);
-      json_object_string_add(json_source, "iif", in_ifname);
-      json_oil = NULL;
-    }
-
-    for (oif_vif_index = 0; oif_vif_index < MAXVIFS; ++oif_vif_index) {
-      struct interface *ifp_out;
-      char oif_uptime[10];
-      int ttl;
-
-      ttl = c_oil->oil.mfcc_ttls[oif_vif_index];
-      if (ttl < 1)
-	continue;
-
-      ifp_out = pim_if_find_by_vif_index(oif_vif_index);
-      pim_time_uptime(oif_uptime, sizeof(oif_uptime), now - c_oil->oif_creation[oif_vif_index]);
-      found_oif = 1;
-
-      if (ifp_out)
-        strcpy(out_ifname, ifp_out->name);
-      else
-        strcpy(out_ifname, "<oif?>");
-
-      if (uj) {
-        json_ifp_out = json_object_new_object();
-        json_object_string_add(json_ifp_out, "source", src_str);
-        json_object_string_add(json_ifp_out, "group", grp_str);
-
-        if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_PIM)
-          json_object_boolean_true_add(json_ifp_out, "protocolPim");
-
-        if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_IGMP)
-          json_object_boolean_true_add(json_ifp_out, "protocolIgmp");
-
-        if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_SOURCE)
-          json_object_boolean_true_add(json_ifp_out, "protocolSource");
-
-        if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_STAR)
-          json_object_boolean_true_add(json_ifp_out, "protocolInherited");
-
-        json_object_string_add(json_ifp_out, "inboundInterface", in_ifname);
-        json_object_int_add(json_ifp_out, "iVifI", c_oil->oil.mfcc_parent);
-        json_object_string_add(json_ifp_out, "outboundInterface", out_ifname);
-        json_object_int_add(json_ifp_out, "oVifI", oif_vif_index);
-        json_object_int_add(json_ifp_out, "ttl", ttl);
-        json_object_string_add(json_ifp_out, "upTime", oif_uptime);
-        if (!json_oil) {
-          json_oil = json_object_new_object();
-          json_object_object_add(json_source, "oil", json_oil);
-        }
-        json_object_object_add(json_oil, out_ifname, json_ifp_out);
-      } else {
-        if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_PIM) {
-          strcpy(proto, "PIM");
-        }
-
-        if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_IGMP) {
-          strcpy(proto, "IGMP");
-        }
-
-        if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_SOURCE) {
-          strcpy(proto, "SRC");
-        }
-
-        if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_STAR) {
-          strcpy(proto, "STAR");
-        }
-
-        vty_out (vty, "%-15s %-15s %-6s %-10s %-10s %-3d  %8s\n",
-                src_str,
-                grp_str,
-                proto,
-                in_ifname,
-                out_ifname,
-                ttl,
-                oif_uptime);
-
-        if (first)
-	  {
-	    src_str[0] = '\0';
-	    grp_str[0] = '\0';
-	    in_ifname[0] = '\0';
-	    first = 0;
-	  }
-      }
-    }
-
-    if (!uj && !found_oif) {
-      vty_out (vty, "%-15s %-15s %-6s %-10s %-10s %-3d  %8s\n",
-              src_str,
-              grp_str,
-              "none",
-              in_ifname,
-              "none",
-              0,
-              "--:--:--");
-    }
-  }
-
-  /* Print list of static routes */
-  for (ALL_LIST_ELEMENTS_RO(qpim_static_route_list, node, s_route)) {
-    first = 1;
-
-    if (!s_route->c_oil.installed)
-      continue;
-
-    pim_inet4_dump("<group?>", s_route->group, grp_str, sizeof(grp_str));
-    pim_inet4_dump("<source?>", s_route->source, src_str, sizeof(src_str));
-    ifp_in  = pim_if_find_by_vif_index(s_route->iif);
-    found_oif = 0;
-
-    if (ifp_in)
-      strcpy(in_ifname, ifp_in->name);
-    else
-      strcpy(in_ifname, "<iif?>");
-
-    if (uj) {
-
-      /* Find the group, create it if it doesn't exist */
-      json_object_object_get_ex(json, grp_str, &json_group);
-
-      if (!json_group) {
-        json_group = json_object_new_object();
-        json_object_object_add(json, grp_str, json_group);
-      }
-
-      /* Find the source nested under the group, create it if it doesn't exist */
-      json_object_object_get_ex(json_group, src_str, &json_source);
-
-      if (!json_source) {
-        json_source = json_object_new_object();
-        json_object_object_add(json_group, src_str, json_source);
-      }
-
-      json_object_string_add(json_source, "iif", in_ifname);
-      json_oil = NULL;
-    } else {
-      strcpy(proto, "STATIC");
-    }
-
-    for (oif_vif_index = 0; oif_vif_index < MAXVIFS; ++oif_vif_index) {
-      struct interface *ifp_out;
-      char oif_uptime[10];
-      int ttl;
-
-      ttl = s_route->oif_ttls[oif_vif_index];
-      if (ttl < 1)
-         continue;
-
-      ifp_out = pim_if_find_by_vif_index(oif_vif_index);
-      pim_time_uptime(oif_uptime, sizeof(oif_uptime), now - s_route->c_oil.oif_creation[oif_vif_index]);
-      found_oif = 1;
-
-      if (ifp_out)
-        strcpy(out_ifname, ifp_out->name);
-      else
-        strcpy(out_ifname, "<oif?>");
-
-      if (uj) {
-        json_ifp_out = json_object_new_object();
-        json_object_string_add(json_ifp_out, "source", src_str);
-        json_object_string_add(json_ifp_out, "group", grp_str);
-        json_object_boolean_true_add(json_ifp_out, "protocolStatic");
-        json_object_string_add(json_ifp_out, "inboundInterface", in_ifname);
-        json_object_int_add(json_ifp_out, "iVifI", s_route->c_oil.oil.mfcc_parent);
-        json_object_string_add(json_ifp_out, "outboundInterface", out_ifname);
-        json_object_int_add(json_ifp_out, "oVifI", oif_vif_index);
-        json_object_int_add(json_ifp_out, "ttl", ttl);
-        json_object_string_add(json_ifp_out, "upTime", oif_uptime);
-        if (!json_oil) {
-          json_oil = json_object_new_object();
-          json_object_object_add(json_source, "oil", json_oil);
-        }
-        json_object_object_add(json_oil, out_ifname, json_ifp_out);
-      } else {
-        vty_out (vty, "%-15s %-15s %-6s %-10s %-10s %-3d  %8s\n",
-                src_str,
-                grp_str,
-                proto,
-                in_ifname,
-                out_ifname,
-                ttl,
-                oif_uptime);
-	if (first)
-          {
-	    src_str[0] = '\0';
-	    grp_str[0] = '\0';
-	    in_ifname[0] = '\0';
-	    first = 0;
-	  }
-      }
-    }
-
-    if (!uj && !found_oif) {
-        vty_out (vty, "%-15s %-15s %-6s %-10s %-10s %-3d  %8s\n",
-                src_str,
-                grp_str,
-                proto,
-                in_ifname,
-                "none",
-                0,
-                "--:--:--");
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
+	struct listnode *node;
+	struct channel_oil *c_oil;
+	struct static_route *s_route;
+	time_t now;
+	json_object *json = NULL;
+	json_object *json_group = NULL;
+	json_object *json_source = NULL;
+	json_object *json_oil = NULL;
+	json_object *json_ifp_out = NULL;
+	int found_oif = 0;
+	int first = 1;
+	char grp_str[INET_ADDRSTRLEN];
+	char src_str[INET_ADDRSTRLEN];
+	char in_ifname[INTERFACE_NAMSIZ + 1];
+	char out_ifname[INTERFACE_NAMSIZ + 1];
+	int oif_vif_index;
+	struct interface *ifp_in;
+	char proto[100];
+
+	if (uj) {
+		json = json_object_new_object();
+	} else {
+		vty_out(vty,
+			"Source          Group           Proto  Input      Output     TTL  Uptime\n");
+	}
+
+	now = pim_time_monotonic_sec();
+
+	/* print list of PIM and IGMP routes */
+	for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
+		found_oif = 0;
+		first = 1;
+		if (!c_oil->installed && !uj)
+			continue;
+
+		pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp, grp_str,
+			       sizeof(grp_str));
+		pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, src_str,
+			       sizeof(src_str));
+		ifp_in = pim_if_find_by_vif_index(c_oil->oil.mfcc_parent);
+
+		if (ifp_in)
+			strcpy(in_ifname, ifp_in->name);
+		else
+			strcpy(in_ifname, "<iif?>");
+
+		if (uj) {
+
+			/* Find the group, create it if it doesn't exist */
+			json_object_object_get_ex(json, grp_str, &json_group);
+
+			if (!json_group) {
+				json_group = json_object_new_object();
+				json_object_object_add(json, grp_str,
+						       json_group);
+			}
+
+			/* Find the source nested under the group, create it if
+			 * it doesn't exist */
+			json_object_object_get_ex(json_group, src_str,
+						  &json_source);
+
+			if (!json_source) {
+				json_source = json_object_new_object();
+				json_object_object_add(json_group, src_str,
+						       json_source);
+			}
+
+			/* Find the inbound interface nested under the source,
+			 * create it if it doesn't exist */
+			json_object_int_add(json_source, "installed",
+					    c_oil->installed);
+			json_object_int_add(json_source, "refCount",
+					    c_oil->oil_ref_count);
+			json_object_int_add(json_source, "oilSize",
+					    c_oil->oil_size);
+			json_object_int_add(json_source, "OilInheritedRescan",
+					    c_oil->oil_inherited_rescan);
+			json_object_string_add(json_source, "iif", in_ifname);
+			json_oil = NULL;
+		}
+
+		for (oif_vif_index = 0; oif_vif_index < MAXVIFS;
+		     ++oif_vif_index) {
+			struct interface *ifp_out;
+			char oif_uptime[10];
+			int ttl;
+
+			ttl = c_oil->oil.mfcc_ttls[oif_vif_index];
+			if (ttl < 1)
+				continue;
+
+			ifp_out = pim_if_find_by_vif_index(oif_vif_index);
+			pim_time_uptime(
+				oif_uptime, sizeof(oif_uptime),
+				now - c_oil->oif_creation[oif_vif_index]);
+			found_oif = 1;
+
+			if (ifp_out)
+				strcpy(out_ifname, ifp_out->name);
+			else
+				strcpy(out_ifname, "<oif?>");
+
+			if (uj) {
+				json_ifp_out = json_object_new_object();
+				json_object_string_add(json_ifp_out, "source",
+						       src_str);
+				json_object_string_add(json_ifp_out, "group",
+						       grp_str);
+
+				if (c_oil->oif_flags[oif_vif_index]
+				    & PIM_OIF_FLAG_PROTO_PIM)
+					json_object_boolean_true_add(
+						json_ifp_out, "protocolPim");
+
+				if (c_oil->oif_flags[oif_vif_index]
+				    & PIM_OIF_FLAG_PROTO_IGMP)
+					json_object_boolean_true_add(
+						json_ifp_out, "protocolIgmp");
+
+				if (c_oil->oif_flags[oif_vif_index]
+				    & PIM_OIF_FLAG_PROTO_SOURCE)
+					json_object_boolean_true_add(
+						json_ifp_out, "protocolSource");
+
+				if (c_oil->oif_flags[oif_vif_index]
+				    & PIM_OIF_FLAG_PROTO_STAR)
+					json_object_boolean_true_add(
+						json_ifp_out,
+						"protocolInherited");
+
+				json_object_string_add(json_ifp_out,
+						       "inboundInterface",
+						       in_ifname);
+				json_object_int_add(json_ifp_out, "iVifI",
+						    c_oil->oil.mfcc_parent);
+				json_object_string_add(json_ifp_out,
+						       "outboundInterface",
+						       out_ifname);
+				json_object_int_add(json_ifp_out, "oVifI",
+						    oif_vif_index);
+				json_object_int_add(json_ifp_out, "ttl", ttl);
+				json_object_string_add(json_ifp_out, "upTime",
+						       oif_uptime);
+				if (!json_oil) {
+					json_oil = json_object_new_object();
+					json_object_object_add(json_source,
+							       "oil", json_oil);
+				}
+				json_object_object_add(json_oil, out_ifname,
+						       json_ifp_out);
+			} else {
+				if (c_oil->oif_flags[oif_vif_index]
+				    & PIM_OIF_FLAG_PROTO_PIM) {
+					strcpy(proto, "PIM");
+				}
+
+				if (c_oil->oif_flags[oif_vif_index]
+				    & PIM_OIF_FLAG_PROTO_IGMP) {
+					strcpy(proto, "IGMP");
+				}
+
+				if (c_oil->oif_flags[oif_vif_index]
+				    & PIM_OIF_FLAG_PROTO_SOURCE) {
+					strcpy(proto, "SRC");
+				}
+
+				if (c_oil->oif_flags[oif_vif_index]
+				    & PIM_OIF_FLAG_PROTO_STAR) {
+					strcpy(proto, "STAR");
+				}
+
+				vty_out(vty,
+					"%-15s %-15s %-6s %-10s %-10s %-3d  %8s\n",
+					src_str, grp_str, proto, in_ifname,
+					out_ifname, ttl, oif_uptime);
+
+				if (first) {
+					src_str[0] = '\0';
+					grp_str[0] = '\0';
+					in_ifname[0] = '\0';
+					first = 0;
+				}
+			}
+		}
+
+		if (!uj && !found_oif) {
+			vty_out(vty, "%-15s %-15s %-6s %-10s %-10s %-3d  %8s\n",
+				src_str, grp_str, "none", in_ifname, "none", 0,
+				"--:--:--");
+		}
+	}
+
+	/* Print list of static routes */
+	for (ALL_LIST_ELEMENTS_RO(qpim_static_route_list, node, s_route)) {
+		first = 1;
+
+		if (!s_route->c_oil.installed)
+			continue;
+
+		pim_inet4_dump("<group?>", s_route->group, grp_str,
+			       sizeof(grp_str));
+		pim_inet4_dump("<source?>", s_route->source, src_str,
+			       sizeof(src_str));
+		ifp_in = pim_if_find_by_vif_index(s_route->iif);
+		found_oif = 0;
+
+		if (ifp_in)
+			strcpy(in_ifname, ifp_in->name);
+		else
+			strcpy(in_ifname, "<iif?>");
+
+		if (uj) {
+
+			/* Find the group, create it if it doesn't exist */
+			json_object_object_get_ex(json, grp_str, &json_group);
+
+			if (!json_group) {
+				json_group = json_object_new_object();
+				json_object_object_add(json, grp_str,
+						       json_group);
+			}
+
+			/* Find the source nested under the group, create it if
+			 * it doesn't exist */
+			json_object_object_get_ex(json_group, src_str,
+						  &json_source);
+
+			if (!json_source) {
+				json_source = json_object_new_object();
+				json_object_object_add(json_group, src_str,
+						       json_source);
+			}
+
+			json_object_string_add(json_source, "iif", in_ifname);
+			json_oil = NULL;
+		} else {
+			strcpy(proto, "STATIC");
+		}
+
+		for (oif_vif_index = 0; oif_vif_index < MAXVIFS;
+		     ++oif_vif_index) {
+			struct interface *ifp_out;
+			char oif_uptime[10];
+			int ttl;
+
+			ttl = s_route->oif_ttls[oif_vif_index];
+			if (ttl < 1)
+				continue;
+
+			ifp_out = pim_if_find_by_vif_index(oif_vif_index);
+			pim_time_uptime(
+				oif_uptime, sizeof(oif_uptime),
+				now
+					- s_route->c_oil
+						  .oif_creation[oif_vif_index]);
+			found_oif = 1;
+
+			if (ifp_out)
+				strcpy(out_ifname, ifp_out->name);
+			else
+				strcpy(out_ifname, "<oif?>");
+
+			if (uj) {
+				json_ifp_out = json_object_new_object();
+				json_object_string_add(json_ifp_out, "source",
+						       src_str);
+				json_object_string_add(json_ifp_out, "group",
+						       grp_str);
+				json_object_boolean_true_add(json_ifp_out,
+							     "protocolStatic");
+				json_object_string_add(json_ifp_out,
+						       "inboundInterface",
+						       in_ifname);
+				json_object_int_add(
+					json_ifp_out, "iVifI",
+					s_route->c_oil.oil.mfcc_parent);
+				json_object_string_add(json_ifp_out,
+						       "outboundInterface",
+						       out_ifname);
+				json_object_int_add(json_ifp_out, "oVifI",
+						    oif_vif_index);
+				json_object_int_add(json_ifp_out, "ttl", ttl);
+				json_object_string_add(json_ifp_out, "upTime",
+						       oif_uptime);
+				if (!json_oil) {
+					json_oil = json_object_new_object();
+					json_object_object_add(json_source,
+							       "oil", json_oil);
+				}
+				json_object_object_add(json_oil, out_ifname,
+						       json_ifp_out);
+			} else {
+				vty_out(vty,
+					"%-15s %-15s %-6s %-10s %-10s %-3d  %8s\n",
+					src_str, grp_str, proto, in_ifname,
+					out_ifname, ttl, oif_uptime);
+				if (first) {
+					src_str[0] = '\0';
+					grp_str[0] = '\0';
+					in_ifname[0] = '\0';
+					first = 0;
+				}
+			}
+		}
+
+		if (!uj && !found_oif) {
+			vty_out(vty, "%-15s %-15s %-6s %-10s %-10s %-3d  %8s\n",
+				src_str, grp_str, proto, in_ifname, "none", 0,
+				"--:--:--");
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
 DEFUN (show_ip_mroute,
@@ -3573,65 +4053,63 @@ DEFUN (show_ip_mroute,
        MROUTE_STR
        JSON_STR)
 {
-  u_char uj = use_json(argc, argv);
-  show_mroute(vty, uj);
-  return CMD_SUCCESS;
+	u_char uj = use_json(argc, argv);
+	show_mroute(vty, uj);
+	return CMD_SUCCESS;
 }
 
 static void show_mroute_count(struct vty *vty)
 {
-  struct listnode    *node;
-  struct channel_oil *c_oil;
-  struct static_route *s_route;
+	struct listnode *node;
+	struct channel_oil *c_oil;
+	struct static_route *s_route;
 
-  vty_out (vty, "\n");
-  
-  vty_out (vty,
-            "Source          Group           LastUsed Packets Bytes WrongIf  \n");
+	vty_out(vty, "\n");
 
-  /* Print PIM and IGMP route counts */
-  for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
-    char group_str[INET_ADDRSTRLEN]; 
-    char source_str[INET_ADDRSTRLEN];
+	vty_out(vty,
+		"Source          Group           LastUsed Packets Bytes WrongIf  \n");
 
-    if (!c_oil->installed)
-      continue;
+	/* Print PIM and IGMP route counts */
+	for (ALL_LIST_ELEMENTS_RO(pim_channel_oil_list, node, c_oil)) {
+		char group_str[INET_ADDRSTRLEN];
+		char source_str[INET_ADDRSTRLEN];
 
-    pim_mroute_update_counters (c_oil);
+		if (!c_oil->installed)
+			continue;
 
-    pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp, group_str, sizeof(group_str));
-    pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, source_str, sizeof(source_str));
+		pim_mroute_update_counters(c_oil);
 
-    vty_out (vty, "%-15s %-15s %-8llu %-7ld %-10ld %-7ld\n",
-	    source_str,
-	    group_str,
-	    c_oil->cc.lastused/100,
-	    c_oil->cc.pktcnt,
-	    c_oil->cc.bytecnt,
-	    c_oil->cc.wrong_if);
-  }
+		pim_inet4_dump("<group?>", c_oil->oil.mfcc_mcastgrp, group_str,
+			       sizeof(group_str));
+		pim_inet4_dump("<source?>", c_oil->oil.mfcc_origin, source_str,
+			       sizeof(source_str));
 
-   /* Print static route counts */
-  for (ALL_LIST_ELEMENTS_RO(qpim_static_route_list, node, s_route)) {
-    char group_str[INET_ADDRSTRLEN];
-    char source_str[INET_ADDRSTRLEN];
+		vty_out(vty, "%-15s %-15s %-8llu %-7ld %-10ld %-7ld\n",
+			source_str, group_str, c_oil->cc.lastused / 100,
+			c_oil->cc.pktcnt, c_oil->cc.bytecnt,
+			c_oil->cc.wrong_if);
+	}
+
+	/* Print static route counts */
+	for (ALL_LIST_ELEMENTS_RO(qpim_static_route_list, node, s_route)) {
+		char group_str[INET_ADDRSTRLEN];
+		char source_str[INET_ADDRSTRLEN];
 
-    if (!s_route->c_oil.installed)
-      continue;
+		if (!s_route->c_oil.installed)
+			continue;
 
-    pim_mroute_update_counters (&s_route->c_oil);
+		pim_mroute_update_counters(&s_route->c_oil);
 
-    pim_inet4_dump("<group?>", s_route->c_oil.oil.mfcc_mcastgrp, group_str, sizeof(group_str));
-    pim_inet4_dump("<source?>", s_route->c_oil.oil.mfcc_origin, source_str, sizeof(source_str));
+		pim_inet4_dump("<group?>", s_route->c_oil.oil.mfcc_mcastgrp,
+			       group_str, sizeof(group_str));
+		pim_inet4_dump("<source?>", s_route->c_oil.oil.mfcc_origin,
+			       source_str, sizeof(source_str));
 
-    vty_out (vty, "%-15s %-15s %-8llu %-7ld %-10ld %-7ld\n",
-       source_str,
-       group_str,
-       s_route->c_oil.cc.lastused,
-       s_route->c_oil.cc.pktcnt,
-       s_route->c_oil.cc.bytecnt,
-       s_route->c_oil.cc.wrong_if);
-  }
+		vty_out(vty, "%-15s %-15s %-8llu %-7ld %-10ld %-7ld\n",
+			source_str, group_str, s_route->c_oil.cc.lastused,
+			s_route->c_oil.cc.pktcnt, s_route->c_oil.cc.bytecnt,
+			s_route->c_oil.cc.wrong_if);
+	}
 }
 
 DEFUN (show_ip_mroute_count,
@@ -3642,8 +4120,8 @@ DEFUN (show_ip_mroute_count,
        MROUTE_STR
        "Route and packet count data\n")
 {
-  show_mroute_count(vty);
-  return CMD_SUCCESS;
+	show_mroute_count(vty);
+	return CMD_SUCCESS;
 }
 
 DEFUN (show_ip_rib,
@@ -3654,83 +4132,82 @@ DEFUN (show_ip_rib,
        RIB_STR
        "Unicast address\n")
 {
-  int idx_ipv4 = 3;
-  struct in_addr addr;
-  const char *addr_str;
-  struct pim_nexthop nexthop;
-  char nexthop_addr_str[PREFIX_STRLEN];
-  int result;
-
-  memset (&nexthop, 0, sizeof (nexthop));
-  addr_str = argv[idx_ipv4]->arg;
-  result = inet_pton(AF_INET, addr_str, &addr);
-  if (result <= 0) {
-    vty_out (vty, "Bad unicast address %s: errno=%d: %s\n",
-	    addr_str, errno, safe_strerror(errno));
-    return CMD_WARNING;
-  }
+	int idx_ipv4 = 3;
+	struct in_addr addr;
+	const char *addr_str;
+	struct pim_nexthop nexthop;
+	char nexthop_addr_str[PREFIX_STRLEN];
+	int result;
+
+	memset(&nexthop, 0, sizeof(nexthop));
+	addr_str = argv[idx_ipv4]->arg;
+	result = inet_pton(AF_INET, addr_str, &addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad unicast address %s: errno=%d: %s\n", addr_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING;
+	}
 
-  if (pim_nexthop_lookup(&nexthop, addr, 0)) {
-    vty_out (vty, "Failure querying RIB nexthop for unicast address %s\n",
-	    addr_str);
-    return CMD_WARNING;
-  }
+	if (pim_nexthop_lookup(&nexthop, addr, 0)) {
+		vty_out(vty,
+			"Failure querying RIB nexthop for unicast address %s\n",
+			addr_str);
+		return CMD_WARNING;
+	}
 
-  vty_out (vty,
-            "Address         NextHop         Interface Metric Preference\n");
+	vty_out(vty,
+		"Address         NextHop         Interface Metric Preference\n");
 
-  pim_addr_dump("<nexthop?>", &nexthop.mrib_nexthop_addr,
-		nexthop_addr_str, sizeof(nexthop_addr_str));
+	pim_addr_dump("<nexthop?>", &nexthop.mrib_nexthop_addr,
+		      nexthop_addr_str, sizeof(nexthop_addr_str));
 
-  vty_out (vty, "%-15s %-15s %-9s %6d %10d\n",
-	  addr_str,
-	  nexthop_addr_str,
-	  nexthop.interface ? nexthop.interface->name : "<ifname?>",
-	  nexthop.mrib_route_metric,
-	  nexthop.mrib_metric_preference);
+	vty_out(vty, "%-15s %-15s %-9s %6d %10d\n", addr_str, nexthop_addr_str,
+		nexthop.interface ? nexthop.interface->name : "<ifname?>",
+		nexthop.mrib_route_metric, nexthop.mrib_metric_preference);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 static void show_ssmpingd(struct vty *vty)
 {
-  struct listnode      *node;
-  struct ssmpingd_sock *ss;
-  time_t                now;
+	struct listnode *node;
+	struct ssmpingd_sock *ss;
+	time_t now;
 
-  vty_out (vty,
-            "Source          Socket Address          Port Uptime   Requests\n");
+	vty_out(vty,
+		"Source          Socket Address          Port Uptime   Requests\n");
 
-  if (!qpim_ssmpingd_list)
-    return;
+	if (!qpim_ssmpingd_list)
+		return;
 
-  now = pim_time_monotonic_sec();
+	now = pim_time_monotonic_sec();
 
-  for (ALL_LIST_ELEMENTS_RO(qpim_ssmpingd_list, node, ss)) {
-    char source_str[INET_ADDRSTRLEN];
-    char ss_uptime[10];
-    struct sockaddr_in bind_addr;
-    socklen_t len = sizeof(bind_addr);
-    char bind_addr_str[INET_ADDRSTRLEN];
+	for (ALL_LIST_ELEMENTS_RO(qpim_ssmpingd_list, node, ss)) {
+		char source_str[INET_ADDRSTRLEN];
+		char ss_uptime[10];
+		struct sockaddr_in bind_addr;
+		socklen_t len = sizeof(bind_addr);
+		char bind_addr_str[INET_ADDRSTRLEN];
 
-    pim_inet4_dump("<src?>", ss->source_addr, source_str, sizeof(source_str));
+		pim_inet4_dump("<src?>", ss->source_addr, source_str,
+			       sizeof(source_str));
 
-    if (pim_socket_getsockname(ss->sock_fd, (struct sockaddr *) &bind_addr, &len)) {
-      vty_out (vty, "%% Failure reading socket name for ssmpingd source %s on fd=%d\n",
-	      source_str, ss->sock_fd);
-    }
+		if (pim_socket_getsockname(
+			    ss->sock_fd, (struct sockaddr *)&bind_addr, &len)) {
+			vty_out(vty,
+				"%% Failure reading socket name for ssmpingd source %s on fd=%d\n",
+				source_str, ss->sock_fd);
+		}
 
-    pim_inet4_dump("<addr?>", bind_addr.sin_addr, bind_addr_str, sizeof(bind_addr_str));
-    pim_time_uptime(ss_uptime, sizeof(ss_uptime), now - ss->creation);
+		pim_inet4_dump("<addr?>", bind_addr.sin_addr, bind_addr_str,
+			       sizeof(bind_addr_str));
+		pim_time_uptime(ss_uptime, sizeof(ss_uptime),
+				now - ss->creation);
 
-    vty_out (vty, "%-15s %6d %-15s %5d %8s %8lld\n",
-	    source_str,
-	    ss->sock_fd,
-	    bind_addr_str,
-	    ntohs(bind_addr.sin_port),
-	    ss_uptime,
-	    (long long)ss->requests);
-  }
+		vty_out(vty, "%-15s %6d %-15s %5d %8s %8lld\n", source_str,
+			ss->sock_fd, bind_addr_str, ntohs(bind_addr.sin_port),
+			ss_uptime, (long long)ss->requests);
+	}
 }
 
 DEFUN (show_ip_ssmpingd,
@@ -3740,89 +4217,82 @@ DEFUN (show_ip_ssmpingd,
        IP_STR
        SHOW_SSMPINGD_STR)
 {
-  show_ssmpingd(vty);
-  return CMD_SUCCESS;
+	show_ssmpingd(vty);
+	return CMD_SUCCESS;
 }
 
-static int
-pim_rp_cmd_worker (struct vty *vty, const char *rp, const char *group, const char *plist)
+static int pim_rp_cmd_worker(struct vty *vty, const char *rp, const char *group,
+			     const char *plist)
 {
-  int result;
+	int result;
 
-  result = pim_rp_new (rp, group, plist);
+	result = pim_rp_new(rp, group, plist);
 
-  if (result == PIM_MALLOC_FAIL)
-    {
-      vty_out (vty, "%% Out of memory\n");
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	if (result == PIM_MALLOC_FAIL) {
+		vty_out(vty, "%% Out of memory\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  if (result == PIM_GROUP_BAD_ADDRESS)
-    {
-      vty_out (vty, "%% Bad group address specified: %s\n", group);
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	if (result == PIM_GROUP_BAD_ADDRESS) {
+		vty_out(vty, "%% Bad group address specified: %s\n", group);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  if (result == PIM_RP_BAD_ADDRESS)
-    {
-      vty_out (vty, "%% Bad RP address specified: %s\n", rp);
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	if (result == PIM_RP_BAD_ADDRESS) {
+		vty_out(vty, "%% Bad RP address specified: %s\n", rp);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  if (result == PIM_RP_NO_PATH)
-    {
-      vty_out (vty, "%% No Path to RP address specified: %s\n", rp);
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	if (result == PIM_RP_NO_PATH) {
+		vty_out(vty, "%% No Path to RP address specified: %s\n", rp);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  if (result == PIM_GROUP_OVERLAP)
-    {
-      vty_out (vty, "%% Group range specified cannot overlap\n");
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	if (result == PIM_GROUP_OVERLAP) {
+		vty_out(vty, "%% Group range specified cannot overlap\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  if (result == PIM_GROUP_PFXLIST_OVERLAP)
-    {
-      vty_out (vty,
-                 "%% This group is already covered by a RP prefix-list\n");
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	if (result == PIM_GROUP_PFXLIST_OVERLAP) {
+		vty_out(vty,
+			"%% This group is already covered by a RP prefix-list\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  if (result == PIM_RP_PFXLIST_IN_USE)
-    {
-      vty_out (vty,
-                 "%% The same prefix-list cannot be applied to multiple RPs\n");
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	if (result == PIM_RP_PFXLIST_IN_USE) {
+		vty_out(vty,
+			"%% The same prefix-list cannot be applied to multiple RPs\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
-static int
-pim_cmd_spt_switchover (enum pim_spt_switchover spt, const char *plist)
+static int pim_cmd_spt_switchover(enum pim_spt_switchover spt,
+				  const char *plist)
 {
-  pimg->spt.switchover = spt;
+	pimg->spt.switchover = spt;
 
-  switch (pimg->spt.switchover)
-    {
-    case PIM_SPT_IMMEDIATE:
-      if (pimg->spt.plist)
-        XFREE (MTYPE_PIM_SPT_PLIST_NAME, pimg->spt.plist);
+	switch (pimg->spt.switchover) {
+	case PIM_SPT_IMMEDIATE:
+		if (pimg->spt.plist)
+			XFREE(MTYPE_PIM_SPT_PLIST_NAME, pimg->spt.plist);
 
-      pim_upstream_add_lhr_star_pimreg ();
-      break;
-    case PIM_SPT_INFINITY:
-      pim_upstream_remove_lhr_star_pimreg (plist);
+		pim_upstream_add_lhr_star_pimreg();
+		break;
+	case PIM_SPT_INFINITY:
+		pim_upstream_remove_lhr_star_pimreg(plist);
 
-      if (pimg->spt.plist)
-        XFREE (MTYPE_PIM_SPT_PLIST_NAME, pimg->spt.plist);
+		if (pimg->spt.plist)
+			XFREE(MTYPE_PIM_SPT_PLIST_NAME, pimg->spt.plist);
 
-      if (plist)
-        pimg->spt.plist = XSTRDUP (MTYPE_PIM_SPT_PLIST_NAME, plist);
-      break;
-    }
+		if (plist)
+			pimg->spt.plist =
+				XSTRDUP(MTYPE_PIM_SPT_PLIST_NAME, plist);
+		break;
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_pim_spt_switchover_infinity,
@@ -3833,7 +4303,7 @@ DEFUN (ip_pim_spt_switchover_infinity,
        "SPT-Switchover\n"
        "Never switch to SPT Tree\n")
 {
-  return pim_cmd_spt_switchover (PIM_SPT_INFINITY, NULL);
+	return pim_cmd_spt_switchover(PIM_SPT_INFINITY, NULL);
 }
 
 DEFUN (ip_pim_spt_switchover_infinity_plist,
@@ -3846,7 +4316,7 @@ DEFUN (ip_pim_spt_switchover_infinity_plist,
        "Prefix-List to control which groups to switch\n"
        "Prefix-List name\n")
 {
-  return pim_cmd_spt_switchover (PIM_SPT_INFINITY, argv[5]->arg);
+	return pim_cmd_spt_switchover(PIM_SPT_INFINITY, argv[5]->arg);
 }
 
 DEFUN (no_ip_pim_spt_switchover_infinity,
@@ -3858,7 +4328,7 @@ DEFUN (no_ip_pim_spt_switchover_infinity,
        "SPT_Switchover\n"
        "Never switch to SPT Tree\n")
 {
-  return pim_cmd_spt_switchover (PIM_SPT_IMMEDIATE, NULL);
+	return pim_cmd_spt_switchover(PIM_SPT_IMMEDIATE, NULL);
 }
 
 DEFUN (no_ip_pim_spt_switchover_infinity_plist,
@@ -3872,7 +4342,7 @@ DEFUN (no_ip_pim_spt_switchover_infinity_plist,
        "Prefix-List to control which groups to switch\n"
        "Prefix-List name\n")
 {
-  return pim_cmd_spt_switchover (PIM_SPT_IMMEDIATE, NULL);
+	return pim_cmd_spt_switchover(PIM_SPT_IMMEDIATE, NULL);
 }
 
 DEFUN (ip_pim_joinprune_time,
@@ -3883,8 +4353,8 @@ DEFUN (ip_pim_joinprune_time,
        "Join Prune Send Interval\n"
        "Seconds\n")
 {
-  qpim_t_periodic = atoi(argv[3]->arg);
-  return CMD_SUCCESS;
+	qpim_t_periodic = atoi(argv[3]->arg);
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ip_pim_joinprune_time,
@@ -3896,8 +4366,8 @@ DEFUN (no_ip_pim_joinprune_time,
        "Join Prune Send Interval\n"
        "Seconds\n")
 {
-  qpim_t_periodic = PIM_DEFAULT_T_PERIODIC;
-  return CMD_SUCCESS;
+	qpim_t_periodic = PIM_DEFAULT_T_PERIODIC;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_pim_register_suppress,
@@ -3908,8 +4378,8 @@ DEFUN (ip_pim_register_suppress,
        "Register Suppress Timer\n"
        "Seconds\n")
 {
-  qpim_register_suppress_time = atoi (argv[3]->arg);
-  return CMD_SUCCESS;
+	qpim_register_suppress_time = atoi(argv[3]->arg);
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ip_pim_register_suppress,
@@ -3921,8 +4391,8 @@ DEFUN (no_ip_pim_register_suppress,
        "Register Suppress Timer\n"
        "Seconds\n")
 {
-  qpim_register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT;
-  return CMD_SUCCESS;
+	qpim_register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_pim_keep_alive,
@@ -3933,8 +4403,8 @@ DEFUN (ip_pim_keep_alive,
        "Keep alive Timer\n"
        "Seconds\n")
 {
-  qpim_keep_alive_time = atoi (argv[3]->arg);
-  return CMD_SUCCESS;
+	qpim_keep_alive_time = atoi(argv[3]->arg);
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ip_pim_keep_alive,
@@ -3946,8 +4416,8 @@ DEFUN (no_ip_pim_keep_alive,
        "Keep alive Timer\n"
        "Seconds\n")
 {
-  qpim_keep_alive_time = PIM_KEEPALIVE_PERIOD;
-  return CMD_SUCCESS;
+	qpim_keep_alive_time = PIM_KEEPALIVE_PERIOD;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_pim_packets,
@@ -3958,8 +4428,8 @@ DEFUN (ip_pim_packets,
        "packets to process at one time per fd\n"
        "Number of packets\n")
 {
-  qpim_packet_process = atoi (argv[3]->arg);
-  return CMD_SUCCESS;
+	qpim_packet_process = atoi(argv[3]->arg);
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ip_pim_packets,
@@ -3971,8 +4441,8 @@ DEFUN (no_ip_pim_packets,
        "packets to process at one time per fd\n"
        "Number of packets\n")
 {
-  qpim_packet_process = PIM_DEFAULT_PACKET_PROCESS;
-  return CMD_SUCCESS;
+	qpim_packet_process = PIM_DEFAULT_PACKET_PROCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_pim_v6_secondary,
@@ -3982,9 +4452,9 @@ DEFUN (ip_pim_v6_secondary,
        "pim multicast routing\n"
        "Send v6 secondary addresses\n")
 {
-  pimg->send_v6_secondary = 1;
+	pimg->send_v6_secondary = 1;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ip_pim_v6_secondary,
@@ -3995,9 +4465,9 @@ DEFUN (no_ip_pim_v6_secondary,
        "pim multicast routing\n"
        "Send v6 secondary addresses\n")
 {
-  pimg->send_v6_secondary = 0;
+	pimg->send_v6_secondary = 0;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_pim_rp,
@@ -4009,13 +4479,13 @@ DEFUN (ip_pim_rp,
        "ip address of RP\n"
        "Group Address range to cover\n")
 {
-  int idx_ipv4 = 3;
-
-  if (argc == (idx_ipv4 + 1))
-    return pim_rp_cmd_worker (vty, argv[idx_ipv4]->arg, NULL, NULL);
-  else
-    return pim_rp_cmd_worker (vty, argv[idx_ipv4]->arg, argv[idx_ipv4 + 1]->arg, NULL);
+	int idx_ipv4 = 3;
 
+	if (argc == (idx_ipv4 + 1))
+		return pim_rp_cmd_worker(vty, argv[idx_ipv4]->arg, NULL, NULL);
+	else
+		return pim_rp_cmd_worker(vty, argv[idx_ipv4]->arg,
+					 argv[idx_ipv4 + 1]->arg, NULL);
 }
 
 DEFUN (ip_pim_rp_prefix_list,
@@ -4028,34 +4498,30 @@ DEFUN (ip_pim_rp_prefix_list,
        "group prefix-list filter\n"
        "Name of a prefix-list\n")
 {
-  return pim_rp_cmd_worker (vty, argv[3]->arg, NULL, argv[5]->arg);
+	return pim_rp_cmd_worker(vty, argv[3]->arg, NULL, argv[5]->arg);
 }
 
-static int
-pim_no_rp_cmd_worker (struct vty *vty, const char *rp, const char *group,
-                      const char *plist)
+static int pim_no_rp_cmd_worker(struct vty *vty, const char *rp,
+				const char *group, const char *plist)
 {
-  int result = pim_rp_del (rp, group, plist);
+	int result = pim_rp_del(rp, group, plist);
 
-  if (result == PIM_GROUP_BAD_ADDRESS)
-    {
-      vty_out (vty, "%% Bad group address specified: %s\n", group);
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	if (result == PIM_GROUP_BAD_ADDRESS) {
+		vty_out(vty, "%% Bad group address specified: %s\n", group);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  if (result == PIM_RP_BAD_ADDRESS)
-    {
-      vty_out (vty, "%% Bad RP address specified: %s\n", rp);
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	if (result == PIM_RP_BAD_ADDRESS) {
+		vty_out(vty, "%% Bad RP address specified: %s\n", rp);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  if (result == PIM_RP_NOT_FOUND)
-    {
-      vty_out (vty, "%% Unable to find specified RP\n");
-      return CMD_WARNING_CONFIG_FAILED;
-    }
+	if (result == PIM_RP_NOT_FOUND) {
+		vty_out(vty, "%% Unable to find specified RP\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ip_pim_rp,
@@ -4068,12 +4534,14 @@ DEFUN (no_ip_pim_rp,
        "ip address of RP\n"
        "Group Address range to cover\n")
 {
-  int idx_ipv4 = 4, idx_group = 0;
+	int idx_ipv4 = 4, idx_group = 0;
 
-  if (argv_find (argv, argc, "A.B.C.D/M", &idx_group))
-    return pim_no_rp_cmd_worker (vty, argv[idx_ipv4]->arg, argv[idx_group]->arg, NULL);
-  else
-    return pim_no_rp_cmd_worker (vty, argv[idx_ipv4]->arg, NULL, NULL);
+	if (argv_find(argv, argc, "A.B.C.D/M", &idx_group))
+		return pim_no_rp_cmd_worker(vty, argv[idx_ipv4]->arg,
+					    argv[idx_group]->arg, NULL);
+	else
+		return pim_no_rp_cmd_worker(vty, argv[idx_ipv4]->arg, NULL,
+					    NULL);
 }
 
 DEFUN (no_ip_pim_rp_prefix_list,
@@ -4087,30 +4555,28 @@ DEFUN (no_ip_pim_rp_prefix_list,
        "group prefix-list filter\n"
        "Name of a prefix-list\n")
 {
-  return pim_no_rp_cmd_worker (vty, argv[4]->arg, NULL, argv[6]->arg);
+	return pim_no_rp_cmd_worker(vty, argv[4]->arg, NULL, argv[6]->arg);
 }
 
-static int
-pim_ssm_cmd_worker (struct vty *vty, const char *plist)
+static int pim_ssm_cmd_worker(struct vty *vty, const char *plist)
 {
-  int result = pim_ssm_range_set (VRF_DEFAULT, plist);
+	int result = pim_ssm_range_set(VRF_DEFAULT, plist);
 
-  if (result == PIM_SSM_ERR_NONE)
-    return CMD_SUCCESS;
+	if (result == PIM_SSM_ERR_NONE)
+		return CMD_SUCCESS;
 
-  switch (result)
-    {
-    case PIM_SSM_ERR_NO_VRF:
-      vty_out (vty, "%% VRF doesn't exist\n");
-      break;
-    case PIM_SSM_ERR_DUP:
-      vty_out (vty, "%% duplicate config\n");
-      break;
-    default:
-      vty_out (vty, "%% ssm range config failed\n");
-    }
+	switch (result) {
+	case PIM_SSM_ERR_NO_VRF:
+		vty_out(vty, "%% VRF doesn't exist\n");
+		break;
+	case PIM_SSM_ERR_DUP:
+		vty_out(vty, "%% duplicate config\n");
+		break;
+	default:
+		vty_out(vty, "%% ssm range config failed\n");
+	}
 
-  return CMD_WARNING_CONFIG_FAILED;
+	return CMD_WARNING_CONFIG_FAILED;
 }
 
 DEFUN (ip_pim_ssm_prefix_list,
@@ -4122,7 +4588,7 @@ DEFUN (ip_pim_ssm_prefix_list,
        "group range prefix-list filter\n"
        "Name of a prefix-list\n")
 {
-  return pim_ssm_cmd_worker (vty, argv[0]->arg);
+	return pim_ssm_cmd_worker(vty, argv[0]->arg);
 }
 
 DEFUN (no_ip_pim_ssm_prefix_list,
@@ -4134,7 +4600,7 @@ DEFUN (no_ip_pim_ssm_prefix_list,
        "Source Specific Multicast\n"
        "group range prefix-list filter\n")
 {
-  return pim_ssm_cmd_worker (vty, NULL);
+	return pim_ssm_cmd_worker(vty, NULL);
 }
 
 DEFUN (no_ip_pim_ssm_prefix_list_name,
@@ -4147,34 +4613,31 @@ DEFUN (no_ip_pim_ssm_prefix_list_name,
        "group range prefix-list filter\n"
        "Name of a prefix-list\n")
 {
-  struct pim_ssm *ssm = pimg->ssm_info;
+	struct pim_ssm *ssm = pimg->ssm_info;
 
-  if (ssm->plist_name && !strcmp(ssm->plist_name, argv[0]->arg))
-    return pim_ssm_cmd_worker (vty, NULL);
+	if (ssm->plist_name && !strcmp(ssm->plist_name, argv[0]->arg))
+		return pim_ssm_cmd_worker(vty, NULL);
 
-  vty_out (vty, "%% pim ssm prefix-list %s doesn't exist\n",
-           argv[0]->arg);
+	vty_out(vty, "%% pim ssm prefix-list %s doesn't exist\n", argv[0]->arg);
 
-  return CMD_WARNING_CONFIG_FAILED;
+	return CMD_WARNING_CONFIG_FAILED;
 }
 
-static void
-ip_pim_ssm_show_group_range(struct vty *vty, u_char uj)
+static void ip_pim_ssm_show_group_range(struct vty *vty, u_char uj)
 {
-  struct pim_ssm *ssm = pimg->ssm_info;
-  const char *range_str = ssm->plist_name?ssm->plist_name:PIM_SSM_STANDARD_RANGE;
+	struct pim_ssm *ssm = pimg->ssm_info;
+	const char *range_str =
+		ssm->plist_name ? ssm->plist_name : PIM_SSM_STANDARD_RANGE;
 
-  if (uj)
-    {
-      json_object *json;
-      json = json_object_new_object();
-      json_object_string_add(json, "ssmGroups", range_str);
-      vty_out (vty, "%s\n",
-                 json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-      json_object_free(json);
-    }
-  else
-    vty_out (vty, "SSM group range : %s\n", range_str);
+	if (uj) {
+		json_object *json;
+		json = json_object_new_object();
+		json_object_string_add(json, "ssmGroups", range_str);
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	} else
+		vty_out(vty, "SSM group range : %s\n", range_str);
 }
 
 DEFUN (show_ip_pim_ssm_range,
@@ -4186,41 +4649,38 @@ DEFUN (show_ip_pim_ssm_range,
        "PIM group type\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  ip_pim_ssm_show_group_range(vty, uj);
+	u_char uj = use_json(argc, argv);
+	ip_pim_ssm_show_group_range(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
-static void
-ip_pim_ssm_show_group_type(struct vty *vty, u_char uj, const char *group)
+static void ip_pim_ssm_show_group_type(struct vty *vty, u_char uj,
+				       const char *group)
 {
-  struct in_addr group_addr;
-  const char *type_str;
-  int result;
+	struct in_addr group_addr;
+	const char *type_str;
+	int result;
 
-  result = inet_pton(AF_INET, group, &group_addr);
-  if (result <= 0)
-    type_str = "invalid";
-  else
-    {
-      if (pim_is_group_224_4 (group_addr))
-        type_str = pim_is_grp_ssm (group_addr)?"SSM":"ASM";
-      else
-        type_str = "not-multicast";
-    }
+	result = inet_pton(AF_INET, group, &group_addr);
+	if (result <= 0)
+		type_str = "invalid";
+	else {
+		if (pim_is_group_224_4(group_addr))
+			type_str = pim_is_grp_ssm(group_addr) ? "SSM" : "ASM";
+		else
+			type_str = "not-multicast";
+	}
 
-  if (uj)
-    {
-      json_object *json;
-      json = json_object_new_object();
-      json_object_string_add(json, "groupType", type_str);
-      vty_out (vty, "%s\n",
-                 json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-      json_object_free(json);
-    }
-  else
-    vty_out (vty, "Group type : %s\n", type_str);
+	if (uj) {
+		json_object *json;
+		json = json_object_new_object();
+		json_object_string_add(json, "groupType", type_str);
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	} else
+		vty_out(vty, "Group type : %s\n", type_str);
 }
 
 DEFUN (show_ip_pim_group_type,
@@ -4233,10 +4693,10 @@ DEFUN (show_ip_pim_group_type,
        "group address\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  ip_pim_ssm_show_group_type(vty, uj, argv[0]->arg);
+	u_char uj = use_json(argc, argv);
+	ip_pim_ssm_show_group_type(vty, uj, argv[0]->arg);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN_HIDDEN (ip_multicast_routing,
@@ -4245,7 +4705,7 @@ DEFUN_HIDDEN (ip_multicast_routing,
               IP_STR
               "Enable IP multicast forwarding\n")
 {
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN_HIDDEN (no_ip_multicast_routing,
@@ -4255,9 +4715,9 @@ DEFUN_HIDDEN (no_ip_multicast_routing,
               IP_STR
               "Enable IP multicast forwarding\n")
 {
-  vty_out (vty,
-             "Command is Disabled and will be removed in a future version\n");
-  return CMD_SUCCESS;
+	vty_out(vty,
+		"Command is Disabled and will be removed in a future version\n");
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_ssmpingd,
@@ -4267,26 +4727,26 @@ DEFUN (ip_ssmpingd,
        CONF_SSMPINGD_STR
        "Source address\n")
 {
-  int idx_ipv4 = 2;
-  int result;
-  struct in_addr source_addr;
-  const char *source_str = (argc == 3) ? argv[idx_ipv4]->arg : "0.0.0.0";
+	int idx_ipv4 = 2;
+	int result;
+	struct in_addr source_addr;
+	const char *source_str = (argc == 3) ? argv[idx_ipv4]->arg : "0.0.0.0";
 
-  result = inet_pton(AF_INET, source_str, &source_addr);
-  if (result <= 0) {
-    vty_out (vty, "%% Bad source address %s: errno=%d: %s\n",
-	    source_str, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	result = inet_pton(AF_INET, source_str, &source_addr);
+	if (result <= 0) {
+		vty_out(vty, "%% Bad source address %s: errno=%d: %s\n",
+			source_str, errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  result = pim_ssmpingd_start(source_addr);
-  if (result) {
-    vty_out (vty, "%% Failure starting ssmpingd for source %s: %d\n",
-	    source_str, result);
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	result = pim_ssmpingd_start(source_addr);
+	if (result) {
+		vty_out(vty, "%% Failure starting ssmpingd for source %s: %d\n",
+			source_str, result);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ip_ssmpingd,
@@ -4297,26 +4757,26 @@ DEFUN (no_ip_ssmpingd,
        CONF_SSMPINGD_STR
        "Source address\n")
 {
-  int idx_ipv4 = 3;
-  int result;
-  struct in_addr source_addr;
-  const char *source_str = (argc == 4) ? argv[idx_ipv4]->arg : "0.0.0.0";
+	int idx_ipv4 = 3;
+	int result;
+	struct in_addr source_addr;
+	const char *source_str = (argc == 4) ? argv[idx_ipv4]->arg : "0.0.0.0";
 
-  result = inet_pton(AF_INET, source_str, &source_addr);
-  if (result <= 0) {
-    vty_out (vty, "%% Bad source address %s: errno=%d: %s\n",
-	    source_str, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	result = inet_pton(AF_INET, source_str, &source_addr);
+	if (result <= 0) {
+		vty_out(vty, "%% Bad source address %s: errno=%d: %s\n",
+			source_str, errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  result = pim_ssmpingd_stop(source_addr);
-  if (result) {
-    vty_out (vty, "%% Failure stopping ssmpingd for source %s: %d\n",
-	    source_str, result);
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	result = pim_ssmpingd_stop(source_addr);
+	if (result) {
+		vty_out(vty, "%% Failure stopping ssmpingd for source %s: %d\n",
+			source_str, result);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_pim_ecmp,
@@ -4326,9 +4786,9 @@ DEFUN (ip_pim_ecmp,
        "pim multicast routing\n"
        "Enable PIM ECMP \n")
 {
-  qpim_ecmp_enable = 1;
+	qpim_ecmp_enable = 1;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ip_pim_ecmp,
@@ -4339,9 +4799,9 @@ DEFUN (no_ip_pim_ecmp,
        "pim multicast routing\n"
        "Disable PIM ECMP \n")
 {
-  qpim_ecmp_enable = 0;
+	qpim_ecmp_enable = 0;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_pim_ecmp_rebalance,
@@ -4352,10 +4812,10 @@ DEFUN (ip_pim_ecmp_rebalance,
        "Enable PIM ECMP \n"
        "Enable PIM ECMP Rebalance\n")
 {
-  qpim_ecmp_enable = 1;
-  qpim_ecmp_rebalance_enable = 1;
+	qpim_ecmp_enable = 1;
+	qpim_ecmp_rebalance_enable = 1;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ip_pim_ecmp_rebalance,
@@ -4367,48 +4827,41 @@ DEFUN (no_ip_pim_ecmp_rebalance,
        "Disable PIM ECMP \n"
        "Disable PIM ECMP Rebalance\n")
 {
-  qpim_ecmp_rebalance_enable = 0;
+	qpim_ecmp_rebalance_enable = 0;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
-static int
-pim_cmd_igmp_start (struct vty *vty, struct interface *ifp)
+static int pim_cmd_igmp_start(struct vty *vty, struct interface *ifp)
 {
-  struct pim_interface *pim_ifp;
-  uint8_t need_startup = 0;
+	struct pim_interface *pim_ifp;
+	uint8_t need_startup = 0;
 
-  pim_ifp = ifp->info;
+	pim_ifp = ifp->info;
 
-  if (!pim_ifp)
-    {
-      pim_ifp = pim_if_new(ifp, 1 /* igmp=true */, 0 /* pim=false */);
-      if (!pim_ifp)
-        {
-          vty_out (vty, "Could not enable IGMP on interface %s\n",
-	      ifp->name);
-          return CMD_WARNING_CONFIG_FAILED;
-        }
-      need_startup = 1;
-    }
-  else
-    {
-      if (!PIM_IF_TEST_IGMP(pim_ifp->options))
-        {
-          PIM_IF_DO_IGMP(pim_ifp->options);
-          need_startup = 1;
-        }
-    }
+	if (!pim_ifp) {
+		pim_ifp = pim_if_new(ifp, 1 /* igmp=true */, 0 /* pim=false */);
+		if (!pim_ifp) {
+			vty_out(vty, "Could not enable IGMP on interface %s\n",
+				ifp->name);
+			return CMD_WARNING_CONFIG_FAILED;
+		}
+		need_startup = 1;
+	} else {
+		if (!PIM_IF_TEST_IGMP(pim_ifp->options)) {
+			PIM_IF_DO_IGMP(pim_ifp->options);
+			need_startup = 1;
+		}
+	}
 
-  /* 'ip igmp' executed multiple times, with need_startup
-    avoid multiple if add all and membership refresh */
-  if (need_startup)
-    {
-      pim_if_addr_add_all(ifp);
-      pim_if_membership_refresh(ifp);
-    }
+	/* 'ip igmp' executed multiple times, with need_startup
+	  avoid multiple if add all and membership refresh */
+	if (need_startup) {
+		pim_if_addr_add_all(ifp);
+		pim_if_membership_refresh(ifp);
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_ip_igmp,
@@ -4417,9 +4870,9 @@ DEFUN (interface_ip_igmp,
        IP_STR
        IFACE_IGMP_STR)
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  return pim_cmd_igmp_start(vty, ifp);
+	return pim_cmd_igmp_start(vty, ifp);
 }
 
 DEFUN (interface_no_ip_igmp,
@@ -4429,23 +4882,23 @@ DEFUN (interface_no_ip_igmp,
        IP_STR
        IFACE_IGMP_STR)
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
 
-  if (!pim_ifp)
-    return CMD_SUCCESS;
+	if (!pim_ifp)
+		return CMD_SUCCESS;
 
-  PIM_IF_DONT_IGMP(pim_ifp->options);
+	PIM_IF_DONT_IGMP(pim_ifp->options);
 
-  pim_if_membership_clear(ifp);
+	pim_if_membership_clear(ifp);
 
-  pim_if_addr_del_all_igmp(ifp);
+	pim_if_addr_del_all_igmp(ifp);
 
-  if (!PIM_IF_TEST_PIM(pim_ifp->options)) {
-    pim_if_delete(ifp);
-  }
+	if (!PIM_IF_TEST_PIM(pim_ifp->options)) {
+		pim_if_delete(ifp);
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_ip_igmp_join,
@@ -4457,41 +4910,42 @@ DEFUN (interface_ip_igmp_join,
        "Multicast group address\n"
        "Source address\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  int idx_ipv4 = 3;
-  int idx_ipv4_2 = 4;
-  const char *group_str;
-  const char *source_str;
-  struct in_addr group_addr;
-  struct in_addr source_addr;
-  int result;
-
-  /* Group address */
-  group_str = argv[idx_ipv4]->arg;
-  result = inet_pton(AF_INET, group_str, &group_addr);
-  if (result <= 0) {
-    vty_out (vty, "Bad group address %s: errno=%d: %s\n",
-	    group_str, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-
-  /* Source address */
-  source_str = argv[idx_ipv4_2]->arg;
-  result = inet_pton(AF_INET, source_str, &source_addr);
-  if (result <= 0) {
-    vty_out (vty, "Bad source address %s: errno=%d: %s\n",
-	    source_str, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-
-  result = pim_if_igmp_join_add(ifp, group_addr, source_addr);
-  if (result) {
-    vty_out (vty, "%% Failure joining IGMP group %s source %s on interface %s: %d\n",
-	    group_str, source_str, ifp->name, result);
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-
-  return CMD_SUCCESS;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int idx_ipv4 = 3;
+	int idx_ipv4_2 = 4;
+	const char *group_str;
+	const char *source_str;
+	struct in_addr group_addr;
+	struct in_addr source_addr;
+	int result;
+
+	/* Group address */
+	group_str = argv[idx_ipv4]->arg;
+	result = inet_pton(AF_INET, group_str, &group_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad group address %s: errno=%d: %s\n", group_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	/* Source address */
+	source_str = argv[idx_ipv4_2]->arg;
+	result = inet_pton(AF_INET, source_str, &source_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad source address %s: errno=%d: %s\n",
+			source_str, errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	result = pim_if_igmp_join_add(ifp, group_addr, source_addr);
+	if (result) {
+		vty_out(vty,
+			"%% Failure joining IGMP group %s source %s on interface %s: %d\n",
+			group_str, source_str, ifp->name, result);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_no_ip_igmp_join,
@@ -4504,41 +4958,42 @@ DEFUN (interface_no_ip_igmp_join,
        "Multicast group address\n"
        "Source address\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  int idx_ipv4 = 4;
-  int idx_ipv4_2 = 5;
-  const char *group_str;
-  const char *source_str;
-  struct in_addr group_addr;
-  struct in_addr source_addr;
-  int result;
-
-  /* Group address */
-  group_str = argv[idx_ipv4]->arg;
-  result = inet_pton(AF_INET, group_str, &group_addr);
-  if (result <= 0) {
-    vty_out (vty, "Bad group address %s: errno=%d: %s\n",
-	    group_str, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-
-  /* Source address */
-  source_str = argv[idx_ipv4_2]->arg;
-  result = inet_pton(AF_INET, source_str, &source_addr);
-  if (result <= 0) {
-    vty_out (vty, "Bad source address %s: errno=%d: %s\n",
-	    source_str, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-
-  result = pim_if_igmp_join_del(ifp, group_addr, source_addr);
-  if (result) {
-    vty_out (vty, "%% Failure leaving IGMP group %s source %s on interface %s: %d\n",
-	    group_str, source_str, ifp->name, result);
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-
-  return CMD_SUCCESS;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int idx_ipv4 = 4;
+	int idx_ipv4_2 = 5;
+	const char *group_str;
+	const char *source_str;
+	struct in_addr group_addr;
+	struct in_addr source_addr;
+	int result;
+
+	/* Group address */
+	group_str = argv[idx_ipv4]->arg;
+	result = inet_pton(AF_INET, group_str, &group_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad group address %s: errno=%d: %s\n", group_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	/* Source address */
+	source_str = argv[idx_ipv4_2]->arg;
+	result = inet_pton(AF_INET, source_str, &source_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad source address %s: errno=%d: %s\n",
+			source_str, errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	result = pim_if_igmp_join_del(ifp, group_addr, source_addr);
+	if (result) {
+		vty_out(vty,
+			"%% Failure leaving IGMP group %s source %s on interface %s: %d\n",
+			group_str, source_str, ifp->name, result);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	return CMD_SUCCESS;
 }
 
 /*
@@ -4548,125 +5003,127 @@ DEFUN (interface_no_ip_igmp_join,
  */
 static void igmp_sock_query_interval_reconfig(struct igmp_sock *igmp)
 {
-  struct interface *ifp;
-  struct pim_interface *pim_ifp;
+	struct interface *ifp;
+	struct pim_interface *pim_ifp;
 
-  zassert(igmp);
+	zassert(igmp);
 
-  /* other querier present? */
+	/* other querier present? */
 
-  if (igmp->t_other_querier_timer)
-    return;
+	if (igmp->t_other_querier_timer)
+		return;
 
-  /* this is the querier */
+	/* this is the querier */
 
-  zassert(igmp->interface);
-  zassert(igmp->interface->info);
+	zassert(igmp->interface);
+	zassert(igmp->interface->info);
 
-  ifp = igmp->interface;
-  pim_ifp = ifp->info;
+	ifp = igmp->interface;
+	pim_ifp = ifp->info;
 
-  if (PIM_DEBUG_IGMP_TRACE) {
-    char ifaddr_str[INET_ADDRSTRLEN];
-    pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str, sizeof(ifaddr_str));
-    zlog_debug("%s: Querier %s on %s reconfig query_interval=%d",
-	       __PRETTY_FUNCTION__,
-	       ifaddr_str,
-	       ifp->name,
-	       pim_ifp->igmp_default_query_interval);
-  }
+	if (PIM_DEBUG_IGMP_TRACE) {
+		char ifaddr_str[INET_ADDRSTRLEN];
+		pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str,
+			       sizeof(ifaddr_str));
+		zlog_debug("%s: Querier %s on %s reconfig query_interval=%d",
+			   __PRETTY_FUNCTION__, ifaddr_str, ifp->name,
+			   pim_ifp->igmp_default_query_interval);
+	}
 
-  /*
-    igmp_startup_mode_on() will reset QQI:
+	/*
+	  igmp_startup_mode_on() will reset QQI:
 
-    igmp->querier_query_interval = pim_ifp->igmp_default_query_interval;
-  */
-  igmp_startup_mode_on(igmp);
+	  igmp->querier_query_interval = pim_ifp->igmp_default_query_interval;
+	*/
+	igmp_startup_mode_on(igmp);
 }
 
 static void igmp_sock_query_reschedule(struct igmp_sock *igmp)
 {
-  if (igmp->t_igmp_query_timer) {
-    /* other querier present */
-    zassert(igmp->t_igmp_query_timer);
-    zassert(!igmp->t_other_querier_timer);
+	if (igmp->t_igmp_query_timer) {
+		/* other querier present */
+		zassert(igmp->t_igmp_query_timer);
+		zassert(!igmp->t_other_querier_timer);
 
-    pim_igmp_general_query_off(igmp);
-    pim_igmp_general_query_on(igmp);
+		pim_igmp_general_query_off(igmp);
+		pim_igmp_general_query_on(igmp);
 
-    zassert(igmp->t_igmp_query_timer);
-    zassert(!igmp->t_other_querier_timer);
-  }
-  else {
-    /* this is the querier */
+		zassert(igmp->t_igmp_query_timer);
+		zassert(!igmp->t_other_querier_timer);
+	} else {
+		/* this is the querier */
 
-    zassert(!igmp->t_igmp_query_timer);
-    zassert(igmp->t_other_querier_timer);
+		zassert(!igmp->t_igmp_query_timer);
+		zassert(igmp->t_other_querier_timer);
 
-    pim_igmp_other_querier_timer_off(igmp);
-    pim_igmp_other_querier_timer_on(igmp);
+		pim_igmp_other_querier_timer_off(igmp);
+		pim_igmp_other_querier_timer_on(igmp);
 
-    zassert(!igmp->t_igmp_query_timer);
-    zassert(igmp->t_other_querier_timer);
-  }
+		zassert(!igmp->t_igmp_query_timer);
+		zassert(igmp->t_other_querier_timer);
+	}
 }
 
 static void change_query_interval(struct pim_interface *pim_ifp,
 				  int query_interval)
 {
-  struct listnode  *sock_node;
-  struct igmp_sock *igmp;
+	struct listnode *sock_node;
+	struct igmp_sock *igmp;
 
-  pim_ifp->igmp_default_query_interval = query_interval;
+	pim_ifp->igmp_default_query_interval = query_interval;
 
-  for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
-    igmp_sock_query_interval_reconfig(igmp);
-    igmp_sock_query_reschedule(igmp);
-  }
+	for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
+		igmp_sock_query_interval_reconfig(igmp);
+		igmp_sock_query_reschedule(igmp);
+	}
 }
 
 static void change_query_max_response_time(struct pim_interface *pim_ifp,
 					   int query_max_response_time_dsec)
 {
-  struct listnode  *sock_node;
-  struct igmp_sock *igmp;
-
-  pim_ifp->igmp_query_max_response_time_dsec = query_max_response_time_dsec;
-
-  /*
-    Below we modify socket/group/source timers in order to quickly
-    reflect the change. Otherwise, those timers would eventually catch
-    up.
-   */
-
-  /* scan all sockets */
-  for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
-    struct listnode   *grp_node;
-    struct igmp_group *grp;
-
-    /* reschedule socket general query */
-    igmp_sock_query_reschedule(igmp);
-
-    /* scan socket groups */
-    for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list, grp_node, grp)) {
-      struct listnode    *src_node;
-      struct igmp_source *src;
-
-      /* reset group timers for groups in EXCLUDE mode */
-      if (grp->group_filtermode_isexcl) {
-	igmp_group_reset_gmi(grp);
-      }
-
-      /* scan group sources */
-      for (ALL_LIST_ELEMENTS_RO(grp->group_source_list, src_node, src)) {
-
-	/* reset source timers for sources with running timers */
-	if (src->t_source_timer) {
-	  igmp_source_reset_gmi(igmp, grp, src);
+	struct listnode *sock_node;
+	struct igmp_sock *igmp;
+
+	pim_ifp->igmp_query_max_response_time_dsec =
+		query_max_response_time_dsec;
+
+	/*
+	  Below we modify socket/group/source timers in order to quickly
+	  reflect the change. Otherwise, those timers would eventually catch
+	  up.
+	 */
+
+	/* scan all sockets */
+	for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
+		struct listnode *grp_node;
+		struct igmp_group *grp;
+
+		/* reschedule socket general query */
+		igmp_sock_query_reschedule(igmp);
+
+		/* scan socket groups */
+		for (ALL_LIST_ELEMENTS_RO(igmp->igmp_group_list, grp_node,
+					  grp)) {
+			struct listnode *src_node;
+			struct igmp_source *src;
+
+			/* reset group timers for groups in EXCLUDE mode */
+			if (grp->group_filtermode_isexcl) {
+				igmp_group_reset_gmi(grp);
+			}
+
+			/* scan group sources */
+			for (ALL_LIST_ELEMENTS_RO(grp->group_source_list,
+						  src_node, src)) {
+
+				/* reset source timers for sources with running
+				 * timers */
+				if (src->t_source_timer) {
+					igmp_source_reset_gmi(igmp, grp, src);
+				}
+			}
+		}
 	}
-      }
-    }
-  }
 }
 
 #define IGMP_QUERY_INTERVAL_MIN (1)
@@ -4680,49 +5137,50 @@ DEFUN (interface_ip_igmp_query_interval,
        IFACE_IGMP_QUERY_INTERVAL_STR
        "Query interval in seconds\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
-  int query_interval;
-  int query_interval_dsec;
-  int ret;
-
-  if (!pim_ifp) {
-    ret = pim_cmd_igmp_start(vty, ifp);
-    if (ret != CMD_SUCCESS)
-      return ret;
-    pim_ifp = ifp->info;
-  }
-
-  query_interval = atoi(argv[3]->arg);
-  query_interval_dsec = 10 * query_interval;
-
-  /*
-    It seems we don't need to check bounds since command.c does it
-    already, but we verify them anyway for extra safety.
-  */
-  if (query_interval < IGMP_QUERY_INTERVAL_MIN) {
-    vty_out (vty, "General query interval %d lower than minimum %d\n",
-	    query_interval,
-	    IGMP_QUERY_INTERVAL_MIN);
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-  if (query_interval > IGMP_QUERY_INTERVAL_MAX) {
-    vty_out (vty, "General query interval %d higher than maximum %d\n",
-	    query_interval,
-	    IGMP_QUERY_INTERVAL_MAX);
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-
-  if (query_interval_dsec <= pim_ifp->igmp_query_max_response_time_dsec) {
-    vty_out (vty,
-	    "Can't set general query interval %d dsec <= query max response time %d dsec.\n",
-	    query_interval_dsec,pim_ifp->igmp_query_max_response_time_dsec);
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-
-  change_query_interval(pim_ifp, query_interval);
-
-  return CMD_SUCCESS;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
+	int query_interval;
+	int query_interval_dsec;
+	int ret;
+
+	if (!pim_ifp) {
+		ret = pim_cmd_igmp_start(vty, ifp);
+		if (ret != CMD_SUCCESS)
+			return ret;
+		pim_ifp = ifp->info;
+	}
+
+	query_interval = atoi(argv[3]->arg);
+	query_interval_dsec = 10 * query_interval;
+
+	/*
+	  It seems we don't need to check bounds since command.c does it
+	  already, but we verify them anyway for extra safety.
+	*/
+	if (query_interval < IGMP_QUERY_INTERVAL_MIN) {
+		vty_out(vty,
+			"General query interval %d lower than minimum %d\n",
+			query_interval, IGMP_QUERY_INTERVAL_MIN);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+	if (query_interval > IGMP_QUERY_INTERVAL_MAX) {
+		vty_out(vty,
+			"General query interval %d higher than maximum %d\n",
+			query_interval, IGMP_QUERY_INTERVAL_MAX);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	if (query_interval_dsec <= pim_ifp->igmp_query_max_response_time_dsec) {
+		vty_out(vty,
+			"Can't set general query interval %d dsec <= query max response time %d dsec.\n",
+			query_interval_dsec,
+			pim_ifp->igmp_query_max_response_time_dsec);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	change_query_interval(pim_ifp, query_interval);
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_no_ip_igmp_query_interval,
@@ -4733,26 +5191,27 @@ DEFUN (interface_no_ip_igmp_query_interval,
        IFACE_IGMP_STR
        IFACE_IGMP_QUERY_INTERVAL_STR)
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
-  int default_query_interval_dsec;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
+	int default_query_interval_dsec;
 
-  if (!pim_ifp)
-    return CMD_SUCCESS;
+	if (!pim_ifp)
+		return CMD_SUCCESS;
 
-  default_query_interval_dsec = IGMP_GENERAL_QUERY_INTERVAL * 10;
+	default_query_interval_dsec = IGMP_GENERAL_QUERY_INTERVAL * 10;
 
-  if (default_query_interval_dsec <= pim_ifp->igmp_query_max_response_time_dsec) {
-    vty_out (vty,
-	    "Can't set default general query interval %d dsec <= query max response time %d dsec.\n",
-	    default_query_interval_dsec,
-	    pim_ifp->igmp_query_max_response_time_dsec);
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	if (default_query_interval_dsec
+	    <= pim_ifp->igmp_query_max_response_time_dsec) {
+		vty_out(vty,
+			"Can't set default general query interval %d dsec <= query max response time %d dsec.\n",
+			default_query_interval_dsec,
+			pim_ifp->igmp_query_max_response_time_dsec);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  change_query_interval(pim_ifp, IGMP_GENERAL_QUERY_INTERVAL);
+	change_query_interval(pim_ifp, IGMP_GENERAL_QUERY_INTERVAL);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_ip_igmp_version,
@@ -4763,37 +5222,36 @@ DEFUN (interface_ip_igmp_version,
        "IGMP version\n"
        "IGMP version number\n")
 {
-  VTY_DECLVAR_CONTEXT(interface,ifp);
-  struct pim_interface *pim_ifp = ifp->info;
-  int igmp_version, old_version = 0;
-  int ret;
-
-  if (!pim_ifp)
-    {
-      ret = pim_cmd_igmp_start(vty, ifp);
-      if (ret != CMD_SUCCESS)
-        return ret;
-      pim_ifp = ifp->info;
-    }
-
-  igmp_version = atoi(argv[3]->arg);
-  old_version = pim_ifp->igmp_version;
-  pim_ifp->igmp_version = igmp_version;
-
-  //Check if IGMP is Enabled otherwise, enable on interface
-  if (!PIM_IF_TEST_IGMP (pim_ifp->options))
-    {
-      PIM_IF_DO_IGMP(pim_ifp->options);
-      pim_if_addr_add_all(ifp);
-      pim_if_membership_refresh(ifp);
-      old_version = igmp_version;   //avoid refreshing membership again.
-    }
-  /* Current and new version is different refresh existing
-     membership. Going from 3 -> 2 or 2 -> 3. */
-  if (old_version != igmp_version)
-    pim_if_membership_refresh(ifp);
-
-  return CMD_SUCCESS;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
+	int igmp_version, old_version = 0;
+	int ret;
+
+	if (!pim_ifp) {
+		ret = pim_cmd_igmp_start(vty, ifp);
+		if (ret != CMD_SUCCESS)
+			return ret;
+		pim_ifp = ifp->info;
+	}
+
+	igmp_version = atoi(argv[3]->arg);
+	old_version = pim_ifp->igmp_version;
+	pim_ifp->igmp_version = igmp_version;
+
+	// Check if IGMP is Enabled otherwise, enable on interface
+	if (!PIM_IF_TEST_IGMP(pim_ifp->options)) {
+		PIM_IF_DO_IGMP(pim_ifp->options);
+		pim_if_addr_add_all(ifp);
+		pim_if_membership_refresh(ifp);
+		old_version = igmp_version; // avoid refreshing membership
+					    // again.
+	}
+	/* Current and new version is different refresh existing
+	   membership. Going from 3 -> 2 or 2 -> 3. */
+	if (old_version != igmp_version)
+		pim_if_membership_refresh(ifp);
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_no_ip_igmp_version,
@@ -4805,15 +5263,15 @@ DEFUN (interface_no_ip_igmp_version,
        "IGMP version\n"
        "IGMP version number\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
 
-  if (!pim_ifp)
-    return CMD_SUCCESS;
+	if (!pim_ifp)
+		return CMD_SUCCESS;
 
-  pim_ifp->igmp_version = IGMP_DEFAULT_VERSION;
+	pim_ifp->igmp_version = IGMP_DEFAULT_VERSION;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 #define IGMP_QUERY_MAX_RESPONSE_TIME_MIN_DSEC (10)
@@ -4827,30 +5285,32 @@ DEFUN (interface_ip_igmp_query_max_response_time,
        IFACE_IGMP_QUERY_MAX_RESPONSE_TIME_STR
        "Query response value in deci-seconds\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
-  int query_max_response_time;
-  int ret;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
+	int query_max_response_time;
+	int ret;
 
-  if (!pim_ifp) {
-    ret = pim_cmd_igmp_start(vty, ifp);
-    if (ret != CMD_SUCCESS)
-      return ret;
-    pim_ifp = ifp->info;
-  }
+	if (!pim_ifp) {
+		ret = pim_cmd_igmp_start(vty, ifp);
+		if (ret != CMD_SUCCESS)
+			return ret;
+		pim_ifp = ifp->info;
+	}
 
-  query_max_response_time = atoi(argv[3]->arg);
+	query_max_response_time = atoi(argv[3]->arg);
 
-  if (query_max_response_time >= pim_ifp->igmp_default_query_interval * 10) {
-    vty_out (vty,
-	    "Can't set query max response time %d sec >= general query interval %d sec\n",
-	    query_max_response_time,pim_ifp->igmp_default_query_interval);
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	if (query_max_response_time
+	    >= pim_ifp->igmp_default_query_interval * 10) {
+		vty_out(vty,
+			"Can't set query max response time %d sec >= general query interval %d sec\n",
+			query_max_response_time,
+			pim_ifp->igmp_default_query_interval);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  change_query_max_response_time(pim_ifp, query_max_response_time);
+	change_query_max_response_time(pim_ifp, query_max_response_time);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_no_ip_igmp_query_max_response_time,
@@ -4862,15 +5322,16 @@ DEFUN (interface_no_ip_igmp_query_max_response_time,
        IFACE_IGMP_QUERY_MAX_RESPONSE_TIME_STR
        "Time for response in deci-seconds\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
 
-  if (!pim_ifp)
-    return CMD_SUCCESS;
+	if (!pim_ifp)
+		return CMD_SUCCESS;
 
-  change_query_max_response_time(pim_ifp, IGMP_QUERY_MAX_RESPONSE_TIME_DSEC);
+	change_query_max_response_time(pim_ifp,
+				       IGMP_QUERY_MAX_RESPONSE_TIME_DSEC);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 #define IGMP_QUERY_MAX_RESPONSE_TIME_MIN_DSEC (10)
@@ -4884,33 +5345,34 @@ DEFUN_HIDDEN (interface_ip_igmp_query_max_response_time_dsec,
 	      IFACE_IGMP_QUERY_MAX_RESPONSE_TIME_DSEC_STR
 	      "Query response value in deciseconds\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
-  int query_max_response_time_dsec;
-  int default_query_interval_dsec;
-  int ret;
-
-  if (!pim_ifp) {
-    ret = pim_cmd_igmp_start(vty, ifp);
-    if (ret != CMD_SUCCESS)
-      return ret;
-    pim_ifp = ifp->info;
-  }
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
+	int query_max_response_time_dsec;
+	int default_query_interval_dsec;
+	int ret;
+
+	if (!pim_ifp) {
+		ret = pim_cmd_igmp_start(vty, ifp);
+		if (ret != CMD_SUCCESS)
+			return ret;
+		pim_ifp = ifp->info;
+	}
 
-  query_max_response_time_dsec = atoi(argv[4]->arg);
+	query_max_response_time_dsec = atoi(argv[4]->arg);
 
-  default_query_interval_dsec = 10 * pim_ifp->igmp_default_query_interval;
+	default_query_interval_dsec = 10 * pim_ifp->igmp_default_query_interval;
 
-  if (query_max_response_time_dsec >= default_query_interval_dsec) {
-    vty_out (vty,
-	    "Can't set query max response time %d dsec >= general query interval %d dsec\n",
-	    query_max_response_time_dsec,default_query_interval_dsec);
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	if (query_max_response_time_dsec >= default_query_interval_dsec) {
+		vty_out(vty,
+			"Can't set query max response time %d dsec >= general query interval %d dsec\n",
+			query_max_response_time_dsec,
+			default_query_interval_dsec);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  change_query_max_response_time(pim_ifp, query_max_response_time_dsec);
+	change_query_max_response_time(pim_ifp, query_max_response_time_dsec);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN_HIDDEN (interface_no_ip_igmp_query_max_response_time_dsec,
@@ -4921,15 +5383,16 @@ DEFUN_HIDDEN (interface_no_ip_igmp_query_max_response_time_dsec,
 	      IFACE_IGMP_STR
 	      IFACE_IGMP_QUERY_MAX_RESPONSE_TIME_DSEC_STR)
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
 
-  if (!pim_ifp)
-    return CMD_SUCCESS;
+	if (!pim_ifp)
+		return CMD_SUCCESS;
 
-  change_query_max_response_time(pim_ifp, IGMP_QUERY_MAX_RESPONSE_TIME_DSEC);
+	change_query_max_response_time(pim_ifp,
+				       IGMP_QUERY_MAX_RESPONSE_TIME_DSEC);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_ip_pim_drprio,
@@ -4940,26 +5403,26 @@ DEFUN (interface_ip_pim_drprio,
        "Set the Designated Router Election Priority\n"
        "Value of the new DR Priority\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  int idx_number = 3;
-  struct pim_interface *pim_ifp = ifp->info;
-  uint32_t old_dr_prio;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int idx_number = 3;
+	struct pim_interface *pim_ifp = ifp->info;
+	uint32_t old_dr_prio;
 
-  if (!pim_ifp) {
-    vty_out (vty, "Please enable PIM on interface, first\n");
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	if (!pim_ifp) {
+		vty_out(vty, "Please enable PIM on interface, first\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  old_dr_prio = pim_ifp->pim_dr_priority;
+	old_dr_prio = pim_ifp->pim_dr_priority;
 
-  pim_ifp->pim_dr_priority = strtol(argv[idx_number]->arg, NULL, 10);
+	pim_ifp->pim_dr_priority = strtol(argv[idx_number]->arg, NULL, 10);
 
-  if (old_dr_prio != pim_ifp->pim_dr_priority) {
-    if (pim_if_dr_election(ifp))
-      pim_hello_restart_now(ifp);
-  }
+	if (old_dr_prio != pim_ifp->pim_dr_priority) {
+		if (pim_if_dr_election(ifp))
+			pim_hello_restart_now(ifp);
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_no_ip_pim_drprio,
@@ -4971,41 +5434,39 @@ DEFUN (interface_no_ip_pim_drprio,
        "Revert the Designated Router Priority to default\n"
        "Old Value of the Priority\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
 
-  if (!pim_ifp) {
-    vty_out (vty, "Pim not enabled on this interface\n");
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	if (!pim_ifp) {
+		vty_out(vty, "Pim not enabled on this interface\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  if (pim_ifp->pim_dr_priority != PIM_DEFAULT_DR_PRIORITY) {
-    pim_ifp->pim_dr_priority = PIM_DEFAULT_DR_PRIORITY;
-    if (pim_if_dr_election(ifp))
-      pim_hello_restart_now(ifp);
-  }
+	if (pim_ifp->pim_dr_priority != PIM_DEFAULT_DR_PRIORITY) {
+		pim_ifp->pim_dr_priority = PIM_DEFAULT_DR_PRIORITY;
+		if (pim_if_dr_election(ifp))
+			pim_hello_restart_now(ifp);
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
-static int
-pim_cmd_interface_add (struct interface *ifp)
+static int pim_cmd_interface_add(struct interface *ifp)
 {
-  struct pim_interface *pim_ifp = ifp->info;
+	struct pim_interface *pim_ifp = ifp->info;
 
-  if (!pim_ifp) {
-    pim_ifp = pim_if_new(ifp, 0 /* igmp=false */, 1 /* pim=true */);
-    if (!pim_ifp) {
-      return 0;
-    }
-  }
-  else {
-    PIM_IF_DO_PIM(pim_ifp->options);
-  }
+	if (!pim_ifp) {
+		pim_ifp = pim_if_new(ifp, 0 /* igmp=false */, 1 /* pim=true */);
+		if (!pim_ifp) {
+			return 0;
+		}
+	} else {
+		PIM_IF_DO_PIM(pim_ifp->options);
+	}
 
-  pim_if_addr_add_all(ifp);
-  pim_if_membership_refresh(ifp);
-  return 1;
+	pim_if_addr_add_all(ifp);
+	pim_if_membership_refresh(ifp);
+	return 1;
 }
 
 DEFUN_HIDDEN (interface_ip_pim_ssm,
@@ -5015,16 +5476,17 @@ DEFUN_HIDDEN (interface_ip_pim_ssm,
        PIM_STR
        IFACE_PIM_STR)
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  if (!pim_cmd_interface_add(ifp)) {
-    vty_out (vty, "Could not enable PIM SM on interface\n");
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	if (!pim_cmd_interface_add(ifp)) {
+		vty_out(vty, "Could not enable PIM SM on interface\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  vty_out(vty, "WARN: Enabled PIM SM on interface; configure PIM SSM "
-                 "range if needed\n");
-  return CMD_SUCCESS;
+	vty_out(vty,
+		"WARN: Enabled PIM SM on interface; configure PIM SSM "
+		"range if needed\n");
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_ip_pim_sm,
@@ -5034,41 +5496,40 @@ DEFUN (interface_ip_pim_sm,
        PIM_STR
        IFACE_PIM_SM_STR)
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  if (!pim_cmd_interface_add(ifp)) {
-    vty_out (vty, "Could not enable PIM SM on interface\n");
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	if (!pim_cmd_interface_add(ifp)) {
+		vty_out(vty, "Could not enable PIM SM on interface\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  pim_if_create_pimreg();
+	pim_if_create_pimreg();
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
-static int
-pim_cmd_interface_delete (struct interface *ifp)
+static int pim_cmd_interface_delete(struct interface *ifp)
 {
-  struct pim_interface *pim_ifp = ifp->info;
+	struct pim_interface *pim_ifp = ifp->info;
 
-  if (!pim_ifp)
-    return 1;
+	if (!pim_ifp)
+		return 1;
 
-  PIM_IF_DONT_PIM(pim_ifp->options);
+	PIM_IF_DONT_PIM(pim_ifp->options);
 
-  pim_if_membership_clear(ifp);
+	pim_if_membership_clear(ifp);
 
-  /*
-    pim_sock_delete() removes all neighbors from
-    pim_ifp->pim_neighbor_list.
-   */
-  pim_sock_delete(ifp, "pim unconfigured on interface");
+	/*
+	  pim_sock_delete() removes all neighbors from
+	  pim_ifp->pim_neighbor_list.
+	 */
+	pim_sock_delete(ifp, "pim unconfigured on interface");
 
-  if (!PIM_IF_TEST_IGMP(pim_ifp->options)) {
-    pim_if_addr_del_all(ifp);
-    pim_if_delete(ifp);
-  }
+	if (!PIM_IF_TEST_IGMP(pim_ifp->options)) {
+		pim_if_addr_del_all(ifp);
+		pim_if_delete(ifp);
+	}
 
-  return 1;
+	return 1;
 }
 
 DEFUN_HIDDEN (interface_no_ip_pim_ssm,
@@ -5079,13 +5540,13 @@ DEFUN_HIDDEN (interface_no_ip_pim_ssm,
        PIM_STR
        IFACE_PIM_STR)
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  if (!pim_cmd_interface_delete(ifp)) {
-    vty_out (vty, "Unable to delete interface information\n");
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	if (!pim_cmd_interface_delete(ifp)) {
+		vty_out(vty, "Unable to delete interface information\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_no_ip_pim_sm,
@@ -5096,13 +5557,13 @@ DEFUN (interface_no_ip_pim_sm,
        PIM_STR
        IFACE_PIM_SM_STR)
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  if (!pim_cmd_interface_delete(ifp)) {
-    vty_out (vty, "Unable to delete interface information\n");
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	if (!pim_cmd_interface_delete(ifp)) {
+		vty_out(vty, "Unable to delete interface information\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_ip_mroute,
@@ -5113,40 +5574,39 @@ DEFUN (interface_ip_mroute,
        "Outgoing interface name\n"
        "Group address\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, iif);
-  int idx_interface = 2;
-  int idx_ipv4 = 3;
-   struct interface *oif;
-   const char       *oifname;
-   const char       *grp_str;
-   struct in_addr    grp_addr;
-   struct in_addr    src_addr;
-   int               result;
-
-   oifname = argv[idx_interface]->arg;
-   oif = if_lookup_by_name(oifname, VRF_DEFAULT);
-   if (!oif) {
-     vty_out (vty, "No such interface name %s\n",
-        oifname);
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   grp_str = argv[idx_ipv4]->arg;
-   result = inet_pton(AF_INET, grp_str, &grp_addr);
-   if (result <= 0) {
-     vty_out (vty, "Bad group address %s: errno=%d: %s\n",
-        grp_str, errno, safe_strerror(errno));
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   src_addr.s_addr = INADDR_ANY;
-
-   if (pim_static_add(iif, oif, grp_addr, src_addr)) {
-      vty_out (vty, "Failed to add route\n");
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   return CMD_SUCCESS;
+	VTY_DECLVAR_CONTEXT(interface, iif);
+	int idx_interface = 2;
+	int idx_ipv4 = 3;
+	struct interface *oif;
+	const char *oifname;
+	const char *grp_str;
+	struct in_addr grp_addr;
+	struct in_addr src_addr;
+	int result;
+
+	oifname = argv[idx_interface]->arg;
+	oif = if_lookup_by_name(oifname, VRF_DEFAULT);
+	if (!oif) {
+		vty_out(vty, "No such interface name %s\n", oifname);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	grp_str = argv[idx_ipv4]->arg;
+	result = inet_pton(AF_INET, grp_str, &grp_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad group address %s: errno=%d: %s\n", grp_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	src_addr.s_addr = INADDR_ANY;
+
+	if (pim_static_add(iif, oif, grp_addr, src_addr)) {
+		vty_out(vty, "Failed to add route\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_ip_mroute_source,
@@ -5158,48 +5618,47 @@ DEFUN (interface_ip_mroute_source,
        "Group address\n"
        "Source address\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, iif);
-  int idx_interface = 2;
-  int idx_ipv4 = 3;
-  int idx_ipv4_2 = 4;
-   struct interface *oif;
-   const char       *oifname;
-   const char       *grp_str;
-   struct in_addr    grp_addr;
-   const char       *src_str;
-   struct in_addr    src_addr;
-   int               result;
-
-   oifname = argv[idx_interface]->arg;
-   oif = if_lookup_by_name(oifname, VRF_DEFAULT);
-   if (!oif) {
-     vty_out (vty, "No such interface name %s\n",
-        oifname);
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   grp_str = argv[idx_ipv4]->arg;
-   result = inet_pton(AF_INET, grp_str, &grp_addr);
-   if (result <= 0) {
-     vty_out (vty, "Bad group address %s: errno=%d: %s\n",
-        grp_str, errno, safe_strerror(errno));
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   src_str = argv[idx_ipv4_2]->arg;
-   result = inet_pton(AF_INET, src_str, &src_addr);
-   if (result <= 0) {
-     vty_out (vty, "Bad source address %s: errno=%d: %s\n",
-        src_str, errno, safe_strerror(errno));
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   if (pim_static_add(iif, oif, grp_addr, src_addr)) {
-      vty_out (vty, "Failed to add route\n");
-      return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   return CMD_SUCCESS;
+	VTY_DECLVAR_CONTEXT(interface, iif);
+	int idx_interface = 2;
+	int idx_ipv4 = 3;
+	int idx_ipv4_2 = 4;
+	struct interface *oif;
+	const char *oifname;
+	const char *grp_str;
+	struct in_addr grp_addr;
+	const char *src_str;
+	struct in_addr src_addr;
+	int result;
+
+	oifname = argv[idx_interface]->arg;
+	oif = if_lookup_by_name(oifname, VRF_DEFAULT);
+	if (!oif) {
+		vty_out(vty, "No such interface name %s\n", oifname);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	grp_str = argv[idx_ipv4]->arg;
+	result = inet_pton(AF_INET, grp_str, &grp_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad group address %s: errno=%d: %s\n", grp_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	src_str = argv[idx_ipv4_2]->arg;
+	result = inet_pton(AF_INET, src_str, &src_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad source address %s: errno=%d: %s\n", src_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	if (pim_static_add(iif, oif, grp_addr, src_addr)) {
+		vty_out(vty, "Failed to add route\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_no_ip_mroute,
@@ -5211,40 +5670,39 @@ DEFUN (interface_no_ip_mroute,
        "Outgoing interface name\n"
        "Group Address\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, iif);
-  int idx_interface = 3;
-  int idx_ipv4 = 4;
-   struct interface *oif;
-   const char       *oifname;
-   const char       *grp_str;
-   struct in_addr    grp_addr;
-   struct in_addr    src_addr;
-   int               result;
-
-   oifname = argv[idx_interface]->arg;
-   oif = if_lookup_by_name(oifname, VRF_DEFAULT);
-   if (!oif) {
-     vty_out (vty, "No such interface name %s\n",
-        oifname);
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   grp_str = argv[idx_ipv4]->arg;
-   result = inet_pton(AF_INET, grp_str, &grp_addr);
-   if (result <= 0) {
-     vty_out (vty, "Bad group address %s: errno=%d: %s\n",
-        grp_str, errno, safe_strerror(errno));
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   src_addr.s_addr = INADDR_ANY;
-
-   if (pim_static_del(iif, oif, grp_addr, src_addr)) {
-      vty_out (vty, "Failed to remove route\n");
-      return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   return CMD_SUCCESS;
+	VTY_DECLVAR_CONTEXT(interface, iif);
+	int idx_interface = 3;
+	int idx_ipv4 = 4;
+	struct interface *oif;
+	const char *oifname;
+	const char *grp_str;
+	struct in_addr grp_addr;
+	struct in_addr src_addr;
+	int result;
+
+	oifname = argv[idx_interface]->arg;
+	oif = if_lookup_by_name(oifname, VRF_DEFAULT);
+	if (!oif) {
+		vty_out(vty, "No such interface name %s\n", oifname);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	grp_str = argv[idx_ipv4]->arg;
+	result = inet_pton(AF_INET, grp_str, &grp_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad group address %s: errno=%d: %s\n", grp_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	src_addr.s_addr = INADDR_ANY;
+
+	if (pim_static_del(iif, oif, grp_addr, src_addr)) {
+		vty_out(vty, "Failed to remove route\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_no_ip_mroute_source,
@@ -5257,48 +5715,47 @@ DEFUN (interface_no_ip_mroute_source,
        "Group Address\n"
        "Source Address\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, iif);
-  int idx_interface = 3;
-  int idx_ipv4 = 4;
-  int idx_ipv4_2 = 5;
-   struct interface *oif;
-   const char       *oifname;
-   const char       *grp_str;
-   struct in_addr    grp_addr;
-   const char       *src_str;
-   struct in_addr    src_addr;
-   int               result;
-
-   oifname = argv[idx_interface]->arg;
-   oif = if_lookup_by_name(oifname, VRF_DEFAULT);
-   if (!oif) {
-     vty_out (vty, "No such interface name %s\n",
-        oifname);
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   grp_str = argv[idx_ipv4]->arg;
-   result = inet_pton(AF_INET, grp_str, &grp_addr);
-   if (result <= 0) {
-     vty_out (vty, "Bad group address %s: errno=%d: %s\n",
-        grp_str, errno, safe_strerror(errno));
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   src_str = argv[idx_ipv4_2]->arg;
-   result = inet_pton(AF_INET, src_str, &src_addr);
-   if (result <= 0) {
-     vty_out (vty, "Bad source address %s: errno=%d: %s\n",
-        src_str, errno, safe_strerror(errno));
-     return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   if (pim_static_del(iif, oif, grp_addr, src_addr)) {
-      vty_out (vty, "Failed to remove route\n");
-      return CMD_WARNING_CONFIG_FAILED;
-   }
-
-   return CMD_SUCCESS;
+	VTY_DECLVAR_CONTEXT(interface, iif);
+	int idx_interface = 3;
+	int idx_ipv4 = 4;
+	int idx_ipv4_2 = 5;
+	struct interface *oif;
+	const char *oifname;
+	const char *grp_str;
+	struct in_addr grp_addr;
+	const char *src_str;
+	struct in_addr src_addr;
+	int result;
+
+	oifname = argv[idx_interface]->arg;
+	oif = if_lookup_by_name(oifname, VRF_DEFAULT);
+	if (!oif) {
+		vty_out(vty, "No such interface name %s\n", oifname);
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	grp_str = argv[idx_ipv4]->arg;
+	result = inet_pton(AF_INET, grp_str, &grp_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad group address %s: errno=%d: %s\n", grp_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	src_str = argv[idx_ipv4_2]->arg;
+	result = inet_pton(AF_INET, src_str, &src_addr);
+	if (result <= 0) {
+		vty_out(vty, "Bad source address %s: errno=%d: %s\n", src_str,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	if (pim_static_del(iif, oif, grp_addr, src_addr)) {
+		vty_out(vty, "Failed to remove route\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	return CMD_SUCCESS;
 }
 
 DEFUN (interface_ip_pim_hello,
@@ -5310,31 +5767,29 @@ DEFUN (interface_ip_pim_hello,
        IFACE_PIM_HELLO_TIME_STR
        IFACE_PIM_HELLO_HOLD_STR)
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  int idx_time = 3;
-  int idx_hold = 4;
-  struct pim_interface *pim_ifp = ifp->info;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int idx_time = 3;
+	int idx_hold = 4;
+	struct pim_interface *pim_ifp = ifp->info;
 
-  if (!pim_ifp)
-    {
-      if (!pim_cmd_interface_add(ifp))
-        {
-          vty_out (vty, "Could not enable PIM SM on interface\n");
-          return CMD_WARNING_CONFIG_FAILED;
-        }
-    }
+	if (!pim_ifp) {
+		if (!pim_cmd_interface_add(ifp)) {
+			vty_out(vty, "Could not enable PIM SM on interface\n");
+			return CMD_WARNING_CONFIG_FAILED;
+		}
+	}
 
-  pim_ifp = ifp->info;
-  pim_ifp->pim_hello_period = strtol(argv[idx_time]->arg, NULL, 10);
+	pim_ifp = ifp->info;
+	pim_ifp->pim_hello_period = strtol(argv[idx_time]->arg, NULL, 10);
 
-  if (argc == idx_hold + 1)
-    pim_ifp->pim_default_holdtime = strtol(argv[idx_hold]->arg, NULL, 10);
+	if (argc == idx_hold + 1)
+		pim_ifp->pim_default_holdtime =
+			strtol(argv[idx_hold]->arg, NULL, 10);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 
-
 DEFUN (interface_no_ip_pim_hello,
        interface_no_ip_pim_hello_cmd,
        "no ip pim hello [(1-180) (1-180)]",
@@ -5345,18 +5800,18 @@ DEFUN (interface_no_ip_pim_hello,
        IFACE_PIM_HELLO_TIME_STR
        IFACE_PIM_HELLO_HOLD_STR)
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
 
-  if (!pim_ifp) {
-    vty_out (vty, "Pim not enabled on this interface\n");
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	if (!pim_ifp) {
+		vty_out(vty, "Pim not enabled on this interface\n");
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  pim_ifp->pim_hello_period     = PIM_DEFAULT_HELLO_PERIOD;
-  pim_ifp->pim_default_holdtime = -1;
+	pim_ifp->pim_hello_period = PIM_DEFAULT_HELLO_PERIOD;
+	pim_ifp->pim_default_holdtime = -1;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (debug_igmp,
@@ -5365,10 +5820,10 @@ DEFUN (debug_igmp,
        DEBUG_STR
        DEBUG_IGMP_STR)
 {
-  PIM_DO_DEBUG_IGMP_EVENTS;
-  PIM_DO_DEBUG_IGMP_PACKETS;
-  PIM_DO_DEBUG_IGMP_TRACE;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_IGMP_EVENTS;
+	PIM_DO_DEBUG_IGMP_PACKETS;
+	PIM_DO_DEBUG_IGMP_TRACE;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_igmp,
@@ -5378,10 +5833,10 @@ DEFUN (no_debug_igmp,
        DEBUG_STR
        DEBUG_IGMP_STR)
 {
-  PIM_DONT_DEBUG_IGMP_EVENTS;
-  PIM_DONT_DEBUG_IGMP_PACKETS;
-  PIM_DONT_DEBUG_IGMP_TRACE;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_IGMP_EVENTS;
+	PIM_DONT_DEBUG_IGMP_PACKETS;
+	PIM_DONT_DEBUG_IGMP_TRACE;
+	return CMD_SUCCESS;
 }
 
 
@@ -5392,8 +5847,8 @@ DEFUN (debug_igmp_events,
        DEBUG_IGMP_STR
        DEBUG_IGMP_EVENTS_STR)
 {
-  PIM_DO_DEBUG_IGMP_EVENTS;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_IGMP_EVENTS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_igmp_events,
@@ -5404,8 +5859,8 @@ DEFUN (no_debug_igmp_events,
        DEBUG_IGMP_STR
        DEBUG_IGMP_EVENTS_STR)
 {
-  PIM_DONT_DEBUG_IGMP_EVENTS;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_IGMP_EVENTS;
+	return CMD_SUCCESS;
 }
 
 
@@ -5416,8 +5871,8 @@ DEFUN (debug_igmp_packets,
        DEBUG_IGMP_STR
        DEBUG_IGMP_PACKETS_STR)
 {
-  PIM_DO_DEBUG_IGMP_PACKETS;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_IGMP_PACKETS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_igmp_packets,
@@ -5428,8 +5883,8 @@ DEFUN (no_debug_igmp_packets,
        DEBUG_IGMP_STR
        DEBUG_IGMP_PACKETS_STR)
 {
-  PIM_DONT_DEBUG_IGMP_PACKETS;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_IGMP_PACKETS;
+	return CMD_SUCCESS;
 }
 
 
@@ -5440,8 +5895,8 @@ DEFUN (debug_igmp_trace,
        DEBUG_IGMP_STR
        DEBUG_IGMP_TRACE_STR)
 {
-  PIM_DO_DEBUG_IGMP_TRACE;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_IGMP_TRACE;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_igmp_trace,
@@ -5452,8 +5907,8 @@ DEFUN (no_debug_igmp_trace,
        DEBUG_IGMP_STR
        DEBUG_IGMP_TRACE_STR)
 {
-  PIM_DONT_DEBUG_IGMP_TRACE;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_IGMP_TRACE;
+	return CMD_SUCCESS;
 }
 
 
@@ -5463,8 +5918,8 @@ DEFUN (debug_mroute,
        DEBUG_STR
        DEBUG_MROUTE_STR)
 {
-  PIM_DO_DEBUG_MROUTE;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_MROUTE;
+	return CMD_SUCCESS;
 }
 
 DEFUN (debug_mroute_detail,
@@ -5474,8 +5929,8 @@ DEFUN (debug_mroute_detail,
        DEBUG_MROUTE_STR
        "detailed\n")
 {
-  PIM_DO_DEBUG_MROUTE_DETAIL;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_MROUTE_DETAIL;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_mroute,
@@ -5485,8 +5940,8 @@ DEFUN (no_debug_mroute,
        DEBUG_STR
        DEBUG_MROUTE_STR)
 {
-  PIM_DONT_DEBUG_MROUTE;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_MROUTE;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_mroute_detail,
@@ -5497,8 +5952,8 @@ DEFUN (no_debug_mroute_detail,
        DEBUG_MROUTE_STR
        "detailed\n")
 {
-  PIM_DONT_DEBUG_MROUTE_DETAIL;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_MROUTE_DETAIL;
+	return CMD_SUCCESS;
 }
 
 DEFUN (debug_static,
@@ -5507,8 +5962,8 @@ DEFUN (debug_static,
        DEBUG_STR
        DEBUG_STATIC_STR)
 {
-  PIM_DO_DEBUG_STATIC;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_STATIC;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_static,
@@ -5518,8 +5973,8 @@ DEFUN (no_debug_static,
        DEBUG_STR
        DEBUG_STATIC_STR)
 {
-  PIM_DONT_DEBUG_STATIC;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_STATIC;
+	return CMD_SUCCESS;
 }
 
 
@@ -5529,12 +5984,12 @@ DEFUN (debug_pim,
        DEBUG_STR
        DEBUG_PIM_STR)
 {
-  PIM_DO_DEBUG_PIM_EVENTS;
-  PIM_DO_DEBUG_PIM_PACKETS;
-  PIM_DO_DEBUG_PIM_TRACE;
-  PIM_DO_DEBUG_MSDP_EVENTS;
-  PIM_DO_DEBUG_MSDP_PACKETS;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_PIM_EVENTS;
+	PIM_DO_DEBUG_PIM_PACKETS;
+	PIM_DO_DEBUG_PIM_TRACE;
+	PIM_DO_DEBUG_MSDP_EVENTS;
+	PIM_DO_DEBUG_MSDP_PACKETS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_pim,
@@ -5544,16 +5999,16 @@ DEFUN (no_debug_pim,
        DEBUG_STR
        DEBUG_PIM_STR)
 {
-  PIM_DONT_DEBUG_PIM_EVENTS;
-  PIM_DONT_DEBUG_PIM_PACKETS;
-  PIM_DONT_DEBUG_PIM_TRACE;
-  PIM_DONT_DEBUG_MSDP_EVENTS;
-  PIM_DONT_DEBUG_MSDP_PACKETS;
+	PIM_DONT_DEBUG_PIM_EVENTS;
+	PIM_DONT_DEBUG_PIM_PACKETS;
+	PIM_DONT_DEBUG_PIM_TRACE;
+	PIM_DONT_DEBUG_MSDP_EVENTS;
+	PIM_DONT_DEBUG_MSDP_PACKETS;
 
-  PIM_DONT_DEBUG_PIM_PACKETDUMP_SEND;
-  PIM_DONT_DEBUG_PIM_PACKETDUMP_RECV;
+	PIM_DONT_DEBUG_PIM_PACKETDUMP_SEND;
+	PIM_DONT_DEBUG_PIM_PACKETDUMP_RECV;
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 
@@ -5564,8 +6019,8 @@ DEFUN (debug_pim_events,
        DEBUG_PIM_STR
        DEBUG_PIM_EVENTS_STR)
 {
-  PIM_DO_DEBUG_PIM_EVENTS;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_PIM_EVENTS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_pim_events,
@@ -5576,8 +6031,8 @@ DEFUN (no_debug_pim_events,
        DEBUG_PIM_STR
        DEBUG_PIM_EVENTS_STR)
 {
-  PIM_DONT_DEBUG_PIM_EVENTS;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_PIM_EVENTS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (debug_pim_packets,
@@ -5590,28 +6045,21 @@ DEFUN (debug_pim_packets,
        DEBUG_PIM_J_P_PACKETS_STR
        DEBUG_PIM_PIM_REG_PACKETS_STR)
 {
-  int idx = 0;
-  if (argv_find (argv, argc, "hello", &idx))
-    {
-      PIM_DO_DEBUG_PIM_HELLO;
-      vty_out (vty, "PIM Hello debugging is on\n");
-    }
-  else if (argv_find (argv, argc ,"joins", &idx))
-    {
-      PIM_DO_DEBUG_PIM_J_P;
-      vty_out (vty, "PIM Join/Prune debugging is on\n");
-    }
-  else if (argv_find (argv, argc, "register", &idx))
-    {
-      PIM_DO_DEBUG_PIM_REG;
-      vty_out (vty, "PIM Register debugging is on\n");
-    }
-  else
-    {
-      PIM_DO_DEBUG_PIM_PACKETS;
-      vty_out (vty, "PIM Packet debugging is on \n");
-    }
-  return CMD_SUCCESS;
+	int idx = 0;
+	if (argv_find(argv, argc, "hello", &idx)) {
+		PIM_DO_DEBUG_PIM_HELLO;
+		vty_out(vty, "PIM Hello debugging is on\n");
+	} else if (argv_find(argv, argc, "joins", &idx)) {
+		PIM_DO_DEBUG_PIM_J_P;
+		vty_out(vty, "PIM Join/Prune debugging is on\n");
+	} else if (argv_find(argv, argc, "register", &idx)) {
+		PIM_DO_DEBUG_PIM_REG;
+		vty_out(vty, "PIM Register debugging is on\n");
+	} else {
+		PIM_DO_DEBUG_PIM_PACKETS;
+		vty_out(vty, "PIM Packet debugging is on \n");
+	}
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_pim_packets,
@@ -5625,26 +6073,20 @@ DEFUN (no_debug_pim_packets,
        DEBUG_PIM_J_P_PACKETS_STR
        DEBUG_PIM_PIM_REG_PACKETS_STR)
 {
-  int idx = 0;
-  if (argv_find (argv, argc,"hello",&idx))
-    {
-      PIM_DONT_DEBUG_PIM_HELLO;
-      vty_out (vty, "PIM Hello debugging is off \n");
-    }
-  else if (argv_find (argv, argc, "joins", &idx))
-    {
-      PIM_DONT_DEBUG_PIM_J_P;
-      vty_out (vty, "PIM Join/Prune debugging is off \n");
-    }
-  else if (argv_find (argv, argc, "register", &idx))
-    {
-      PIM_DONT_DEBUG_PIM_REG;
-      vty_out (vty, "PIM Register debugging is off\n");
-    }
-  else
-    PIM_DONT_DEBUG_PIM_PACKETS;
-
-  return CMD_SUCCESS;
+	int idx = 0;
+	if (argv_find(argv, argc, "hello", &idx)) {
+		PIM_DONT_DEBUG_PIM_HELLO;
+		vty_out(vty, "PIM Hello debugging is off \n");
+	} else if (argv_find(argv, argc, "joins", &idx)) {
+		PIM_DONT_DEBUG_PIM_J_P;
+		vty_out(vty, "PIM Join/Prune debugging is off \n");
+	} else if (argv_find(argv, argc, "register", &idx)) {
+		PIM_DONT_DEBUG_PIM_REG;
+		vty_out(vty, "PIM Register debugging is off\n");
+	} else
+		PIM_DONT_DEBUG_PIM_PACKETS;
+
+	return CMD_SUCCESS;
 }
 
 
@@ -5656,8 +6098,8 @@ DEFUN (debug_pim_packetdump_send,
        DEBUG_PIM_PACKETDUMP_STR
        DEBUG_PIM_PACKETDUMP_SEND_STR)
 {
-  PIM_DO_DEBUG_PIM_PACKETDUMP_SEND;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_PIM_PACKETDUMP_SEND;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_pim_packetdump_send,
@@ -5669,8 +6111,8 @@ DEFUN (no_debug_pim_packetdump_send,
        DEBUG_PIM_PACKETDUMP_STR
        DEBUG_PIM_PACKETDUMP_SEND_STR)
 {
-  PIM_DONT_DEBUG_PIM_PACKETDUMP_SEND;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_PIM_PACKETDUMP_SEND;
+	return CMD_SUCCESS;
 }
 
 
@@ -5682,8 +6124,8 @@ DEFUN (debug_pim_packetdump_recv,
        DEBUG_PIM_PACKETDUMP_STR
        DEBUG_PIM_PACKETDUMP_RECV_STR)
 {
-  PIM_DO_DEBUG_PIM_PACKETDUMP_RECV;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_PIM_PACKETDUMP_RECV;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_pim_packetdump_recv,
@@ -5695,8 +6137,8 @@ DEFUN (no_debug_pim_packetdump_recv,
        DEBUG_PIM_PACKETDUMP_STR
        DEBUG_PIM_PACKETDUMP_RECV_STR)
 {
-  PIM_DONT_DEBUG_PIM_PACKETDUMP_RECV;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_PIM_PACKETDUMP_RECV;
+	return CMD_SUCCESS;
 }
 
 
@@ -5707,8 +6149,8 @@ DEFUN (debug_pim_trace,
        DEBUG_PIM_STR
        DEBUG_PIM_TRACE_STR)
 {
-  PIM_DO_DEBUG_PIM_TRACE;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_PIM_TRACE;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_pim_trace,
@@ -5719,8 +6161,8 @@ DEFUN (no_debug_pim_trace,
        DEBUG_PIM_STR
        DEBUG_PIM_TRACE_STR)
 {
-  PIM_DONT_DEBUG_PIM_TRACE;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_PIM_TRACE;
+	return CMD_SUCCESS;
 }
 
 
@@ -5730,8 +6172,8 @@ DEFUN (debug_ssmpingd,
        DEBUG_STR
        DEBUG_SSMPINGD_STR)
 {
-  PIM_DO_DEBUG_SSMPINGD;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_SSMPINGD;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_ssmpingd,
@@ -5741,8 +6183,8 @@ DEFUN (no_debug_ssmpingd,
        DEBUG_STR
        DEBUG_SSMPINGD_STR)
 {
-  PIM_DONT_DEBUG_SSMPINGD;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_SSMPINGD;
+	return CMD_SUCCESS;
 }
 
 
@@ -5753,8 +6195,8 @@ DEFUN (debug_pim_zebra,
        DEBUG_PIM_STR
        DEBUG_PIM_ZEBRA_STR)
 {
-  PIM_DO_DEBUG_ZEBRA;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_ZEBRA;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_pim_zebra,
@@ -5765,8 +6207,8 @@ DEFUN (no_debug_pim_zebra,
        DEBUG_PIM_STR
        DEBUG_PIM_ZEBRA_STR)
 {
-  PIM_DONT_DEBUG_ZEBRA;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_ZEBRA;
+	return CMD_SUCCESS;
 }
 
 
@@ -5776,9 +6218,9 @@ DEFUN (debug_msdp,
        DEBUG_STR
        DEBUG_MSDP_STR)
 {
-  PIM_DO_DEBUG_MSDP_EVENTS;
-  PIM_DO_DEBUG_MSDP_PACKETS;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_MSDP_EVENTS;
+	PIM_DO_DEBUG_MSDP_PACKETS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_msdp,
@@ -5788,16 +6230,13 @@ DEFUN (no_debug_msdp,
        DEBUG_STR
        DEBUG_MSDP_STR)
 {
-  PIM_DONT_DEBUG_MSDP_EVENTS;
-  PIM_DONT_DEBUG_MSDP_PACKETS;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_MSDP_EVENTS;
+	PIM_DONT_DEBUG_MSDP_PACKETS;
+	return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_msdp,
-       undebug_msdp_cmd,
-       "undebug msdp",
-       UNDEBUG_STR
-       DEBUG_MSDP_STR)
+ALIAS(no_debug_msdp, undebug_msdp_cmd, "undebug msdp",
+      UNDEBUG_STR DEBUG_MSDP_STR)
 
 DEFUN (debug_msdp_events,
        debug_msdp_events_cmd,
@@ -5806,8 +6245,8 @@ DEFUN (debug_msdp_events,
        DEBUG_MSDP_STR
        DEBUG_MSDP_EVENTS_STR)
 {
-  PIM_DO_DEBUG_MSDP_EVENTS;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_MSDP_EVENTS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_msdp_events,
@@ -5818,16 +6257,12 @@ DEFUN (no_debug_msdp_events,
        DEBUG_MSDP_STR
        DEBUG_MSDP_EVENTS_STR)
 {
-  PIM_DONT_DEBUG_MSDP_EVENTS;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_MSDP_EVENTS;
+	return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_msdp_events,
-       undebug_msdp_events_cmd,
-       "undebug msdp events",
-       UNDEBUG_STR
-       DEBUG_MSDP_STR
-       DEBUG_MSDP_EVENTS_STR)
+ALIAS(no_debug_msdp_events, undebug_msdp_events_cmd, "undebug msdp events",
+      UNDEBUG_STR DEBUG_MSDP_STR DEBUG_MSDP_EVENTS_STR)
 
 DEFUN (debug_msdp_packets,
        debug_msdp_packets_cmd,
@@ -5836,8 +6271,8 @@ DEFUN (debug_msdp_packets,
        DEBUG_MSDP_STR
        DEBUG_MSDP_PACKETS_STR)
 {
-  PIM_DO_DEBUG_MSDP_PACKETS;
-  return CMD_SUCCESS;
+	PIM_DO_DEBUG_MSDP_PACKETS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_msdp_packets,
@@ -5848,16 +6283,12 @@ DEFUN (no_debug_msdp_packets,
        DEBUG_MSDP_STR
        DEBUG_MSDP_PACKETS_STR)
 {
-  PIM_DONT_DEBUG_MSDP_PACKETS;
-  return CMD_SUCCESS;
+	PIM_DONT_DEBUG_MSDP_PACKETS;
+	return CMD_SUCCESS;
 }
 
-ALIAS (no_debug_msdp_packets,
-       undebug_msdp_packets_cmd,
-       "undebug msdp packets",
-       UNDEBUG_STR
-       DEBUG_MSDP_STR
-       DEBUG_MSDP_PACKETS_STR)
+ALIAS(no_debug_msdp_packets, undebug_msdp_packets_cmd, "undebug msdp packets",
+      UNDEBUG_STR DEBUG_MSDP_STR DEBUG_MSDP_PACKETS_STR)
 
 DEFUN (show_debugging_pim,
        show_debugging_pim_cmd,
@@ -5866,39 +6297,38 @@ DEFUN (show_debugging_pim,
        DEBUG_STR
        PIM_STR)
 {
-  pim_debug_config_write(vty);
-  return CMD_SUCCESS;
+	pim_debug_config_write(vty);
+	return CMD_SUCCESS;
 }
 
-static int
-interface_pim_use_src_cmd_worker(struct vty *vty, const char *source)
+static int interface_pim_use_src_cmd_worker(struct vty *vty, const char *source)
 {
-  int result;
-  struct in_addr source_addr;
-  VTY_DECLVAR_CONTEXT(interface, ifp);
+	int result;
+	struct in_addr source_addr;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
 
-  result = inet_pton(AF_INET, source, &source_addr);
-  if (result <= 0) {
-    vty_out (vty, "%% Bad source address %s: errno=%d: %s\n",
-        source, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	result = inet_pton(AF_INET, source, &source_addr);
+	if (result <= 0) {
+		vty_out(vty, "%% Bad source address %s: errno=%d: %s\n", source,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  result = pim_update_source_set(ifp, source_addr);
-  switch (result) {
-    case PIM_SUCCESS:
-      break;
-   case PIM_IFACE_NOT_FOUND:
-      vty_out (vty, "Pim not enabled on this interface\n");
-      break;
-    case PIM_UPDATE_SOURCE_DUP:
-      vty_out (vty, "%% Source already set to %s\n", source);
-      break;
-    default:
-      vty_out (vty, "%% Source set failed\n");
-  }
+	result = pim_update_source_set(ifp, source_addr);
+	switch (result) {
+	case PIM_SUCCESS:
+		break;
+	case PIM_IFACE_NOT_FOUND:
+		vty_out(vty, "Pim not enabled on this interface\n");
+		break;
+	case PIM_UPDATE_SOURCE_DUP:
+		vty_out(vty, "%% Source already set to %s\n", source);
+		break;
+	default:
+		vty_out(vty, "%% Source set failed\n");
+	}
 
-  return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
+	return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
 }
 
 DEFUN (interface_pim_use_source,
@@ -5909,7 +6339,7 @@ DEFUN (interface_pim_use_source,
        "Configure primary IP address\n"
        "source ip address\n")
 {
-  return interface_pim_use_src_cmd_worker (vty, argv[3]->arg);
+	return interface_pim_use_src_cmd_worker(vty, argv[3]->arg);
 }
 
 DEFUN (interface_no_pim_use_source,
@@ -5920,7 +6350,7 @@ DEFUN (interface_no_pim_use_source,
        "pim multicast routing\n"
        "Delete source IP address\n")
 {
-  return interface_pim_use_src_cmd_worker (vty, "0.0.0.0");
+	return interface_pim_use_src_cmd_worker(vty, "0.0.0.0");
 }
 
 DEFUN (ip_pim_bfd,
@@ -5930,19 +6360,19 @@ DEFUN (ip_pim_bfd,
        PIM_STR
        "Enables BFD support\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
-  struct bfd_info *bfd_info = NULL;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
+	struct bfd_info *bfd_info = NULL;
 
-  if (!pim_ifp)
-    return CMD_SUCCESS;
-  bfd_info = pim_ifp->bfd_info;
+	if (!pim_ifp)
+		return CMD_SUCCESS;
+	bfd_info = pim_ifp->bfd_info;
 
-  if (!bfd_info || !CHECK_FLAG (bfd_info->flags, BFD_FLAG_PARAM_CFG))
-    pim_bfd_if_param_set (ifp, BFD_DEF_MIN_RX, BFD_DEF_MIN_TX,
-                          BFD_DEF_DETECT_MULT, 1);
+	if (!bfd_info || !CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG))
+		pim_bfd_if_param_set(ifp, BFD_DEF_MIN_RX, BFD_DEF_MIN_TX,
+				     BFD_DEF_DETECT_MULT, 1);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (no_ip_pim_bfd,
@@ -5953,19 +6383,18 @@ DEFUN (no_ip_pim_bfd,
        PIM_STR
        "Disables BFD support\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  struct pim_interface *pim_ifp = ifp->info;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct pim_interface *pim_ifp = ifp->info;
 
-  if (!pim_ifp)
-    return CMD_SUCCESS;
+	if (!pim_ifp)
+		return CMD_SUCCESS;
 
-  if (pim_ifp->bfd_info)
-    {
-      pim_bfd_reg_dereg_all_nbr (ifp, ZEBRA_BFD_DEST_DEREGISTER);
-      bfd_info_free (&(pim_ifp->bfd_info));
-    }
+	if (pim_ifp->bfd_info) {
+		pim_bfd_reg_dereg_all_nbr(ifp, ZEBRA_BFD_DEST_DEREGISTER);
+		bfd_info_free(&(pim_ifp->bfd_info));
+	}
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 DEFUN (ip_pim_bfd_param,
@@ -5978,77 +6407,74 @@ DEFUN (ip_pim_bfd_param,
        "Required min receive interval\n"
        "Desired min transmit interval\n")
 {
-  VTY_DECLVAR_CONTEXT(interface, ifp);
-  int idx_number = 3;
-  int idx_number_2 = 4;
-  int idx_number_3 = 5;
-  u_int32_t rx_val;
-  u_int32_t tx_val;
-  u_int8_t dm_val;
-  int ret;
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	int idx_number = 3;
+	int idx_number_2 = 4;
+	int idx_number_3 = 5;
+	u_int32_t rx_val;
+	u_int32_t tx_val;
+	u_int8_t dm_val;
+	int ret;
 
 
-  if ((ret = bfd_validate_param (vty, argv[idx_number]->arg,
-                                 argv[idx_number_2]->arg,
-                                 argv[idx_number_3]->arg,
-                                 &dm_val, &rx_val, &tx_val)) != CMD_SUCCESS)
-    return ret;
+	if ((ret = bfd_validate_param(
+		     vty, argv[idx_number]->arg, argv[idx_number_2]->arg,
+		     argv[idx_number_3]->arg, &dm_val, &rx_val, &tx_val))
+	    != CMD_SUCCESS)
+		return ret;
 
-  pim_bfd_if_param_set (ifp, rx_val, tx_val, dm_val, 0);
+	pim_bfd_if_param_set(ifp, rx_val, tx_val, dm_val, 0);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
-ALIAS (no_ip_pim_bfd,
-       no_ip_pim_bfd_param_cmd,
-       "no ip pim bfd (2-255) (50-60000) (50-60000)",
-       NO_STR
-       IP_STR
-       PIM_STR
-       "Enables BFD support\n"
-       "Detect Multiplier\n"
-       "Required min receive interval\n"
-       "Desired min transmit interval\n")
+ALIAS(no_ip_pim_bfd, no_ip_pim_bfd_param_cmd,
+      "no ip pim bfd (2-255) (50-60000) (50-60000)", NO_STR IP_STR PIM_STR
+      "Enables BFD support\n"
+      "Detect Multiplier\n"
+      "Required min receive interval\n"
+      "Desired min transmit interval\n")
+
+static int ip_msdp_peer_cmd_worker(struct vty *vty, const char *peer,
+				   const char *local)
+{
+	enum pim_msdp_err result;
+	struct in_addr peer_addr;
+	struct in_addr local_addr;
+
+	result = inet_pton(AF_INET, peer, &peer_addr);
+	if (result <= 0) {
+		vty_out(vty, "%% Bad peer address %s: errno=%d: %s\n", peer,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
+
+	result = inet_pton(AF_INET, local, &local_addr);
+	if (result <= 0) {
+		vty_out(vty, "%% Bad source address %s: errno=%d: %s\n", local,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-static int
-ip_msdp_peer_cmd_worker (struct vty *vty, const char *peer, const char *local)
-{
-  enum pim_msdp_err result;
-  struct in_addr peer_addr;
-  struct in_addr local_addr;
-
-  result = inet_pton(AF_INET, peer, &peer_addr);
-  if (result <= 0) {
-    vty_out (vty, "%% Bad peer address %s: errno=%d: %s\n",
-        peer, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-
-  result = inet_pton(AF_INET, local, &local_addr);
-  if (result <= 0) {
-    vty_out (vty, "%% Bad source address %s: errno=%d: %s\n",
-        local, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
-
-  result = pim_msdp_peer_add(peer_addr, local_addr, "default", NULL/* mp_p */);
-  switch (result) {
-    case PIM_MSDP_ERR_NONE:
-      break;
-    case PIM_MSDP_ERR_OOM:
-      vty_out (vty, "%% Out of memory\n");
-      break;
-    case PIM_MSDP_ERR_PEER_EXISTS:
-      vty_out (vty, "%% Peer exists\n");
-      break;
-    case PIM_MSDP_ERR_MAX_MESH_GROUPS:
-      vty_out (vty, "%% Only one mesh-group allowed currently\n");
-      break;
-    default:
-      vty_out (vty, "%% peer add failed\n");
-  }
-
-  return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
+	result = pim_msdp_peer_add(peer_addr, local_addr, "default",
+				   NULL /* mp_p */);
+	switch (result) {
+	case PIM_MSDP_ERR_NONE:
+		break;
+	case PIM_MSDP_ERR_OOM:
+		vty_out(vty, "%% Out of memory\n");
+		break;
+	case PIM_MSDP_ERR_PEER_EXISTS:
+		vty_out(vty, "%% Peer exists\n");
+		break;
+	case PIM_MSDP_ERR_MAX_MESH_GROUPS:
+		vty_out(vty, "%% Only one mesh-group allowed currently\n");
+		break;
+	default:
+		vty_out(vty, "%% peer add failed\n");
+	}
+
+	return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
 }
 
 DEFUN_HIDDEN (ip_msdp_peer,
@@ -6061,34 +6487,33 @@ DEFUN_HIDDEN (ip_msdp_peer,
        "Source address for TCP connection\n"
        "local ip address\n")
 {
-  return ip_msdp_peer_cmd_worker (vty, argv[3]->arg, argv[5]->arg);
+	return ip_msdp_peer_cmd_worker(vty, argv[3]->arg, argv[5]->arg);
 }
 
-static int
-ip_no_msdp_peer_cmd_worker (struct vty *vty, const char *peer)
+static int ip_no_msdp_peer_cmd_worker(struct vty *vty, const char *peer)
 {
-  enum pim_msdp_err result;
-  struct in_addr peer_addr;
+	enum pim_msdp_err result;
+	struct in_addr peer_addr;
 
-  result = inet_pton(AF_INET, peer, &peer_addr);
-  if (result <= 0) {
-    vty_out (vty, "%% Bad peer address %s: errno=%d: %s\n",
-        peer, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	result = inet_pton(AF_INET, peer, &peer_addr);
+	if (result <= 0) {
+		vty_out(vty, "%% Bad peer address %s: errno=%d: %s\n", peer,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  result = pim_msdp_peer_del(peer_addr);
-  switch (result) {
-    case PIM_MSDP_ERR_NONE:
-      break;
-    case PIM_MSDP_ERR_NO_PEER:
-      vty_out (vty, "%% Peer does not exist\n");
-      break;
-    default:
-      vty_out (vty, "%% peer del failed\n");
-  }
+	result = pim_msdp_peer_del(peer_addr);
+	switch (result) {
+	case PIM_MSDP_ERR_NONE:
+		break;
+	case PIM_MSDP_ERR_NO_PEER:
+		vty_out(vty, "%% Peer does not exist\n");
+		break;
+	default:
+		vty_out(vty, "%% peer del failed\n");
+	}
 
-  return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
+	return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
 }
 
 DEFUN_HIDDEN (no_ip_msdp_peer,
@@ -6100,40 +6525,40 @@ DEFUN_HIDDEN (no_ip_msdp_peer,
        "Delete MSDP peer\n"
        "peer ip address\n")
 {
-  return ip_no_msdp_peer_cmd_worker (vty, argv[4]->arg);
+	return ip_no_msdp_peer_cmd_worker(vty, argv[4]->arg);
 }
 
-static int
-ip_msdp_mesh_group_member_cmd_worker(struct vty *vty, const char *mg, const char *mbr)
+static int ip_msdp_mesh_group_member_cmd_worker(struct vty *vty, const char *mg,
+						const char *mbr)
 {
-  enum pim_msdp_err result;
-  struct in_addr mbr_ip;
+	enum pim_msdp_err result;
+	struct in_addr mbr_ip;
 
-  result = inet_pton(AF_INET, mbr, &mbr_ip);
-  if (result <= 0) {
-    vty_out (vty, "%% Bad member address %s: errno=%d: %s\n",
-        mbr, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	result = inet_pton(AF_INET, mbr, &mbr_ip);
+	if (result <= 0) {
+		vty_out(vty, "%% Bad member address %s: errno=%d: %s\n", mbr,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  result = pim_msdp_mg_mbr_add(mg, mbr_ip);
-  switch (result) {
-    case PIM_MSDP_ERR_NONE:
-      break;
-    case PIM_MSDP_ERR_OOM:
-      vty_out (vty, "%% Out of memory\n");
-      break;
-    case PIM_MSDP_ERR_MG_MBR_EXISTS:
-      vty_out (vty, "%% mesh-group member exists\n");
-      break;
-    case PIM_MSDP_ERR_MAX_MESH_GROUPS:
-      vty_out (vty, "%% Only one mesh-group allowed currently\n");
-      break;
-    default:
-      vty_out (vty, "%% member add failed\n");
-  }
+	result = pim_msdp_mg_mbr_add(mg, mbr_ip);
+	switch (result) {
+	case PIM_MSDP_ERR_NONE:
+		break;
+	case PIM_MSDP_ERR_OOM:
+		vty_out(vty, "%% Out of memory\n");
+		break;
+	case PIM_MSDP_ERR_MG_MBR_EXISTS:
+		vty_out(vty, "%% mesh-group member exists\n");
+		break;
+	case PIM_MSDP_ERR_MAX_MESH_GROUPS:
+		vty_out(vty, "%% Only one mesh-group allowed currently\n");
+		break;
+	default:
+		vty_out(vty, "%% member add failed\n");
+	}
 
-  return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
+	return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
 }
 
 DEFUN (ip_msdp_mesh_group_member,
@@ -6146,37 +6571,39 @@ DEFUN (ip_msdp_mesh_group_member,
        "mesh group member\n"
        "peer ip address\n")
 {
-  return ip_msdp_mesh_group_member_cmd_worker(vty, argv[3]->arg, argv[5]->arg);
+	return ip_msdp_mesh_group_member_cmd_worker(vty, argv[3]->arg,
+						    argv[5]->arg);
 }
 
-static int
-ip_no_msdp_mesh_group_member_cmd_worker(struct vty *vty, const char *mg, const char *mbr)
+static int ip_no_msdp_mesh_group_member_cmd_worker(struct vty *vty,
+						   const char *mg,
+						   const char *mbr)
 {
-  enum pim_msdp_err result;
-  struct in_addr mbr_ip;
+	enum pim_msdp_err result;
+	struct in_addr mbr_ip;
 
-  result = inet_pton(AF_INET, mbr, &mbr_ip);
-  if (result <= 0) {
-    vty_out (vty, "%% Bad member address %s: errno=%d: %s\n",
-        mbr, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	result = inet_pton(AF_INET, mbr, &mbr_ip);
+	if (result <= 0) {
+		vty_out(vty, "%% Bad member address %s: errno=%d: %s\n", mbr,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  result = pim_msdp_mg_mbr_del(mg, mbr_ip);
-  switch (result) {
-    case PIM_MSDP_ERR_NONE:
-      break;
-    case PIM_MSDP_ERR_NO_MG:
-      vty_out (vty, "%% mesh-group does not exist\n");
-      break;
-    case PIM_MSDP_ERR_NO_MG_MBR:
-      vty_out (vty, "%% mesh-group member does not exist\n");
-      break;
-    default:
-      vty_out (vty, "%% mesh-group member del failed\n");
-  }
+	result = pim_msdp_mg_mbr_del(mg, mbr_ip);
+	switch (result) {
+	case PIM_MSDP_ERR_NONE:
+		break;
+	case PIM_MSDP_ERR_NO_MG:
+		vty_out(vty, "%% mesh-group does not exist\n");
+		break;
+	case PIM_MSDP_ERR_NO_MG_MBR:
+		vty_out(vty, "%% mesh-group member does not exist\n");
+		break;
+	default:
+		vty_out(vty, "%% mesh-group member del failed\n");
+	}
 
-  return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
+	return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
 }
 DEFUN (no_ip_msdp_mesh_group_member,
        no_ip_msdp_mesh_group_member_cmd,
@@ -6189,37 +6616,38 @@ DEFUN (no_ip_msdp_mesh_group_member,
        "mesh group member\n"
        "peer ip address\n")
 {
-  return ip_no_msdp_mesh_group_member_cmd_worker(vty, argv[4]->arg, argv[6]->arg);
+	return ip_no_msdp_mesh_group_member_cmd_worker(vty, argv[4]->arg,
+						       argv[6]->arg);
 }
 
-static int
-ip_msdp_mesh_group_source_cmd_worker(struct vty *vty, const char *mg, const char *src)
+static int ip_msdp_mesh_group_source_cmd_worker(struct vty *vty, const char *mg,
+						const char *src)
 {
-  enum pim_msdp_err result;
-  struct in_addr src_ip;
+	enum pim_msdp_err result;
+	struct in_addr src_ip;
 
-  result = inet_pton(AF_INET, src, &src_ip);
-  if (result <= 0) {
-    vty_out (vty, "%% Bad source address %s: errno=%d: %s\n",
-        src, errno, safe_strerror(errno));
-    return CMD_WARNING_CONFIG_FAILED;
-  }
+	result = inet_pton(AF_INET, src, &src_ip);
+	if (result <= 0) {
+		vty_out(vty, "%% Bad source address %s: errno=%d: %s\n", src,
+			errno, safe_strerror(errno));
+		return CMD_WARNING_CONFIG_FAILED;
+	}
 
-  result = pim_msdp_mg_src_add(mg, src_ip);
-  switch (result) {
-    case PIM_MSDP_ERR_NONE:
-      break;
-    case PIM_MSDP_ERR_OOM:
-      vty_out (vty, "%% Out of memory\n");
-      break;
-    case PIM_MSDP_ERR_MAX_MESH_GROUPS:
-      vty_out (vty, "%% Only one mesh-group allowed currently\n");
-      break;
-    default:
-      vty_out (vty, "%% source add failed\n");
-  }
+	result = pim_msdp_mg_src_add(mg, src_ip);
+	switch (result) {
+	case PIM_MSDP_ERR_NONE:
+		break;
+	case PIM_MSDP_ERR_OOM:
+		vty_out(vty, "%% Out of memory\n");
+		break;
+	case PIM_MSDP_ERR_MAX_MESH_GROUPS:
+		vty_out(vty, "%% Only one mesh-group allowed currently\n");
+		break;
+	default:
+		vty_out(vty, "%% source add failed\n");
+	}
 
-  return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
+	return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
 }
 
 
@@ -6233,45 +6661,45 @@ DEFUN (ip_msdp_mesh_group_source,
        "mesh group local address\n"
        "source ip address for the TCP connection\n")
 {
-  return ip_msdp_mesh_group_source_cmd_worker(vty, argv[3]->arg, argv[5]->arg);
+	return ip_msdp_mesh_group_source_cmd_worker(vty, argv[3]->arg,
+						    argv[5]->arg);
 }
 
-static int
-ip_no_msdp_mesh_group_source_cmd_worker(struct vty *vty, const char *mg)
+static int ip_no_msdp_mesh_group_source_cmd_worker(struct vty *vty,
+						   const char *mg)
 {
-  enum pim_msdp_err result;
+	enum pim_msdp_err result;
 
-  result = pim_msdp_mg_src_del(mg);
-  switch (result) {
-    case PIM_MSDP_ERR_NONE:
-      break;
-    case PIM_MSDP_ERR_NO_MG:
-      vty_out (vty, "%% mesh-group does not exist\n");
-      break;
-    default:
-      vty_out (vty, "%% mesh-group source del failed\n");
-  }
+	result = pim_msdp_mg_src_del(mg);
+	switch (result) {
+	case PIM_MSDP_ERR_NONE:
+		break;
+	case PIM_MSDP_ERR_NO_MG:
+		vty_out(vty, "%% mesh-group does not exist\n");
+		break;
+	default:
+		vty_out(vty, "%% mesh-group source del failed\n");
+	}
 
-  return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
+	return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
 }
 
-static int
-ip_no_msdp_mesh_group_cmd_worker(struct vty *vty, const char *mg)
+static int ip_no_msdp_mesh_group_cmd_worker(struct vty *vty, const char *mg)
 {
-  enum pim_msdp_err result;
+	enum pim_msdp_err result;
 
-  result = pim_msdp_mg_del(mg);
-  switch (result) {
-    case PIM_MSDP_ERR_NONE:
-      break;
-    case PIM_MSDP_ERR_NO_MG:
-      vty_out (vty, "%% mesh-group does not exist\n");
-      break;
-    default:
-      vty_out (vty, "%% mesh-group source del failed\n");
-  }
+	result = pim_msdp_mg_del(mg);
+	switch (result) {
+	case PIM_MSDP_ERR_NONE:
+		break;
+	case PIM_MSDP_ERR_NO_MG:
+		vty_out(vty, "%% mesh-group does not exist\n");
+		break;
+	default:
+		vty_out(vty, "%% mesh-group source del failed\n");
+	}
 
-  return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
+	return result ? CMD_WARNING_CONFIG_FAILED : CMD_SUCCESS;
 }
 
 DEFUN (no_ip_msdp_mesh_group_source,
@@ -6285,86 +6713,87 @@ DEFUN (no_ip_msdp_mesh_group_source,
        "mesh group source\n"
        "mesh group local address\n")
 {
-  if (argc == 7)
-    return ip_no_msdp_mesh_group_cmd_worker(vty, argv[6]->arg);
-  else
-    return ip_no_msdp_mesh_group_source_cmd_worker(vty, argv[4]->arg);
-}
-
-static void
-print_empty_json_obj(struct vty *vty)
-{
-  json_object *json;
-  json = json_object_new_object();
-  vty_out (vty, "%s\n",
-             json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-  json_object_free(json);
-}
-
-static void
-ip_msdp_show_mesh_group(struct vty *vty, u_char uj)
-{
-  struct listnode *mbrnode;
-  struct pim_msdp_mg_mbr *mbr;
-  struct pim_msdp_mg *mg = msdp->mg;
-  char mbr_str[INET_ADDRSTRLEN];
-  char src_str[INET_ADDRSTRLEN];
-  char state_str[PIM_MSDP_STATE_STRLEN];
-  enum pim_msdp_peer_state state;
-  json_object *json = NULL;
-  json_object *json_mg_row = NULL;
-  json_object *json_members = NULL;
-  json_object *json_row = NULL;
-
-  if (!mg) {
-    if (uj)
-      print_empty_json_obj(vty);
-    return;
-  }
-
-  pim_inet4_dump("<source?>", mg->src_ip, src_str, sizeof(src_str));
-  if (uj) {
-    json = json_object_new_object();
-    /* currently there is only one mesh group but we should still make
-     * it a dict with mg-name as key */
-    json_mg_row = json_object_new_object();
-    json_object_string_add(json_mg_row, "name", mg->mesh_group_name);
-    json_object_string_add(json_mg_row, "source", src_str);
-  } else {
-    vty_out (vty, "Mesh group : %s\n", mg->mesh_group_name);
-    vty_out (vty, "  Source : %s\n", src_str);
-    vty_out (vty, "  Member                 State\n");
-  }
-
-  for (ALL_LIST_ELEMENTS_RO(mg->mbr_list, mbrnode, mbr)) {
-    pim_inet4_dump("<mbr?>", mbr->mbr_ip, mbr_str, sizeof(mbr_str));
-    if (mbr->mp) {
-      state = mbr->mp->state;
-    } else {
-      state = PIM_MSDP_DISABLED;
-    }
-    pim_msdp_state_dump(state, state_str, sizeof(state_str));
-    if (uj) {
-      json_row = json_object_new_object();
-      json_object_string_add(json_row, "member", mbr_str);
-      json_object_string_add(json_row, "state", state_str);
-      if (!json_members) {
-        json_members = json_object_new_object();
-        json_object_object_add(json_mg_row, "members", json_members);
-      }
-      json_object_object_add(json_members, mbr_str, json_row);
-    } else {
-      vty_out (vty, "  %-15s  %11s\n",
-          mbr_str, state_str);
-    }
-  }
-
-  if (uj) {
-    json_object_object_add(json, mg->mesh_group_name, json_mg_row);
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
+	if (argc == 7)
+		return ip_no_msdp_mesh_group_cmd_worker(vty, argv[6]->arg);
+	else
+		return ip_no_msdp_mesh_group_source_cmd_worker(vty,
+							       argv[4]->arg);
+}
+
+static void print_empty_json_obj(struct vty *vty)
+{
+	json_object *json;
+	json = json_object_new_object();
+	vty_out(vty, "%s\n",
+		json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
+	json_object_free(json);
+}
+
+static void ip_msdp_show_mesh_group(struct vty *vty, u_char uj)
+{
+	struct listnode *mbrnode;
+	struct pim_msdp_mg_mbr *mbr;
+	struct pim_msdp_mg *mg = msdp->mg;
+	char mbr_str[INET_ADDRSTRLEN];
+	char src_str[INET_ADDRSTRLEN];
+	char state_str[PIM_MSDP_STATE_STRLEN];
+	enum pim_msdp_peer_state state;
+	json_object *json = NULL;
+	json_object *json_mg_row = NULL;
+	json_object *json_members = NULL;
+	json_object *json_row = NULL;
+
+	if (!mg) {
+		if (uj)
+			print_empty_json_obj(vty);
+		return;
+	}
+
+	pim_inet4_dump("<source?>", mg->src_ip, src_str, sizeof(src_str));
+	if (uj) {
+		json = json_object_new_object();
+		/* currently there is only one mesh group but we should still
+		 * make
+		 * it a dict with mg-name as key */
+		json_mg_row = json_object_new_object();
+		json_object_string_add(json_mg_row, "name",
+				       mg->mesh_group_name);
+		json_object_string_add(json_mg_row, "source", src_str);
+	} else {
+		vty_out(vty, "Mesh group : %s\n", mg->mesh_group_name);
+		vty_out(vty, "  Source : %s\n", src_str);
+		vty_out(vty, "  Member                 State\n");
+	}
+
+	for (ALL_LIST_ELEMENTS_RO(mg->mbr_list, mbrnode, mbr)) {
+		pim_inet4_dump("<mbr?>", mbr->mbr_ip, mbr_str, sizeof(mbr_str));
+		if (mbr->mp) {
+			state = mbr->mp->state;
+		} else {
+			state = PIM_MSDP_DISABLED;
+		}
+		pim_msdp_state_dump(state, state_str, sizeof(state_str));
+		if (uj) {
+			json_row = json_object_new_object();
+			json_object_string_add(json_row, "member", mbr_str);
+			json_object_string_add(json_row, "state", state_str);
+			if (!json_members) {
+				json_members = json_object_new_object();
+				json_object_object_add(json_mg_row, "members",
+						       json_members);
+			}
+			json_object_object_add(json_members, mbr_str, json_row);
+		} else {
+			vty_out(vty, "  %-15s  %11s\n", mbr_str, state_str);
+		}
+	}
+
+	if (uj) {
+		json_object_object_add(json, mg->mesh_group_name, json_mg_row);
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
 DEFUN (show_ip_msdp_mesh_group,
@@ -6376,151 +6805,168 @@ DEFUN (show_ip_msdp_mesh_group,
        "MSDP mesh-group information\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  ip_msdp_show_mesh_group(vty, uj);
-
-  return CMD_SUCCESS;
-}
-
-static void
-ip_msdp_show_peers(struct vty *vty, u_char uj)
-{
-  struct listnode *mpnode;
-  struct pim_msdp_peer *mp;
-  char peer_str[INET_ADDRSTRLEN];
-  char local_str[INET_ADDRSTRLEN];
-  char state_str[PIM_MSDP_STATE_STRLEN];
-  char timebuf[PIM_MSDP_UPTIME_STRLEN];
-  int64_t now;
-  json_object *json = NULL;
-  json_object *json_row = NULL;
-
-
-  if (uj) {
-    json = json_object_new_object();
-  } else {
-    vty_out (vty,
-              "Peer                       Local        State    Uptime   SaCnt\n");
-  }
-
-  for (ALL_LIST_ELEMENTS_RO(msdp->peer_list, mpnode, mp)) {
-    if (mp->state == PIM_MSDP_ESTABLISHED) {
-      now = pim_time_monotonic_sec();
-      pim_time_uptime(timebuf, sizeof(timebuf), now - mp->uptime);
-    } else {
-      strcpy(timebuf, "-");
-    }
-    pim_inet4_dump("<peer?>", mp->peer, peer_str, sizeof(peer_str));
-    pim_inet4_dump("<local?>", mp->local, local_str, sizeof(local_str));
-    pim_msdp_state_dump(mp->state, state_str, sizeof(state_str));
-    if (uj) {
-      json_row = json_object_new_object();
-      json_object_string_add(json_row, "peer", peer_str);
-      json_object_string_add(json_row, "local", local_str);
-      json_object_string_add(json_row, "state", state_str);
-      json_object_string_add(json_row, "upTime", timebuf);
-      json_object_int_add(json_row, "saCount", mp->sa_cnt);
-      json_object_object_add(json, peer_str, json_row);
-    } else {
-      vty_out (vty, "%-15s  %15s  %11s  %8s  %6d\n",
-          peer_str, local_str, state_str,
-          timebuf, mp->sa_cnt);
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
-}
-
-static void
-ip_msdp_show_peers_detail(struct vty *vty, const char *peer, u_char uj)
-{
-  struct listnode *mpnode;
-  struct pim_msdp_peer *mp;
-  char peer_str[INET_ADDRSTRLEN];
-  char local_str[INET_ADDRSTRLEN];
-  char state_str[PIM_MSDP_STATE_STRLEN];
-  char timebuf[PIM_MSDP_UPTIME_STRLEN];
-  char katimer[PIM_MSDP_TIMER_STRLEN];
-  char crtimer[PIM_MSDP_TIMER_STRLEN];
-  char holdtimer[PIM_MSDP_TIMER_STRLEN];
-  int64_t now;
-  json_object *json = NULL;
-  json_object *json_row = NULL;
-
-  if (uj) {
-    json = json_object_new_object();
-  }
-
-  for (ALL_LIST_ELEMENTS_RO(msdp->peer_list, mpnode, mp)) {
-    pim_inet4_dump("<peer?>", mp->peer, peer_str, sizeof(peer_str));
-    if (strcmp(peer, "detail") &&
-        strcmp(peer, peer_str))
-      continue;
-
-    if (mp->state == PIM_MSDP_ESTABLISHED) {
-      now = pim_time_monotonic_sec();
-      pim_time_uptime(timebuf, sizeof(timebuf), now - mp->uptime);
-    } else {
-      strcpy(timebuf, "-");
-    }
-    pim_inet4_dump("<local?>", mp->local, local_str, sizeof(local_str));
-    pim_msdp_state_dump(mp->state, state_str, sizeof(state_str));
-    pim_time_timer_to_hhmmss(katimer, sizeof(katimer), mp->ka_timer);
-    pim_time_timer_to_hhmmss(crtimer, sizeof(crtimer), mp->cr_timer);
-    pim_time_timer_to_hhmmss(holdtimer, sizeof(holdtimer), mp->hold_timer);
-
-    if (uj) {
-      json_row = json_object_new_object();
-      json_object_string_add(json_row, "peer", peer_str);
-      json_object_string_add(json_row, "local", local_str);
-      json_object_string_add(json_row, "meshGroupName", mp->mesh_group_name);
-      json_object_string_add(json_row, "state", state_str);
-      json_object_string_add(json_row, "upTime", timebuf);
-      json_object_string_add(json_row, "keepAliveTimer", katimer);
-      json_object_string_add(json_row, "connRetryTimer", crtimer);
-      json_object_string_add(json_row, "holdTimer", holdtimer);
-      json_object_string_add(json_row, "lastReset", mp->last_reset);
-      json_object_int_add(json_row, "connAttempts", mp->conn_attempts);
-      json_object_int_add(json_row, "establishedChanges", mp->est_flaps);
-      json_object_int_add(json_row, "saCount", mp->sa_cnt);
-      json_object_int_add(json_row, "kaSent", mp->ka_tx_cnt);
-      json_object_int_add(json_row, "kaRcvd", mp->ka_rx_cnt);
-      json_object_int_add(json_row, "saSent", mp->sa_tx_cnt);
-      json_object_int_add(json_row, "saRcvd", mp->sa_rx_cnt);
-      json_object_object_add(json, peer_str, json_row);
-    } else {
-      vty_out (vty, "Peer : %s\n", peer_str);
-      vty_out (vty, "  Local               : %s\n", local_str);
-      vty_out (vty, "  Mesh Group          : %s\n", mp->mesh_group_name);
-      vty_out (vty, "  State               : %s\n", state_str);
-      vty_out (vty, "  Uptime              : %s\n", timebuf);
-
-      vty_out (vty, "  Keepalive Timer     : %s\n", katimer);
-      vty_out (vty, "  Conn Retry Timer    : %s\n", crtimer);
-      vty_out (vty, "  Hold Timer          : %s\n", holdtimer);
-      vty_out (vty, "  Last Reset          : %s\n", mp->last_reset);
-      vty_out (vty, "  Conn Attempts       : %d\n", mp->conn_attempts);
-      vty_out (vty, "  Established Changes : %d\n", mp->est_flaps);
-      vty_out (vty, "  SA Count            : %d\n", mp->sa_cnt);
-      vty_out (vty, "  Statistics          :\n");
-      vty_out (vty, "                       Sent       Rcvd\n");
-      vty_out (vty, "    Keepalives : %10d %10d\n",
-          mp->ka_tx_cnt, mp->ka_rx_cnt);
-      vty_out (vty, "    SAs        : %10d %10d\n",
-          mp->sa_tx_cnt, mp->sa_rx_cnt);
-      vty_out (vty, "\n");
-    }
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
+	u_char uj = use_json(argc, argv);
+	ip_msdp_show_mesh_group(vty, uj);
+
+	return CMD_SUCCESS;
+}
+
+static void ip_msdp_show_peers(struct vty *vty, u_char uj)
+{
+	struct listnode *mpnode;
+	struct pim_msdp_peer *mp;
+	char peer_str[INET_ADDRSTRLEN];
+	char local_str[INET_ADDRSTRLEN];
+	char state_str[PIM_MSDP_STATE_STRLEN];
+	char timebuf[PIM_MSDP_UPTIME_STRLEN];
+	int64_t now;
+	json_object *json = NULL;
+	json_object *json_row = NULL;
+
+
+	if (uj) {
+		json = json_object_new_object();
+	} else {
+		vty_out(vty,
+			"Peer                       Local        State    Uptime   SaCnt\n");
+	}
+
+	for (ALL_LIST_ELEMENTS_RO(msdp->peer_list, mpnode, mp)) {
+		if (mp->state == PIM_MSDP_ESTABLISHED) {
+			now = pim_time_monotonic_sec();
+			pim_time_uptime(timebuf, sizeof(timebuf),
+					now - mp->uptime);
+		} else {
+			strcpy(timebuf, "-");
+		}
+		pim_inet4_dump("<peer?>", mp->peer, peer_str, sizeof(peer_str));
+		pim_inet4_dump("<local?>", mp->local, local_str,
+			       sizeof(local_str));
+		pim_msdp_state_dump(mp->state, state_str, sizeof(state_str));
+		if (uj) {
+			json_row = json_object_new_object();
+			json_object_string_add(json_row, "peer", peer_str);
+			json_object_string_add(json_row, "local", local_str);
+			json_object_string_add(json_row, "state", state_str);
+			json_object_string_add(json_row, "upTime", timebuf);
+			json_object_int_add(json_row, "saCount", mp->sa_cnt);
+			json_object_object_add(json, peer_str, json_row);
+		} else {
+			vty_out(vty, "%-15s  %15s  %11s  %8s  %6d\n", peer_str,
+				local_str, state_str, timebuf, mp->sa_cnt);
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
+}
+
+static void ip_msdp_show_peers_detail(struct vty *vty, const char *peer,
+				      u_char uj)
+{
+	struct listnode *mpnode;
+	struct pim_msdp_peer *mp;
+	char peer_str[INET_ADDRSTRLEN];
+	char local_str[INET_ADDRSTRLEN];
+	char state_str[PIM_MSDP_STATE_STRLEN];
+	char timebuf[PIM_MSDP_UPTIME_STRLEN];
+	char katimer[PIM_MSDP_TIMER_STRLEN];
+	char crtimer[PIM_MSDP_TIMER_STRLEN];
+	char holdtimer[PIM_MSDP_TIMER_STRLEN];
+	int64_t now;
+	json_object *json = NULL;
+	json_object *json_row = NULL;
+
+	if (uj) {
+		json = json_object_new_object();
+	}
+
+	for (ALL_LIST_ELEMENTS_RO(msdp->peer_list, mpnode, mp)) {
+		pim_inet4_dump("<peer?>", mp->peer, peer_str, sizeof(peer_str));
+		if (strcmp(peer, "detail") && strcmp(peer, peer_str))
+			continue;
+
+		if (mp->state == PIM_MSDP_ESTABLISHED) {
+			now = pim_time_monotonic_sec();
+			pim_time_uptime(timebuf, sizeof(timebuf),
+					now - mp->uptime);
+		} else {
+			strcpy(timebuf, "-");
+		}
+		pim_inet4_dump("<local?>", mp->local, local_str,
+			       sizeof(local_str));
+		pim_msdp_state_dump(mp->state, state_str, sizeof(state_str));
+		pim_time_timer_to_hhmmss(katimer, sizeof(katimer),
+					 mp->ka_timer);
+		pim_time_timer_to_hhmmss(crtimer, sizeof(crtimer),
+					 mp->cr_timer);
+		pim_time_timer_to_hhmmss(holdtimer, sizeof(holdtimer),
+					 mp->hold_timer);
+
+		if (uj) {
+			json_row = json_object_new_object();
+			json_object_string_add(json_row, "peer", peer_str);
+			json_object_string_add(json_row, "local", local_str);
+			json_object_string_add(json_row, "meshGroupName",
+					       mp->mesh_group_name);
+			json_object_string_add(json_row, "state", state_str);
+			json_object_string_add(json_row, "upTime", timebuf);
+			json_object_string_add(json_row, "keepAliveTimer",
+					       katimer);
+			json_object_string_add(json_row, "connRetryTimer",
+					       crtimer);
+			json_object_string_add(json_row, "holdTimer",
+					       holdtimer);
+			json_object_string_add(json_row, "lastReset",
+					       mp->last_reset);
+			json_object_int_add(json_row, "connAttempts",
+					    mp->conn_attempts);
+			json_object_int_add(json_row, "establishedChanges",
+					    mp->est_flaps);
+			json_object_int_add(json_row, "saCount", mp->sa_cnt);
+			json_object_int_add(json_row, "kaSent", mp->ka_tx_cnt);
+			json_object_int_add(json_row, "kaRcvd", mp->ka_rx_cnt);
+			json_object_int_add(json_row, "saSent", mp->sa_tx_cnt);
+			json_object_int_add(json_row, "saRcvd", mp->sa_rx_cnt);
+			json_object_object_add(json, peer_str, json_row);
+		} else {
+			vty_out(vty, "Peer : %s\n", peer_str);
+			vty_out(vty, "  Local               : %s\n", local_str);
+			vty_out(vty, "  Mesh Group          : %s\n",
+				mp->mesh_group_name);
+			vty_out(vty, "  State               : %s\n", state_str);
+			vty_out(vty, "  Uptime              : %s\n", timebuf);
+
+			vty_out(vty, "  Keepalive Timer     : %s\n", katimer);
+			vty_out(vty, "  Conn Retry Timer    : %s\n", crtimer);
+			vty_out(vty, "  Hold Timer          : %s\n", holdtimer);
+			vty_out(vty, "  Last Reset          : %s\n",
+				mp->last_reset);
+			vty_out(vty, "  Conn Attempts       : %d\n",
+				mp->conn_attempts);
+			vty_out(vty, "  Established Changes : %d\n",
+				mp->est_flaps);
+			vty_out(vty, "  SA Count            : %d\n",
+				mp->sa_cnt);
+			vty_out(vty, "  Statistics          :\n");
+			vty_out(vty,
+				"                       Sent       Rcvd\n");
+			vty_out(vty, "    Keepalives : %10d %10d\n",
+				mp->ka_tx_cnt, mp->ka_rx_cnt);
+			vty_out(vty, "    SAs        : %10d %10d\n",
+				mp->sa_tx_cnt, mp->sa_rx_cnt);
+			vty_out(vty, "\n");
+		}
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
 DEFUN (show_ip_msdp_peer_detail,
@@ -6534,181 +6980,183 @@ DEFUN (show_ip_msdp_peer_detail,
        "peer ip address\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  if (uj)
-    argc--;
-
-  if (argc > 4)
-    ip_msdp_show_peers_detail(vty, argv[4]->arg, uj);
-  else
-    ip_msdp_show_peers(vty, uj);
-
-  return CMD_SUCCESS;
-}
-
-static void
-ip_msdp_show_sa(struct vty *vty, u_char uj)
-{
-  struct listnode *sanode;
-  struct pim_msdp_sa *sa;
-  char src_str[INET_ADDRSTRLEN];
-  char grp_str[INET_ADDRSTRLEN];
-  char rp_str[INET_ADDRSTRLEN];
-  char timebuf[PIM_MSDP_UPTIME_STRLEN];
-  char spt_str[8];
-  char local_str[8];
-  int64_t now;
-  json_object *json = NULL;
-  json_object *json_group = NULL;
-  json_object *json_row = NULL;
-
-  if (uj) {
-    json = json_object_new_object();
-  } else {
-    vty_out (vty,
-              "Source                     Group               RP  Local  SPT    Uptime\n");
-  }
-
-  for (ALL_LIST_ELEMENTS_RO(msdp->sa_list, sanode, sa)) {
-    now = pim_time_monotonic_sec();
-    pim_time_uptime(timebuf, sizeof(timebuf), now - sa->uptime);
-    pim_inet4_dump("<src?>", sa->sg.src, src_str, sizeof(src_str));
-    pim_inet4_dump("<grp?>", sa->sg.grp, grp_str, sizeof(grp_str));
-    if (sa->flags & PIM_MSDP_SAF_PEER) {
-      pim_inet4_dump("<rp?>", sa->rp, rp_str, sizeof(rp_str));
-      if (sa->up) {
-        strcpy(spt_str, "yes");
-      } else {
-        strcpy(spt_str, "no");
-      }
-    } else {
-      strcpy(rp_str, "-");
-      strcpy(spt_str, "-");
-    }
-    if (sa->flags & PIM_MSDP_SAF_LOCAL) {
-      strcpy(local_str, "yes");
-    } else {
-      strcpy(local_str, "no");
-    }
-    if (uj) {
-      json_object_object_get_ex(json, grp_str, &json_group);
-
-      if (!json_group) {
-        json_group = json_object_new_object();
-        json_object_object_add(json, grp_str, json_group);
-      }
-
-      json_row = json_object_new_object();
-      json_object_string_add(json_row, "source", src_str);
-      json_object_string_add(json_row, "group", grp_str);
-      json_object_string_add(json_row, "rp", rp_str);
-      json_object_string_add(json_row, "local", local_str);
-      json_object_string_add(json_row, "sptSetup", spt_str);
-      json_object_string_add(json_row, "upTime", timebuf);
-      json_object_object_add(json_group, src_str, json_row);
-    } else {
-      vty_out (vty, "%-15s  %15s  %15s  %5c  %3c  %8s\n",
-          src_str, grp_str, rp_str, local_str[0], spt_str[0], timebuf);
-    }
-  }
-
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
-}
-
-static void
-ip_msdp_show_sa_entry_detail(struct pim_msdp_sa *sa, const char *src_str,
-                             const char *grp_str, struct vty *vty,
-                             u_char uj, json_object *json)
-{
-  char rp_str[INET_ADDRSTRLEN];
-  char peer_str[INET_ADDRSTRLEN];
-  char timebuf[PIM_MSDP_UPTIME_STRLEN];
-  char spt_str[8];
-  char local_str[8];
-  char statetimer[PIM_MSDP_TIMER_STRLEN];
-  int64_t now;
-  json_object *json_group = NULL;
-  json_object *json_row = NULL;
-
-  now = pim_time_monotonic_sec();
-  pim_time_uptime(timebuf, sizeof(timebuf), now - sa->uptime);
-  if (sa->flags & PIM_MSDP_SAF_PEER) {
-    pim_inet4_dump("<rp?>", sa->rp, rp_str, sizeof(rp_str));
-    pim_inet4_dump("<peer?>", sa->peer, peer_str, sizeof(peer_str));
-    if (sa->up) {
-      strcpy(spt_str, "yes");
-    } else {
-      strcpy(spt_str, "no");
-    }
-  } else {
-    strcpy(rp_str, "-");
-    strcpy(peer_str, "-");
-    strcpy(spt_str, "-");
-  }
-  if (sa->flags & PIM_MSDP_SAF_LOCAL) {
-      strcpy(local_str, "yes");
-  } else {
-      strcpy(local_str, "no");
-  }
-  pim_time_timer_to_hhmmss(statetimer, sizeof(statetimer), sa->sa_state_timer);
-  if (uj) {
-    json_object_object_get_ex(json, grp_str, &json_group);
-
-    if (!json_group) {
-      json_group = json_object_new_object();
-      json_object_object_add(json, grp_str, json_group);
-    }
-
-    json_row = json_object_new_object();
-    json_object_string_add(json_row, "source", src_str);
-    json_object_string_add(json_row, "group", grp_str);
-    json_object_string_add(json_row, "rp", rp_str);
-    json_object_string_add(json_row, "local", local_str);
-    json_object_string_add(json_row, "sptSetup", spt_str);
-    json_object_string_add(json_row, "upTime", timebuf);
-    json_object_string_add(json_row, "stateTimer", statetimer);
-    json_object_object_add(json_group, src_str, json_row);
-  } else {
-    vty_out (vty, "SA : %s\n", sa->sg_str);
-    vty_out (vty, "  RP          : %s\n", rp_str);
-    vty_out (vty, "  Peer        : %s\n", peer_str);
-    vty_out (vty, "  Local       : %s\n", local_str);
-    vty_out (vty, "  SPT Setup   : %s\n", spt_str);
-    vty_out (vty, "  Uptime      : %s\n", timebuf);
-    vty_out (vty, "  State Timer : %s\n", statetimer);
-    vty_out (vty, "\n");
-  }
-}
-
-static void
-ip_msdp_show_sa_detail(struct vty *vty, u_char uj)
-{
-  struct listnode *sanode;
-  struct pim_msdp_sa *sa;
-  char src_str[INET_ADDRSTRLEN];
-  char grp_str[INET_ADDRSTRLEN];
-  json_object *json = NULL;
-
-  if (uj) {
-    json = json_object_new_object();
-  }
-
-  for (ALL_LIST_ELEMENTS_RO(msdp->sa_list, sanode, sa)) {
-    pim_inet4_dump("<src?>", sa->sg.src, src_str, sizeof(src_str));
-    pim_inet4_dump("<grp?>", sa->sg.grp, grp_str, sizeof(grp_str));
-    ip_msdp_show_sa_entry_detail(sa, src_str, grp_str, vty, uj, json);
-  }
-
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
+	u_char uj = use_json(argc, argv);
+	if (uj)
+		argc--;
+
+	if (argc > 4)
+		ip_msdp_show_peers_detail(vty, argv[4]->arg, uj);
+	else
+		ip_msdp_show_peers(vty, uj);
+
+	return CMD_SUCCESS;
+}
+
+static void ip_msdp_show_sa(struct vty *vty, u_char uj)
+{
+	struct listnode *sanode;
+	struct pim_msdp_sa *sa;
+	char src_str[INET_ADDRSTRLEN];
+	char grp_str[INET_ADDRSTRLEN];
+	char rp_str[INET_ADDRSTRLEN];
+	char timebuf[PIM_MSDP_UPTIME_STRLEN];
+	char spt_str[8];
+	char local_str[8];
+	int64_t now;
+	json_object *json = NULL;
+	json_object *json_group = NULL;
+	json_object *json_row = NULL;
+
+	if (uj) {
+		json = json_object_new_object();
+	} else {
+		vty_out(vty,
+			"Source                     Group               RP  Local  SPT    Uptime\n");
+	}
+
+	for (ALL_LIST_ELEMENTS_RO(msdp->sa_list, sanode, sa)) {
+		now = pim_time_monotonic_sec();
+		pim_time_uptime(timebuf, sizeof(timebuf), now - sa->uptime);
+		pim_inet4_dump("<src?>", sa->sg.src, src_str, sizeof(src_str));
+		pim_inet4_dump("<grp?>", sa->sg.grp, grp_str, sizeof(grp_str));
+		if (sa->flags & PIM_MSDP_SAF_PEER) {
+			pim_inet4_dump("<rp?>", sa->rp, rp_str, sizeof(rp_str));
+			if (sa->up) {
+				strcpy(spt_str, "yes");
+			} else {
+				strcpy(spt_str, "no");
+			}
+		} else {
+			strcpy(rp_str, "-");
+			strcpy(spt_str, "-");
+		}
+		if (sa->flags & PIM_MSDP_SAF_LOCAL) {
+			strcpy(local_str, "yes");
+		} else {
+			strcpy(local_str, "no");
+		}
+		if (uj) {
+			json_object_object_get_ex(json, grp_str, &json_group);
+
+			if (!json_group) {
+				json_group = json_object_new_object();
+				json_object_object_add(json, grp_str,
+						       json_group);
+			}
+
+			json_row = json_object_new_object();
+			json_object_string_add(json_row, "source", src_str);
+			json_object_string_add(json_row, "group", grp_str);
+			json_object_string_add(json_row, "rp", rp_str);
+			json_object_string_add(json_row, "local", local_str);
+			json_object_string_add(json_row, "sptSetup", spt_str);
+			json_object_string_add(json_row, "upTime", timebuf);
+			json_object_object_add(json_group, src_str, json_row);
+		} else {
+			vty_out(vty, "%-15s  %15s  %15s  %5c  %3c  %8s\n",
+				src_str, grp_str, rp_str, local_str[0],
+				spt_str[0], timebuf);
+		}
+	}
+
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
+}
+
+static void ip_msdp_show_sa_entry_detail(struct pim_msdp_sa *sa,
+					 const char *src_str,
+					 const char *grp_str, struct vty *vty,
+					 u_char uj, json_object *json)
+{
+	char rp_str[INET_ADDRSTRLEN];
+	char peer_str[INET_ADDRSTRLEN];
+	char timebuf[PIM_MSDP_UPTIME_STRLEN];
+	char spt_str[8];
+	char local_str[8];
+	char statetimer[PIM_MSDP_TIMER_STRLEN];
+	int64_t now;
+	json_object *json_group = NULL;
+	json_object *json_row = NULL;
+
+	now = pim_time_monotonic_sec();
+	pim_time_uptime(timebuf, sizeof(timebuf), now - sa->uptime);
+	if (sa->flags & PIM_MSDP_SAF_PEER) {
+		pim_inet4_dump("<rp?>", sa->rp, rp_str, sizeof(rp_str));
+		pim_inet4_dump("<peer?>", sa->peer, peer_str, sizeof(peer_str));
+		if (sa->up) {
+			strcpy(spt_str, "yes");
+		} else {
+			strcpy(spt_str, "no");
+		}
+	} else {
+		strcpy(rp_str, "-");
+		strcpy(peer_str, "-");
+		strcpy(spt_str, "-");
+	}
+	if (sa->flags & PIM_MSDP_SAF_LOCAL) {
+		strcpy(local_str, "yes");
+	} else {
+		strcpy(local_str, "no");
+	}
+	pim_time_timer_to_hhmmss(statetimer, sizeof(statetimer),
+				 sa->sa_state_timer);
+	if (uj) {
+		json_object_object_get_ex(json, grp_str, &json_group);
+
+		if (!json_group) {
+			json_group = json_object_new_object();
+			json_object_object_add(json, grp_str, json_group);
+		}
+
+		json_row = json_object_new_object();
+		json_object_string_add(json_row, "source", src_str);
+		json_object_string_add(json_row, "group", grp_str);
+		json_object_string_add(json_row, "rp", rp_str);
+		json_object_string_add(json_row, "local", local_str);
+		json_object_string_add(json_row, "sptSetup", spt_str);
+		json_object_string_add(json_row, "upTime", timebuf);
+		json_object_string_add(json_row, "stateTimer", statetimer);
+		json_object_object_add(json_group, src_str, json_row);
+	} else {
+		vty_out(vty, "SA : %s\n", sa->sg_str);
+		vty_out(vty, "  RP          : %s\n", rp_str);
+		vty_out(vty, "  Peer        : %s\n", peer_str);
+		vty_out(vty, "  Local       : %s\n", local_str);
+		vty_out(vty, "  SPT Setup   : %s\n", spt_str);
+		vty_out(vty, "  Uptime      : %s\n", timebuf);
+		vty_out(vty, "  State Timer : %s\n", statetimer);
+		vty_out(vty, "\n");
+	}
+}
+
+static void ip_msdp_show_sa_detail(struct vty *vty, u_char uj)
+{
+	struct listnode *sanode;
+	struct pim_msdp_sa *sa;
+	char src_str[INET_ADDRSTRLEN];
+	char grp_str[INET_ADDRSTRLEN];
+	json_object *json = NULL;
+
+	if (uj) {
+		json = json_object_new_object();
+	}
+
+	for (ALL_LIST_ELEMENTS_RO(msdp->sa_list, sanode, sa)) {
+		pim_inet4_dump("<src?>", sa->sg.src, src_str, sizeof(src_str));
+		pim_inet4_dump("<grp?>", sa->sg.grp, grp_str, sizeof(grp_str));
+		ip_msdp_show_sa_entry_detail(sa, src_str, grp_str, vty, uj,
+					     json);
+	}
+
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
 DEFUN (show_ip_msdp_sa_detail,
@@ -6721,66 +7169,67 @@ DEFUN (show_ip_msdp_sa_detail,
        "Detailed output\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
-  ip_msdp_show_sa_detail(vty, uj);
+	u_char uj = use_json(argc, argv);
+	ip_msdp_show_sa_detail(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
-static void
-ip_msdp_show_sa_addr(struct vty *vty, const char *addr, u_char uj)
+static void ip_msdp_show_sa_addr(struct vty *vty, const char *addr, u_char uj)
 {
-  struct listnode *sanode;
-  struct pim_msdp_sa *sa;
-  char src_str[INET_ADDRSTRLEN];
-  char grp_str[INET_ADDRSTRLEN];
-  json_object *json = NULL;
+	struct listnode *sanode;
+	struct pim_msdp_sa *sa;
+	char src_str[INET_ADDRSTRLEN];
+	char grp_str[INET_ADDRSTRLEN];
+	json_object *json = NULL;
 
-  if (uj) {
-    json = json_object_new_object();
-  }
+	if (uj) {
+		json = json_object_new_object();
+	}
 
-  for (ALL_LIST_ELEMENTS_RO(msdp->sa_list, sanode, sa)) {
-    pim_inet4_dump("<src?>", sa->sg.src, src_str, sizeof(src_str));
-    pim_inet4_dump("<grp?>", sa->sg.grp, grp_str, sizeof(grp_str));
-    if (!strcmp(addr, src_str) || !strcmp(addr, grp_str)) {
-      ip_msdp_show_sa_entry_detail(sa, src_str, grp_str, vty, uj, json);
-    }
-  }
+	for (ALL_LIST_ELEMENTS_RO(msdp->sa_list, sanode, sa)) {
+		pim_inet4_dump("<src?>", sa->sg.src, src_str, sizeof(src_str));
+		pim_inet4_dump("<grp?>", sa->sg.grp, grp_str, sizeof(grp_str));
+		if (!strcmp(addr, src_str) || !strcmp(addr, grp_str)) {
+			ip_msdp_show_sa_entry_detail(sa, src_str, grp_str, vty,
+						     uj, json);
+		}
+	}
 
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
-static void
-ip_msdp_show_sa_sg(struct vty *vty, const char *src, const char *grp, u_char uj)
+static void ip_msdp_show_sa_sg(struct vty *vty, const char *src,
+			       const char *grp, u_char uj)
 {
-  struct listnode *sanode;
-  struct pim_msdp_sa *sa;
-  char src_str[INET_ADDRSTRLEN];
-  char grp_str[INET_ADDRSTRLEN];
-  json_object *json = NULL;
+	struct listnode *sanode;
+	struct pim_msdp_sa *sa;
+	char src_str[INET_ADDRSTRLEN];
+	char grp_str[INET_ADDRSTRLEN];
+	json_object *json = NULL;
 
-  if (uj) {
-    json = json_object_new_object();
-  }
+	if (uj) {
+		json = json_object_new_object();
+	}
 
-  for (ALL_LIST_ELEMENTS_RO(msdp->sa_list, sanode, sa)) {
-    pim_inet4_dump("<src?>", sa->sg.src, src_str, sizeof(src_str));
-    pim_inet4_dump("<grp?>", sa->sg.grp, grp_str, sizeof(grp_str));
-    if (!strcmp(src, src_str) && !strcmp(grp, grp_str)) {
-      ip_msdp_show_sa_entry_detail(sa, src_str, grp_str, vty, uj, json);
-    }
-  }
+	for (ALL_LIST_ELEMENTS_RO(msdp->sa_list, sanode, sa)) {
+		pim_inet4_dump("<src?>", sa->sg.src, src_str, sizeof(src_str));
+		pim_inet4_dump("<grp?>", sa->sg.grp, grp_str, sizeof(grp_str));
+		if (!strcmp(src, src_str) && !strcmp(grp, grp_str)) {
+			ip_msdp_show_sa_entry_detail(sa, src_str, grp_str, vty,
+						     uj, json);
+		}
+	}
 
-  if (uj) {
-    vty_out (vty, "%s\n",
-               json_object_to_json_string_ext(json, JSON_C_TO_STRING_PRETTY));
-    json_object_free(json);
-  }
+	if (uj) {
+		vty_out(vty, "%s\n", json_object_to_json_string_ext(
+					     json, JSON_C_TO_STRING_PRETTY));
+		json_object_free(json);
+	}
 }
 
 DEFUN (show_ip_msdp_sa_sg,
@@ -6794,218 +7243,227 @@ DEFUN (show_ip_msdp_sa_sg,
        "group ip\n"
        "JavaScript Object Notation\n")
 {
-  u_char uj = use_json(argc, argv);
+	u_char uj = use_json(argc, argv);
 
-  int idx = 0;
-  char *src_ip = argv_find (argv, argc, "A.B.C.D", &idx) ? argv[idx++]->arg : NULL;
-  char *grp_ip = idx < argc && argv_find (argv, argc, "A.B.C.D", &idx) ?
-                 argv[idx]->arg : NULL;
+	int idx = 0;
+	char *src_ip = argv_find(argv, argc, "A.B.C.D", &idx) ? argv[idx++]->arg
+							      : NULL;
+	char *grp_ip = idx < argc && argv_find(argv, argc, "A.B.C.D", &idx)
+			       ? argv[idx]->arg
+			       : NULL;
 
-  if (src_ip && grp_ip)
-    ip_msdp_show_sa_sg(vty, src_ip, grp_ip, uj);
-  else if (src_ip)
-    ip_msdp_show_sa_addr(vty, src_ip, uj);
-  else
-    ip_msdp_show_sa(vty, uj);
+	if (src_ip && grp_ip)
+		ip_msdp_show_sa_sg(vty, src_ip, grp_ip, uj);
+	else if (src_ip)
+		ip_msdp_show_sa_addr(vty, src_ip, uj);
+	else
+		ip_msdp_show_sa(vty, uj);
 
-  return CMD_SUCCESS;
+	return CMD_SUCCESS;
 }
 
 void pim_cmd_init()
 {
-  install_node (&pim_global_node, pim_global_config_write);       /* PIM_NODE */
-  install_node (&interface_node, pim_interface_config_write); /* INTERFACE_NODE */
-  if_cmd_init ();
-
-  install_node (&debug_node, pim_debug_config_write);
-
-  install_element (CONFIG_NODE, &ip_multicast_routing_cmd);
-  install_element (CONFIG_NODE, &no_ip_multicast_routing_cmd);
-  install_element (CONFIG_NODE, &ip_pim_rp_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_rp_cmd);
-  install_element (CONFIG_NODE, &ip_pim_rp_prefix_list_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_rp_prefix_list_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_ssm_prefix_list_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_ssm_prefix_list_name_cmd);
-  install_element (CONFIG_NODE, &ip_pim_ssm_prefix_list_cmd);
-  install_element (CONFIG_NODE, &ip_pim_register_suppress_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_register_suppress_cmd);
-  install_element (CONFIG_NODE, &ip_pim_spt_switchover_infinity_cmd);
-  install_element (CONFIG_NODE, &ip_pim_spt_switchover_infinity_plist_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_spt_switchover_infinity_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_spt_switchover_infinity_plist_cmd);
-  install_element (CONFIG_NODE, &ip_pim_joinprune_time_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_joinprune_time_cmd);
-  install_element (CONFIG_NODE, &ip_pim_keep_alive_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_keep_alive_cmd);
-  install_element (CONFIG_NODE, &ip_pim_packets_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_packets_cmd);
-  install_element (CONFIG_NODE, &ip_pim_v6_secondary_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_v6_secondary_cmd);
-  install_element (CONFIG_NODE, &ip_ssmpingd_cmd);
-  install_element (CONFIG_NODE, &no_ip_ssmpingd_cmd); 
-  install_element (CONFIG_NODE, &ip_msdp_peer_cmd);
-  install_element (CONFIG_NODE, &no_ip_msdp_peer_cmd);
-  install_element (CONFIG_NODE, &ip_pim_ecmp_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_ecmp_cmd);
-  install_element (CONFIG_NODE, &ip_pim_ecmp_rebalance_cmd);
-  install_element (CONFIG_NODE, &no_ip_pim_ecmp_rebalance_cmd);
-
-  install_element (INTERFACE_NODE, &interface_ip_igmp_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_igmp_cmd); 
-  install_element (INTERFACE_NODE, &interface_ip_igmp_join_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_igmp_join_cmd); 
-  install_element (INTERFACE_NODE, &interface_ip_igmp_version_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_igmp_version_cmd);
-  install_element (INTERFACE_NODE, &interface_ip_igmp_query_interval_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_igmp_query_interval_cmd); 
-  install_element (INTERFACE_NODE, &interface_ip_igmp_query_max_response_time_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_igmp_query_max_response_time_cmd); 
-  install_element (INTERFACE_NODE, &interface_ip_igmp_query_max_response_time_dsec_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_igmp_query_max_response_time_dsec_cmd); 
-  install_element (INTERFACE_NODE, &interface_ip_pim_ssm_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_pim_ssm_cmd);
-  install_element (INTERFACE_NODE, &interface_ip_pim_sm_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_pim_sm_cmd);
-  install_element (INTERFACE_NODE, &interface_ip_pim_drprio_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_pim_drprio_cmd);
-  install_element (INTERFACE_NODE, &interface_ip_pim_hello_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_pim_hello_cmd);
-
-  // Static mroutes NEB
-  install_element (INTERFACE_NODE, &interface_ip_mroute_cmd);
-  install_element (INTERFACE_NODE, &interface_ip_mroute_source_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_mroute_cmd);
-  install_element (INTERFACE_NODE, &interface_no_ip_mroute_source_cmd);
-
-  install_element (VIEW_NODE, &show_ip_igmp_interface_cmd);
-  install_element (VIEW_NODE, &show_ip_igmp_join_cmd);
-  install_element (VIEW_NODE, &show_ip_igmp_groups_cmd);
-  install_element (VIEW_NODE, &show_ip_igmp_groups_retransmissions_cmd);
-  install_element (VIEW_NODE, &show_ip_igmp_sources_cmd);
-  install_element (VIEW_NODE, &show_ip_igmp_sources_retransmissions_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_assert_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_assert_internal_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_assert_metric_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_assert_winner_metric_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_interface_traffic_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_interface_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_join_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_local_membership_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_neighbor_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_rpf_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_secondary_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_state_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_upstream_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_upstream_join_desired_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_upstream_rpf_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_rp_cmd);
-  install_element (VIEW_NODE, &show_ip_multicast_cmd);
-  install_element (VIEW_NODE, &show_ip_mroute_cmd);
-  install_element (VIEW_NODE, &show_ip_mroute_count_cmd);
-  install_element (VIEW_NODE, &show_ip_rib_cmd);
-  install_element (VIEW_NODE, &show_ip_ssmpingd_cmd);
-  install_element (VIEW_NODE, &show_debugging_pim_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_nexthop_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_nexthop_lookup_cmd);
-
-  install_element (ENABLE_NODE, &clear_ip_interfaces_cmd);
-  install_element (ENABLE_NODE, &clear_ip_igmp_interfaces_cmd);
-  install_element (ENABLE_NODE, &clear_ip_mroute_cmd);
-  install_element (ENABLE_NODE, &clear_ip_pim_interfaces_cmd);
-  install_element (ENABLE_NODE, &clear_ip_pim_interface_traffic_cmd);
-  install_element (ENABLE_NODE, &clear_ip_pim_oil_cmd);
-
-  install_element (ENABLE_NODE, &debug_igmp_cmd);
-  install_element (ENABLE_NODE, &no_debug_igmp_cmd);
-  install_element (ENABLE_NODE, &debug_igmp_events_cmd);
-  install_element (ENABLE_NODE, &no_debug_igmp_events_cmd);
-  install_element (ENABLE_NODE, &debug_igmp_packets_cmd);
-  install_element (ENABLE_NODE, &no_debug_igmp_packets_cmd);
-  install_element (ENABLE_NODE, &debug_igmp_trace_cmd);
-  install_element (ENABLE_NODE, &no_debug_igmp_trace_cmd);
-  install_element (ENABLE_NODE, &debug_mroute_cmd);
-  install_element (ENABLE_NODE, &debug_mroute_detail_cmd);
-  install_element (ENABLE_NODE, &no_debug_mroute_cmd);
-  install_element (ENABLE_NODE, &no_debug_mroute_detail_cmd);
-  install_element (ENABLE_NODE, &debug_static_cmd);
-  install_element (ENABLE_NODE, &no_debug_static_cmd);
-  install_element (ENABLE_NODE, &debug_pim_cmd);
-  install_element (ENABLE_NODE, &no_debug_pim_cmd);
-  install_element (ENABLE_NODE, &debug_pim_events_cmd);
-  install_element (ENABLE_NODE, &no_debug_pim_events_cmd);
-  install_element (ENABLE_NODE, &debug_pim_packets_cmd);
-  install_element (ENABLE_NODE, &no_debug_pim_packets_cmd);
-  install_element (ENABLE_NODE, &debug_pim_packetdump_send_cmd);
-  install_element (ENABLE_NODE, &no_debug_pim_packetdump_send_cmd);
-  install_element (ENABLE_NODE, &debug_pim_packetdump_recv_cmd);
-  install_element (ENABLE_NODE, &no_debug_pim_packetdump_recv_cmd);
-  install_element (ENABLE_NODE, &debug_pim_trace_cmd);
-  install_element (ENABLE_NODE, &no_debug_pim_trace_cmd);
-  install_element (ENABLE_NODE, &debug_ssmpingd_cmd);
-  install_element (ENABLE_NODE, &no_debug_ssmpingd_cmd);
-  install_element (ENABLE_NODE, &debug_pim_zebra_cmd);
-  install_element (ENABLE_NODE, &no_debug_pim_zebra_cmd);
-  install_element (ENABLE_NODE, &debug_msdp_cmd);
-  install_element (ENABLE_NODE, &no_debug_msdp_cmd);
-  install_element (ENABLE_NODE, &undebug_msdp_cmd);
-  install_element (ENABLE_NODE, &debug_msdp_events_cmd);
-  install_element (ENABLE_NODE, &no_debug_msdp_events_cmd);
-  install_element (ENABLE_NODE, &undebug_msdp_events_cmd);
-  install_element (ENABLE_NODE, &debug_msdp_packets_cmd);
-  install_element (ENABLE_NODE, &no_debug_msdp_packets_cmd);
-  install_element (ENABLE_NODE, &undebug_msdp_packets_cmd);
-
-  install_element (CONFIG_NODE, &debug_igmp_cmd);
-  install_element (CONFIG_NODE, &no_debug_igmp_cmd);
-  install_element (CONFIG_NODE, &debug_igmp_events_cmd);
-  install_element (CONFIG_NODE, &no_debug_igmp_events_cmd);
-  install_element (CONFIG_NODE, &debug_igmp_packets_cmd);
-  install_element (CONFIG_NODE, &no_debug_igmp_packets_cmd);
-  install_element (CONFIG_NODE, &debug_igmp_trace_cmd);
-  install_element (CONFIG_NODE, &no_debug_igmp_trace_cmd);
-  install_element (CONFIG_NODE, &debug_mroute_cmd);
-  install_element (CONFIG_NODE, &debug_mroute_detail_cmd);
-  install_element (CONFIG_NODE, &no_debug_mroute_cmd);
-  install_element (CONFIG_NODE, &no_debug_mroute_detail_cmd);
-  install_element (CONFIG_NODE, &debug_static_cmd);
-  install_element (CONFIG_NODE, &no_debug_static_cmd);
-  install_element (CONFIG_NODE, &debug_pim_cmd);
-  install_element (CONFIG_NODE, &no_debug_pim_cmd);
-  install_element (CONFIG_NODE, &debug_pim_events_cmd);
-  install_element (CONFIG_NODE, &no_debug_pim_events_cmd);
-  install_element (CONFIG_NODE, &debug_pim_packets_cmd);
-  install_element (CONFIG_NODE, &no_debug_pim_packets_cmd);
-  install_element (CONFIG_NODE, &debug_pim_trace_cmd);
-  install_element (CONFIG_NODE, &no_debug_pim_trace_cmd);
-  install_element (CONFIG_NODE, &debug_ssmpingd_cmd);
-  install_element (CONFIG_NODE, &no_debug_ssmpingd_cmd);
-  install_element (CONFIG_NODE, &debug_pim_zebra_cmd);
-  install_element (CONFIG_NODE, &no_debug_pim_zebra_cmd);
-  install_element (CONFIG_NODE, &debug_msdp_cmd);
-  install_element (CONFIG_NODE, &no_debug_msdp_cmd);
-  install_element (CONFIG_NODE, &undebug_msdp_cmd);
-  install_element (CONFIG_NODE, &debug_msdp_events_cmd);
-  install_element (CONFIG_NODE, &no_debug_msdp_events_cmd);
-  install_element (CONFIG_NODE, &undebug_msdp_events_cmd);
-  install_element (CONFIG_NODE, &debug_msdp_packets_cmd);
-  install_element (CONFIG_NODE, &no_debug_msdp_packets_cmd);
-  install_element (CONFIG_NODE, &undebug_msdp_packets_cmd);
-  install_element (CONFIG_NODE, &ip_msdp_mesh_group_member_cmd);
-  install_element (CONFIG_NODE, &no_ip_msdp_mesh_group_member_cmd);
-  install_element (CONFIG_NODE, &ip_msdp_mesh_group_source_cmd);
-  install_element (CONFIG_NODE, &no_ip_msdp_mesh_group_source_cmd);
-  install_element (VIEW_NODE, &show_ip_msdp_peer_detail_cmd);
-  install_element (VIEW_NODE, &show_ip_msdp_sa_detail_cmd);
-  install_element (VIEW_NODE, &show_ip_msdp_sa_sg_cmd);
-  install_element (VIEW_NODE, &show_ip_msdp_mesh_group_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_ssm_range_cmd);
-  install_element (VIEW_NODE, &show_ip_pim_group_type_cmd);
-  install_element (INTERFACE_NODE, &interface_pim_use_source_cmd);
-  install_element (INTERFACE_NODE, &interface_no_pim_use_source_cmd);
-  /* Install BFD command */
-  install_element (INTERFACE_NODE, &ip_pim_bfd_cmd);
-  install_element (INTERFACE_NODE, &ip_pim_bfd_param_cmd);
-  install_element (INTERFACE_NODE, &no_ip_pim_bfd_cmd);
-  install_element (INTERFACE_NODE, &no_ip_pim_bfd_param_cmd);
+	install_node(&pim_global_node, pim_global_config_write); /* PIM_NODE */
+	install_node(&interface_node,
+		     pim_interface_config_write); /* INTERFACE_NODE */
+	if_cmd_init();
+
+	install_node(&debug_node, pim_debug_config_write);
+
+	install_element(CONFIG_NODE, &ip_multicast_routing_cmd);
+	install_element(CONFIG_NODE, &no_ip_multicast_routing_cmd);
+	install_element(CONFIG_NODE, &ip_pim_rp_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_rp_cmd);
+	install_element(CONFIG_NODE, &ip_pim_rp_prefix_list_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_rp_prefix_list_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_ssm_prefix_list_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_ssm_prefix_list_name_cmd);
+	install_element(CONFIG_NODE, &ip_pim_ssm_prefix_list_cmd);
+	install_element(CONFIG_NODE, &ip_pim_register_suppress_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_register_suppress_cmd);
+	install_element(CONFIG_NODE, &ip_pim_spt_switchover_infinity_cmd);
+	install_element(CONFIG_NODE, &ip_pim_spt_switchover_infinity_plist_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_spt_switchover_infinity_cmd);
+	install_element(CONFIG_NODE,
+			&no_ip_pim_spt_switchover_infinity_plist_cmd);
+	install_element(CONFIG_NODE, &ip_pim_joinprune_time_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_joinprune_time_cmd);
+	install_element(CONFIG_NODE, &ip_pim_keep_alive_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_keep_alive_cmd);
+	install_element(CONFIG_NODE, &ip_pim_packets_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_packets_cmd);
+	install_element(CONFIG_NODE, &ip_pim_v6_secondary_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_v6_secondary_cmd);
+	install_element(CONFIG_NODE, &ip_ssmpingd_cmd);
+	install_element(CONFIG_NODE, &no_ip_ssmpingd_cmd);
+	install_element(CONFIG_NODE, &ip_msdp_peer_cmd);
+	install_element(CONFIG_NODE, &no_ip_msdp_peer_cmd);
+	install_element(CONFIG_NODE, &ip_pim_ecmp_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_ecmp_cmd);
+	install_element(CONFIG_NODE, &ip_pim_ecmp_rebalance_cmd);
+	install_element(CONFIG_NODE, &no_ip_pim_ecmp_rebalance_cmd);
+
+	install_element(INTERFACE_NODE, &interface_ip_igmp_cmd);
+	install_element(INTERFACE_NODE, &interface_no_ip_igmp_cmd);
+	install_element(INTERFACE_NODE, &interface_ip_igmp_join_cmd);
+	install_element(INTERFACE_NODE, &interface_no_ip_igmp_join_cmd);
+	install_element(INTERFACE_NODE, &interface_ip_igmp_version_cmd);
+	install_element(INTERFACE_NODE, &interface_no_ip_igmp_version_cmd);
+	install_element(INTERFACE_NODE, &interface_ip_igmp_query_interval_cmd);
+	install_element(INTERFACE_NODE,
+			&interface_no_ip_igmp_query_interval_cmd);
+	install_element(INTERFACE_NODE,
+			&interface_ip_igmp_query_max_response_time_cmd);
+	install_element(INTERFACE_NODE,
+			&interface_no_ip_igmp_query_max_response_time_cmd);
+	install_element(INTERFACE_NODE,
+			&interface_ip_igmp_query_max_response_time_dsec_cmd);
+	install_element(INTERFACE_NODE,
+			&interface_no_ip_igmp_query_max_response_time_dsec_cmd);
+	install_element(INTERFACE_NODE, &interface_ip_pim_ssm_cmd);
+	install_element(INTERFACE_NODE, &interface_no_ip_pim_ssm_cmd);
+	install_element(INTERFACE_NODE, &interface_ip_pim_sm_cmd);
+	install_element(INTERFACE_NODE, &interface_no_ip_pim_sm_cmd);
+	install_element(INTERFACE_NODE, &interface_ip_pim_drprio_cmd);
+	install_element(INTERFACE_NODE, &interface_no_ip_pim_drprio_cmd);
+	install_element(INTERFACE_NODE, &interface_ip_pim_hello_cmd);
+	install_element(INTERFACE_NODE, &interface_no_ip_pim_hello_cmd);
+
+	// Static mroutes NEB
+	install_element(INTERFACE_NODE, &interface_ip_mroute_cmd);
+	install_element(INTERFACE_NODE, &interface_ip_mroute_source_cmd);
+	install_element(INTERFACE_NODE, &interface_no_ip_mroute_cmd);
+	install_element(INTERFACE_NODE, &interface_no_ip_mroute_source_cmd);
+
+	install_element(VIEW_NODE, &show_ip_igmp_interface_cmd);
+	install_element(VIEW_NODE, &show_ip_igmp_join_cmd);
+	install_element(VIEW_NODE, &show_ip_igmp_groups_cmd);
+	install_element(VIEW_NODE, &show_ip_igmp_groups_retransmissions_cmd);
+	install_element(VIEW_NODE, &show_ip_igmp_sources_cmd);
+	install_element(VIEW_NODE, &show_ip_igmp_sources_retransmissions_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_assert_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_assert_internal_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_assert_metric_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_assert_winner_metric_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_interface_traffic_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_interface_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_join_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_local_membership_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_neighbor_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_rpf_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_secondary_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_state_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_upstream_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_upstream_join_desired_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_upstream_rpf_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_rp_cmd);
+	install_element(VIEW_NODE, &show_ip_multicast_cmd);
+	install_element(VIEW_NODE, &show_ip_mroute_cmd);
+	install_element(VIEW_NODE, &show_ip_mroute_count_cmd);
+	install_element(VIEW_NODE, &show_ip_rib_cmd);
+	install_element(VIEW_NODE, &show_ip_ssmpingd_cmd);
+	install_element(VIEW_NODE, &show_debugging_pim_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_nexthop_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_nexthop_lookup_cmd);
+
+	install_element(ENABLE_NODE, &clear_ip_interfaces_cmd);
+	install_element(ENABLE_NODE, &clear_ip_igmp_interfaces_cmd);
+	install_element(ENABLE_NODE, &clear_ip_mroute_cmd);
+	install_element(ENABLE_NODE, &clear_ip_pim_interfaces_cmd);
+	install_element(ENABLE_NODE, &clear_ip_pim_interface_traffic_cmd);
+	install_element(ENABLE_NODE, &clear_ip_pim_oil_cmd);
+
+	install_element(ENABLE_NODE, &debug_igmp_cmd);
+	install_element(ENABLE_NODE, &no_debug_igmp_cmd);
+	install_element(ENABLE_NODE, &debug_igmp_events_cmd);
+	install_element(ENABLE_NODE, &no_debug_igmp_events_cmd);
+	install_element(ENABLE_NODE, &debug_igmp_packets_cmd);
+	install_element(ENABLE_NODE, &no_debug_igmp_packets_cmd);
+	install_element(ENABLE_NODE, &debug_igmp_trace_cmd);
+	install_element(ENABLE_NODE, &no_debug_igmp_trace_cmd);
+	install_element(ENABLE_NODE, &debug_mroute_cmd);
+	install_element(ENABLE_NODE, &debug_mroute_detail_cmd);
+	install_element(ENABLE_NODE, &no_debug_mroute_cmd);
+	install_element(ENABLE_NODE, &no_debug_mroute_detail_cmd);
+	install_element(ENABLE_NODE, &debug_static_cmd);
+	install_element(ENABLE_NODE, &no_debug_static_cmd);
+	install_element(ENABLE_NODE, &debug_pim_cmd);
+	install_element(ENABLE_NODE, &no_debug_pim_cmd);
+	install_element(ENABLE_NODE, &debug_pim_events_cmd);
+	install_element(ENABLE_NODE, &no_debug_pim_events_cmd);
+	install_element(ENABLE_NODE, &debug_pim_packets_cmd);
+	install_element(ENABLE_NODE, &no_debug_pim_packets_cmd);
+	install_element(ENABLE_NODE, &debug_pim_packetdump_send_cmd);
+	install_element(ENABLE_NODE, &no_debug_pim_packetdump_send_cmd);
+	install_element(ENABLE_NODE, &debug_pim_packetdump_recv_cmd);
+	install_element(ENABLE_NODE, &no_debug_pim_packetdump_recv_cmd);
+	install_element(ENABLE_NODE, &debug_pim_trace_cmd);
+	install_element(ENABLE_NODE, &no_debug_pim_trace_cmd);
+	install_element(ENABLE_NODE, &debug_ssmpingd_cmd);
+	install_element(ENABLE_NODE, &no_debug_ssmpingd_cmd);
+	install_element(ENABLE_NODE, &debug_pim_zebra_cmd);
+	install_element(ENABLE_NODE, &no_debug_pim_zebra_cmd);
+	install_element(ENABLE_NODE, &debug_msdp_cmd);
+	install_element(ENABLE_NODE, &no_debug_msdp_cmd);
+	install_element(ENABLE_NODE, &undebug_msdp_cmd);
+	install_element(ENABLE_NODE, &debug_msdp_events_cmd);
+	install_element(ENABLE_NODE, &no_debug_msdp_events_cmd);
+	install_element(ENABLE_NODE, &undebug_msdp_events_cmd);
+	install_element(ENABLE_NODE, &debug_msdp_packets_cmd);
+	install_element(ENABLE_NODE, &no_debug_msdp_packets_cmd);
+	install_element(ENABLE_NODE, &undebug_msdp_packets_cmd);
+
+	install_element(CONFIG_NODE, &debug_igmp_cmd);
+	install_element(CONFIG_NODE, &no_debug_igmp_cmd);
+	install_element(CONFIG_NODE, &debug_igmp_events_cmd);
+	install_element(CONFIG_NODE, &no_debug_igmp_events_cmd);
+	install_element(CONFIG_NODE, &debug_igmp_packets_cmd);
+	install_element(CONFIG_NODE, &no_debug_igmp_packets_cmd);
+	install_element(CONFIG_NODE, &debug_igmp_trace_cmd);
+	install_element(CONFIG_NODE, &no_debug_igmp_trace_cmd);
+	install_element(CONFIG_NODE, &debug_mroute_cmd);
+	install_element(CONFIG_NODE, &debug_mroute_detail_cmd);
+	install_element(CONFIG_NODE, &no_debug_mroute_cmd);
+	install_element(CONFIG_NODE, &no_debug_mroute_detail_cmd);
+	install_element(CONFIG_NODE, &debug_static_cmd);
+	install_element(CONFIG_NODE, &no_debug_static_cmd);
+	install_element(CONFIG_NODE, &debug_pim_cmd);
+	install_element(CONFIG_NODE, &no_debug_pim_cmd);
+	install_element(CONFIG_NODE, &debug_pim_events_cmd);
+	install_element(CONFIG_NODE, &no_debug_pim_events_cmd);
+	install_element(CONFIG_NODE, &debug_pim_packets_cmd);
+	install_element(CONFIG_NODE, &no_debug_pim_packets_cmd);
+	install_element(CONFIG_NODE, &debug_pim_trace_cmd);
+	install_element(CONFIG_NODE, &no_debug_pim_trace_cmd);
+	install_element(CONFIG_NODE, &debug_ssmpingd_cmd);
+	install_element(CONFIG_NODE, &no_debug_ssmpingd_cmd);
+	install_element(CONFIG_NODE, &debug_pim_zebra_cmd);
+	install_element(CONFIG_NODE, &no_debug_pim_zebra_cmd);
+	install_element(CONFIG_NODE, &debug_msdp_cmd);
+	install_element(CONFIG_NODE, &no_debug_msdp_cmd);
+	install_element(CONFIG_NODE, &undebug_msdp_cmd);
+	install_element(CONFIG_NODE, &debug_msdp_events_cmd);
+	install_element(CONFIG_NODE, &no_debug_msdp_events_cmd);
+	install_element(CONFIG_NODE, &undebug_msdp_events_cmd);
+	install_element(CONFIG_NODE, &debug_msdp_packets_cmd);
+	install_element(CONFIG_NODE, &no_debug_msdp_packets_cmd);
+	install_element(CONFIG_NODE, &undebug_msdp_packets_cmd);
+	install_element(CONFIG_NODE, &ip_msdp_mesh_group_member_cmd);
+	install_element(CONFIG_NODE, &no_ip_msdp_mesh_group_member_cmd);
+	install_element(CONFIG_NODE, &ip_msdp_mesh_group_source_cmd);
+	install_element(CONFIG_NODE, &no_ip_msdp_mesh_group_source_cmd);
+	install_element(VIEW_NODE, &show_ip_msdp_peer_detail_cmd);
+	install_element(VIEW_NODE, &show_ip_msdp_sa_detail_cmd);
+	install_element(VIEW_NODE, &show_ip_msdp_sa_sg_cmd);
+	install_element(VIEW_NODE, &show_ip_msdp_mesh_group_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_ssm_range_cmd);
+	install_element(VIEW_NODE, &show_ip_pim_group_type_cmd);
+	install_element(INTERFACE_NODE, &interface_pim_use_source_cmd);
+	install_element(INTERFACE_NODE, &interface_no_pim_use_source_cmd);
+	/* Install BFD command */
+	install_element(INTERFACE_NODE, &ip_pim_bfd_cmd);
+	install_element(INTERFACE_NODE, &ip_pim_bfd_param_cmd);
+	install_element(INTERFACE_NODE, &no_ip_pim_bfd_cmd);
+	install_element(INTERFACE_NODE, &no_ip_pim_bfd_param_cmd);
 }