From bec5bdbe7f3b33efe69d624a07cb9c799c135115 Mon Sep 17 00:00:00 2001 From: Sai Gomathi N Date: Thu, 9 Jun 2022 00:31:33 -0700 Subject: [PATCH] pim6d: Moving the common lines of pim_local_membership cli Moving the common lines of pim_local_membership cli in pim_cmd.c and pim6_cmd.c to pim_cmd_common.c file Signed-off-by: Sai Gomathi N --- pimd/pim6_cmd.c | 12 +----------- pimd/pim_cmd.c | 12 +----------- pimd/pim_cmd_common.c | 14 ++++++++++++++ pimd/pim_cmd_common.h | 1 + 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c index 5838cf67fb..3fb36eae71 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -1376,17 +1376,7 @@ DEFPY (show_ipv6_pim_local_membership, "PIM interface local-membership\n" JSON_STR) { - struct vrf *v; - bool uj = !!json; - - v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); - - if (!v) - return CMD_WARNING; - - pim_show_membership(v->info, vty, uj); - - return CMD_SUCCESS; + return pim_show_membership_cmd_helper(vrf, vty, !!json); } DEFPY (show_ipv6_pim_neighbor, diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 4869c548e9..31162fdf1e 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -2553,17 +2553,7 @@ DEFPY (show_ip_pim_local_membership, "PIM interface local-membership\n" JSON_STR) { - struct vrf *v; - bool uj = !!json; - - v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); - - if (!v) - return CMD_WARNING; - - pim_show_membership(v->info, vty, uj); - - return CMD_SUCCESS; + return pim_show_membership_cmd_helper(vrf, vty, !!json); } static void pim_show_mlag_up_entry_detail(struct vrf *vrf, diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index 949882d170..ca7ab5577f 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -1758,6 +1758,20 @@ void pim_show_jp_agg_list(struct pim_instance *pim, struct vty *vty) } } +int pim_show_membership_cmd_helper(const char *vrf, struct vty *vty, bool uj) +{ + struct vrf *v; + + v = vrf_lookup_by_name(vrf ? vrf : VRF_DEFAULT_NAME); + + if (!v) + return CMD_WARNING; + + pim_show_membership(v->info, vty, uj); + + return CMD_SUCCESS; +} + static void pim_show_membership_helper(struct vty *vty, struct pim_interface *pim_ifp, struct pim_ifchannel *ch, diff --git a/pimd/pim_cmd_common.h b/pimd/pim_cmd_common.h index 6719be2b94..b16dd4b948 100644 --- a/pimd/pim_cmd_common.h +++ b/pimd/pim_cmd_common.h @@ -87,6 +87,7 @@ void pim_show_join(struct pim_instance *pim, struct vty *vty, pim_sgaddr *sg, json_object *json); int pim_show_jp_agg_list_cmd_helper(const char *vrf, struct vty *vty); void pim_show_jp_agg_list(struct pim_instance *pim, struct vty *vty); +int pim_show_membership_cmd_helper(const char *vrf, struct vty *vty, bool uj); void pim_show_membership(struct pim_instance *pim, struct vty *vty, bool uj); void pim_show_channel(struct pim_instance *pim, struct vty *vty, bool uj); int pim_show_channel_cmd_helper(const char *vrf, struct vty *vty, bool uj); -- 2.39.5